diff mbox series

[meta-arm] test-pacbti: Use UNPACKDIR

Message ID 20240524193446.19066-1-reatmon@ti.com
State New
Headers show
Series [meta-arm] test-pacbti: Use UNPACKDIR | expand

Commit Message

Ryan Eatmon May 24, 2024, 7:34 p.m. UTC
Fix parsing recipes error:

  Parsing recipes...
  ERROR: meta-arm/recipes-test/pacbti/test-pacbti.bb: Using S = ${WORKDIR} is no longer supported
  ERROR: Parsing halted due to errors, see error messages above

There was a change in oe-core [1] and was further discussed here [2].

[1]  https://git.openembedded.org/openembedded-core/commit/?h=master&id=32cba1cc916ad530c5e6630a927e74ca6f06289b
[2] https://lists.openembedded.org/g/openembedded-architecture/message/2007

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 meta-arm/recipes-test/pacbti/test-pacbti.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jon Mason May 30, 2024, 1:42 p.m. UTC | #1
On Fri, May 24, 2024 at 02:34:46PM -0500, Ryan Eatmon wrote:
> Fix parsing recipes error:
> 
>   Parsing recipes...
>   ERROR: meta-arm/recipes-test/pacbti/test-pacbti.bb: Using S = ${WORKDIR} is no longer supported
>   ERROR: Parsing halted due to errors, see error messages above
> 
> There was a change in oe-core [1] and was further discussed here [2].
> 
> [1]  https://git.openembedded.org/openembedded-core/commit/?h=master&id=32cba1cc916ad530c5e6630a927e74ca6f06289b
> [2] https://lists.openembedded.org/g/openembedded-architecture/message/2007
> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>

Thanks for the patch.  I had a similar one queued internally, but I'll
take yours.  Unfortunately, we need to delay merging it for a couple
of weeks due.  This is due to the WORKDIR changes not working on
scarthgap and needing master to be pinned to scarthgap for an upcoming
BSP release.  I've added this patch to my gitlab master-next-master
branch (the name sucks, I know), and will push it to master once the
release occurs.

Thanks,
Jon

> ---
>  meta-arm/recipes-test/pacbti/test-pacbti.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-test/pacbti/test-pacbti.bb b/meta-arm/recipes-test/pacbti/test-pacbti.bb
> index 331c5854..b0ce1988 100644
> --- a/meta-arm/recipes-test/pacbti/test-pacbti.bb
> +++ b/meta-arm/recipes-test/pacbti/test-pacbti.bb
> @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://pacbti.c;beginline=2;endline=2;md5=6ec41034e04432ee37
>  
>  SRC_URI = "file://pacbti.c"
>  
> -S = "${WORKDIR}"
> +S = "${WORKDIR}/sources"
> +UNPACKDIR = "${S}"
>  
>  do_compile() {
>      # Compile with -zforce-bti with fatal warnings, so the link fails if PAC/BTI
> -- 
> 2.17.1
> 
>
diff mbox series

Patch

diff --git a/meta-arm/recipes-test/pacbti/test-pacbti.bb b/meta-arm/recipes-test/pacbti/test-pacbti.bb
index 331c5854..b0ce1988 100644
--- a/meta-arm/recipes-test/pacbti/test-pacbti.bb
+++ b/meta-arm/recipes-test/pacbti/test-pacbti.bb
@@ -4,7 +4,8 @@  LIC_FILES_CHKSUM = "file://pacbti.c;beginline=2;endline=2;md5=6ec41034e04432ee37
 
 SRC_URI = "file://pacbti.c"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_compile() {
     # Compile with -zforce-bti with fatal warnings, so the link fails if PAC/BTI