| Message ID | e5d4f65414368beed7b69e2c94482075aa2a0d81.1746130391.git.scott.murray@konsulko.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update to Rust 1.85.1 | expand |
This commit creates discrepancy between cargo.bbclass (from mixins) and ptest-cargo.bbclass (from oe-core) It needs https://git.openembedded.org/openembedded-core/commit/?id=98d03d31de4010534b1a00d29409d3486a0ab0b9 Same is true for scarthgap/rust (which triggered me to send that patch when testing last scarthgap/rust update). We probably need to copy ptest-cargo.bbclass into mixins to apply that change. Peter > -----Original Message----- > From: yocto-patches@lists.yoctoproject.org <yocto- > patches@lists.yoctoproject.org> On Behalf Of Scott Murray via > lists.yoctoproject.org > Sent: Thursday, May 1, 2025 22:40 > To: yocto-patches@lists.yoctoproject.org > Subject: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > pass PACKAGECONFIG_CONFARGS to cargo build > > From: Jean-Pierre Geslin <jarsoper@gmail.com> > > In order to allow rust packages to define PACKAGECONFIG options, append > the contents of PACKAGECONFIG_CONFARGS to the build command. > This patch was already submitted by Bartosz Golaszewski on older > version but was never merged. It will be really usefull for Rust recipes. > > Signed-off-by: Jean-Pierre Geslin <jarsoper@gmail.com> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > (adapted from oe-core commit 16745b20452de60ae2474433cc1a2fb1ed9f6a64) > Signed-off-by: Scott Murray <scott.murray@konsulko.com> > --- > classes/cargo.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass > index 76a3966..461d100 100644 > --- a/classes/cargo.bbclass > +++ b/classes/cargo.bbclass > @@ -48,7 +48,7 @@ oe_cargo_build () { > bbnote "Using rust targets from ${RUST_TARGET_PATH}" > bbnote "cargo = $(which ${CARGO})" > bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@" > - "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@" > + "${CARGO}" build ${CARGO_BUILD_FLAGS} > ${PACKAGECONFIG_CONFARGS} "$@" > } > > do_compile[progress] = "outof:\s+(\d+)/(\d+)" > -- > 2.49.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#1446): https://lists.yoctoproject.org/g/yocto- > patches/message/1446 > Mute This Topic: https://lists.yoctoproject.org/mt/112569359/4454441 > Group Owner: yocto-patches+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto- > patches/leave/13703729/4454441/683413657/xyzzy [peter.marko@siemens.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Sun, 4 May 2025, Marko, Peter wrote: > This commit creates discrepancy between cargo.bbclass (from mixins) and ptest-cargo.bbclass (from oe-core) > It needs https://git.openembedded.org/openembedded-core/commit/?id=98d03d31de4010534b1a00d29409d3486a0ab0b9 > Same is true for scarthgap/rust (which triggered me to send that patch when testing last scarthgap/rust update). > We probably need to copy ptest-cargo.bbclass into mixins to apply that change. > > Peter Thank you for mentioning this, it pointed out a lacking in my backporting scripting that resulted in it missing ptest-cargo.bbclass changes. I'll try to get things fixed up in the next day or two. Do you happen to know if python3-bcrypt on scarthgap branch would serve as a reasonable test of the class? It's the only non-selftest user in oe-core that I see on first glance. Thanks, Scott > > -----Original Message----- > > From: yocto-patches@lists.yoctoproject.org <yocto- > > patches@lists.yoctoproject.org> On Behalf Of Scott Murray via > > lists.yoctoproject.org > > Sent: Thursday, May 1, 2025 22:40 > > To: yocto-patches@lists.yoctoproject.org > > Subject: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > > pass PACKAGECONFIG_CONFARGS to cargo build > > > > From: Jean-Pierre Geslin <jarsoper@gmail.com> > > > > In order to allow rust packages to define PACKAGECONFIG options, append > > the contents of PACKAGECONFIG_CONFARGS to the build command. > > This patch was already submitted by Bartosz Golaszewski on older > > version but was never merged. It will be really usefull for Rust recipes. > > > > Signed-off-by: Jean-Pierre Geslin <jarsoper@gmail.com> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > (adapted from oe-core commit 16745b20452de60ae2474433cc1a2fb1ed9f6a64) > > Signed-off-by: Scott Murray <scott.murray@konsulko.com> > > --- > > classes/cargo.bbclass | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass > > index 76a3966..461d100 100644 > > --- a/classes/cargo.bbclass > > +++ b/classes/cargo.bbclass > > @@ -48,7 +48,7 @@ oe_cargo_build () { > > bbnote "Using rust targets from ${RUST_TARGET_PATH}" > > bbnote "cargo = $(which ${CARGO})" > > bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@" > > - "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@" > > + "${CARGO}" build ${CARGO_BUILD_FLAGS} > > ${PACKAGECONFIG_CONFARGS} "$@" > > } > > > > do_compile[progress] = "outof:\s+(\d+)/(\d+)" > > -- > > 2.49.0 > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#1446): https://lists.yoctoproject.org/g/yocto- > > patches/message/1446 > > Mute This Topic: https://lists.yoctoproject.org/mt/112569359/4454441 > > Group Owner: yocto-patches+owner@lists.yoctoproject.org > > Unsubscribe: https://lists.yoctoproject.org/g/yocto- > > patches/leave/13703729/4454441/683413657/xyzzy [peter.marko@siemens.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
> -----Original Message----- > From: Scott Murray <scott.murray@konsulko.com> > Sent: Monday, May 5, 2025 16:08 > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com> > Cc: yocto-patches@lists.yoctoproject.org > Subject: RE: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > pass PACKAGECONFIG_CONFARGS to cargo build > > On Sun, 4 May 2025, Marko, Peter wrote: > > > This commit creates discrepancy between cargo.bbclass (from mixins) and > ptest-cargo.bbclass (from oe-core) > > It needs https://git.openembedded.org/openembedded- > core/commit/?id=98d03d31de4010534b1a00d29409d3486a0ab0b9 > > Same is true for scarthgap/rust (which triggered me to send that patch when > testing last scarthgap/rust update). > > We probably need to copy ptest-cargo.bbclass into mixins to apply that change. > > > > Peter > > Thank you for mentioning this, it pointed out a lacking in my backporting > scripting that resulted in it missing ptest-cargo.bbclass changes. I'll > try to get things fixed up in the next day or two. Do you happen to know > if python3-bcrypt on scarthgap branch would serve as a reasonable test of > the class? It's the only non-selftest user in oe-core that I see on first > glance. > > Thanks, > > Scott python3-bcrypt is not a good candidate for testing my patch because it does not use PACKAGECONFIG but it also does not seem to use ptest-cargo.bbclass. Grepping ptest-cargo in oe-core and meta-oe yielded single hit - hello-rs, which also does not use PACKAGECONFIG. And I have seen patch for rpm-sequoia to use ptest-cargo, but again, not PACKAGECONFIG there. So it seems that it's a feature only for custom layers right now until rust/cargo recipes emerge. Peter > > > > > -----Original Message----- > > > From: yocto-patches@lists.yoctoproject.org <yocto- > > > patches@lists.yoctoproject.org> On Behalf Of Scott Murray via > > > lists.yoctoproject.org > > > Sent: Thursday, May 1, 2025 22:40 > > > To: yocto-patches@lists.yoctoproject.org > > > Subject: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > > > pass PACKAGECONFIG_CONFARGS to cargo build > > > > > > From: Jean-Pierre Geslin <jarsoper@gmail.com> > > > > > > In order to allow rust packages to define PACKAGECONFIG options, append > > > the contents of PACKAGECONFIG_CONFARGS to the build command. > > > This patch was already submitted by Bartosz Golaszewski on older > > > version but was never merged. It will be really usefull for Rust recipes. > > > > > > Signed-off-by: Jean-Pierre Geslin <jarsoper@gmail.com> > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > (adapted from oe-core commit > 16745b20452de60ae2474433cc1a2fb1ed9f6a64) > > > Signed-off-by: Scott Murray <scott.murray@konsulko.com> > > > --- > > > classes/cargo.bbclass | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass > > > index 76a3966..461d100 100644 > > > --- a/classes/cargo.bbclass > > > +++ b/classes/cargo.bbclass > > > @@ -48,7 +48,7 @@ oe_cargo_build () { > > > bbnote "Using rust targets from ${RUST_TARGET_PATH}" > > > bbnote "cargo = $(which ${CARGO})" > > > bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@" > > > - "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@" > > > + "${CARGO}" build ${CARGO_BUILD_FLAGS} > > > ${PACKAGECONFIG_CONFARGS} "$@" > > > } > > > > > > do_compile[progress] = "outof:\s+(\d+)/(\d+)" > > > -- > > > 2.49.0 > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > Links: You receive all messages sent to this group. > > > View/Reply Online (#1446): https://lists.yoctoproject.org/g/yocto- > > > patches/message/1446 > > > Mute This Topic: https://lists.yoctoproject.org/mt/112569359/4454441 > > > Group Owner: yocto-patches+owner@lists.yoctoproject.org > > > Unsubscribe: https://lists.yoctoproject.org/g/yocto- > > > patches/leave/13703729/4454441/683413657/xyzzy > [peter.marko@siemens.com] > > > -=-=-=-=-=-=-=-=-=-=-=- > > > > >
On Mon, 5 May 2025, Marko, Peter wrote: > > > -----Original Message----- > > From: Scott Murray <scott.murray@konsulko.com> > > Sent: Monday, May 5, 2025 16:08 > > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com> > > Cc: yocto-patches@lists.yoctoproject.org > > Subject: RE: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > > pass PACKAGECONFIG_CONFARGS to cargo build > > > > On Sun, 4 May 2025, Marko, Peter wrote: > > > > > This commit creates discrepancy between cargo.bbclass (from mixins) and > > ptest-cargo.bbclass (from oe-core) > > > It needs https://git.openembedded.org/openembedded- > > core/commit/?id=98d03d31de4010534b1a00d29409d3486a0ab0b9 > > > Same is true for scarthgap/rust (which triggered me to send that patch when > > testing last scarthgap/rust update). > > > We probably need to copy ptest-cargo.bbclass into mixins to apply that change. > > > > > > Peter > > > > Thank you for mentioning this, it pointed out a lacking in my backporting > > scripting that resulted in it missing ptest-cargo.bbclass changes. I'll > > try to get things fixed up in the next day or two. Do you happen to know > > if python3-bcrypt on scarthgap branch would serve as a reasonable test of > > the class? It's the only non-selftest user in oe-core that I see on first > > glance. > > > > Thanks, > > > > Scott > > python3-bcrypt is not a good candidate for testing my patch because it > does not use PACKAGECONFIG but it also does not seem to use ptest-cargo.bbclass. > Grepping ptest-cargo in oe-core and meta-oe yielded single hit - > hello-rs, which also does not use PACKAGECONFIG. > And I have seen patch for rpm-sequoia to use ptest-cargo, but again, > not PACKAGECONFIG there. So it seems that it's a feature only for > custom layers right now until rust/cargo recipes emerge. > > Peter Interesting, python3-bcrypt uses ptest-cargo on scarthgap, but that use was replaced with ptest-python-pytest on master branch in December. Scott > > > > -----Original Message----- > > > > From: yocto-patches@lists.yoctoproject.org <yocto- > > > > patches@lists.yoctoproject.org> On Behalf Of Scott Murray via > > > > lists.yoctoproject.org > > > > Sent: Thursday, May 1, 2025 22:40 > > > > To: yocto-patches@lists.yoctoproject.org > > > > Subject: [yocto-patches] [meta-lts-mixins][kirkstone/rust][PATCH 19/38] cargo: > > > > pass PACKAGECONFIG_CONFARGS to cargo build > > > > > > > > From: Jean-Pierre Geslin <jarsoper@gmail.com> > > > > > > > > In order to allow rust packages to define PACKAGECONFIG options, append > > > > the contents of PACKAGECONFIG_CONFARGS to the build command. > > > > This patch was already submitted by Bartosz Golaszewski on older > > > > version but was never merged. It will be really usefull for Rust recipes. > > > > > > > > Signed-off-by: Jean-Pierre Geslin <jarsoper@gmail.com> > > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > > (adapted from oe-core commit > > 16745b20452de60ae2474433cc1a2fb1ed9f6a64) > > > > Signed-off-by: Scott Murray <scott.murray@konsulko.com> > > > > --- > > > > classes/cargo.bbclass | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass > > > > index 76a3966..461d100 100644 > > > > --- a/classes/cargo.bbclass > > > > +++ b/classes/cargo.bbclass > > > > @@ -48,7 +48,7 @@ oe_cargo_build () { > > > > bbnote "Using rust targets from ${RUST_TARGET_PATH}" > > > > bbnote "cargo = $(which ${CARGO})" > > > > bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@" > > > > - "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@" > > > > + "${CARGO}" build ${CARGO_BUILD_FLAGS} > > > > ${PACKAGECONFIG_CONFARGS} "$@" > > > > } > > > > > > > > do_compile[progress] = "outof:\s+(\d+)/(\d+)" > > > > -- > > > > 2.49.0 > > > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > > Links: You receive all messages sent to this group. > > > > View/Reply Online (#1446): https://lists.yoctoproject.org/g/yocto- > > > > patches/message/1446 > > > > Mute This Topic: https://lists.yoctoproject.org/mt/112569359/4454441 > > > > Group Owner: yocto-patches+owner@lists.yoctoproject.org > > > > Unsubscribe: https://lists.yoctoproject.org/g/yocto- > > > > patches/leave/13703729/4454441/683413657/xyzzy > > [peter.marko@siemens.com] > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > > > > > >
diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass index 76a3966..461d100 100644 --- a/classes/cargo.bbclass +++ b/classes/cargo.bbclass @@ -48,7 +48,7 @@ oe_cargo_build () { bbnote "Using rust targets from ${RUST_TARGET_PATH}" bbnote "cargo = $(which ${CARGO})" bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@" - "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@" + "${CARGO}" build ${CARGO_BUILD_FLAGS} ${PACKAGECONFIG_CONFARGS} "$@" } do_compile[progress] = "outof:\s+(\d+)/(\d+)"