mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-05 05:04:44 +02:00
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: 68ff5c458b7eb71171851d3c04660a36602bfee4) 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>
This commit is contained in:
parent
3a2cda9e84
commit
ceda35947e
|
@ -26,7 +26,7 @@ CARGO_INSTALL_LIBRARIES = "1"
|
|||
do_compile:prepend () {
|
||||
# rpm-sequoia.pc is generated in the source directory
|
||||
# but the target directory does not exist there.
|
||||
mkdir -p ${S}/target/release
|
||||
mkdir -p ${S}/target/${BUILD_DIR}
|
||||
|
||||
# From rpm-sequoia's README.md:
|
||||
#
|
||||
|
@ -58,7 +58,7 @@ do_install:append () {
|
|||
|
||||
# rpm-sequoia does not install its pkgconfig file. Do it manually.
|
||||
mkdir -p ${D}${libdir}/pkgconfig
|
||||
install -m644 ${S}/target/release/rpm-sequoia.pc ${D}${libdir}/pkgconfig
|
||||
install -m644 ${S}/target/${BUILD_DIR}/rpm-sequoia.pc ${D}${libdir}/pkgconfig
|
||||
}
|
||||
|
||||
do_install_ptest:append () {
|
||||
|
|
Loading…
Reference in New Issue
Block a user