diff mbox series

[meta-lts-mixins,scarthgap/rust] rust-cross-canadian: use correct ${S}

Message ID 20250121092252.1123704-1-enrico.scholz@sigma-chemnitz.de
State New
Headers show
Series [meta-lts-mixins,scarthgap/rust] rust-cross-canadian: use correct ${S} | expand

Commit Message

Enrico Scholz Jan. 21, 2025, 9:22 a.m. UTC
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>

Porting back the UNPACKDIR changes broke do_install()

| + x86_64-oesdk-linux-gcc .../rust-cross-canadian-arm/1.80.1/rust-cross-canadian-arm-1.80.1/target-rust-ccld.c: No such file or directory
| compilation terminated.

Set $S to the expected value.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 recipes-devtools/rust/rust-cross-canadian.inc | 1 +
 1 file changed, 1 insertion(+)

Comments

Scott Murray Jan. 22, 2025, 8:59 p.m. UTC | #1
On Tue, 21 Jan 2025, Enrico Scholz wrote:

> From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
>
> Porting back the UNPACKDIR changes broke do_install()
>
> | + x86_64-oesdk-linux-gcc .../rust-cross-canadian-arm/1.80.1/rust-cross-canadian-arm-1.80.1/target-rust-ccld.c: No such file or directory
> | compilation terminated.
>
> Set $S to the expected value.

I remember looking at this, and thought I'd addressed it, but seems not,
good catch.  I have merged this and the classes-recipe fix to
scarthgap/rust, as well as re-enabling the one selftest that I had
disabled, as it now passes with the backported rust-target-config.bbclass
actually getting picked up.  I plan to look at backporting 1.81.0
tomorrow.

Thanks,

Scott


>
> Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
> ---
>  recipes-devtools/rust/rust-cross-canadian.inc | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/recipes-devtools/rust/rust-cross-canadian.inc b/recipes-devtools/rust/rust-cross-canadian.inc
> index ea21e8a..af9f2d6 100644
> --- a/recipes-devtools/rust/rust-cross-canadian.inc
> +++ b/recipes-devtools/rust/rust-cross-canadian.inc
> @@ -13,6 +13,7 @@ DEPENDS += "virtual/${SDK_PREFIX}gcc virtual/nativesdk-libc virtual/nativesdk-${
>
>  SRC_URI += "file://target-rust-ccld.c"
>  LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7"
> +S = "${WORKDIR}"
>
>  # Need to use our SDK's sh here, see #14878
>  create_sdk_wrapper () {
>
diff mbox series

Patch

diff --git a/recipes-devtools/rust/rust-cross-canadian.inc b/recipes-devtools/rust/rust-cross-canadian.inc
index ea21e8a..af9f2d6 100644
--- a/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/recipes-devtools/rust/rust-cross-canadian.inc
@@ -13,6 +13,7 @@  DEPENDS += "virtual/${SDK_PREFIX}gcc virtual/nativesdk-libc virtual/nativesdk-${
 
 SRC_URI += "file://target-rust-ccld.c"
 LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7"
+S = "${WORKDIR}"
 
 # Need to use our SDK's sh here, see #14878
 create_sdk_wrapper () {