From 7a2458f451f9e189ee77fa5905fc862f6fc3e5ac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 22 Nov 2011 13:01:42 +0000 Subject: package.bbclass: Ensure paths to rpmmarcos and rpmpopt are set If rpm-native was built in an alternative location, it may not relocate correctly unless the rpmpopt and macros paths are explicitly specified. This fixes errors seen on the Yocto autobuilder where pkgconfig "provides" entries could disappear leading to image dependency failures. (From OE-Core rev: fb01bd81197057e62106aac966f9ebc4c5054f97) Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/package.bbclass') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index c351f26db0..2a78a8f54b 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1112,7 +1112,7 @@ if [ x"$D" = "x" ]; then fi } -RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc'" +RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" # Collect perfile run-time dependency metadata # Output: -- cgit v1.2.3-54-g00ecf