diff options
author | Yash Shinde <Yash.Shinde@windriver.com> | 2025-07-03 02:14:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-07 22:12:50 +0100 |
commit | 9a084b728e7e26db8114417fee62cf6f8ee3091d (patch) | |
tree | 94b88ecb92bd031e3b59275ba6fc792e3ce53a07 | |
parent | 6cc72bc5b33993980c8d9ab02d6efee95c70ee80 (diff) | |
download | poky-9a084b728e7e26db8114417fee62cf6f8ee3091d.tar.gz |
rpm-sequoia: Use DEBUG_BUILD to determine build directory
Debug builds fail with a panic in build.rs when attempting
to create rpm-sequoia.pc in a non-existent target/debug directory:
process didn't exit successfully: `TOPDIR/tmp/work/core2-32-wrs-linux/rpm-sequoia/1.7.0/build/target/debug/build/rpm-sequoia-d2609670a855c0b5/build-script-build` (exit status: 101)
— stderr
thread 'main' panicked at build.rs:125:36:
Creating "TOPDIR/tmp/work/core2-32-wrs-linux/rpm-sequoia/1.7.0/sources-unpack/git/target/debug/rpm-sequoia.pc" (CARGO_TARGET_DIR: None): Os
{ code: 2, kind: NotFound, message: "No such file or directory" }
This was caused by the build and install logic assuming a fixed release directory
in rpm-sequoia recipe.
Update build and install steps to use the ${BUILD_DIR} variable,
which is set based on the value of DEBUG_BUILD from cargo.bbclass.
(rpm-sequoia inherits cargo)
This ensures paths used for rpm-sequoia.pc generation and installation
are valid in both debug and release configurations.
(From OE-Core rev: 2d21762d6f163c7fb8796d1035b0e25e21a3350b)
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb index 17d5a747ff..46f9ee8548 100644 --- a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb +++ b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb | |||
@@ -26,7 +26,7 @@ CARGO_INSTALL_LIBRARIES = "1" | |||
26 | do_compile:prepend () { | 26 | do_compile:prepend () { |
27 | # rpm-sequoia.pc is generated in the source directory | 27 | # rpm-sequoia.pc is generated in the source directory |
28 | # but the target directory does not exist there. | 28 | # but the target directory does not exist there. |
29 | mkdir -p ${S}/target/release | 29 | mkdir -p ${S}/target/${BUILD_DIR} |
30 | 30 | ||
31 | # From rpm-sequoia's README.md: | 31 | # From rpm-sequoia's README.md: |
32 | # | 32 | # |
@@ -58,7 +58,7 @@ do_install:append () { | |||
58 | 58 | ||
59 | # rpm-sequoia does not install its pkgconfig file. Do it manually. | 59 | # rpm-sequoia does not install its pkgconfig file. Do it manually. |
60 | mkdir -p ${D}${libdir}/pkgconfig | 60 | mkdir -p ${D}${libdir}/pkgconfig |
61 | install -m644 ${S}/target/release/rpm-sequoia.pc ${D}${libdir}/pkgconfig | 61 | install -m644 ${S}/target/${BUILD_DIR}/rpm-sequoia.pc ${D}${libdir}/pkgconfig |
62 | } | 62 | } |
63 | 63 | ||
64 | do_install_ptest:append () { | 64 | do_install_ptest:append () { |