From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 22 Nov 2011 13:01:42 +0000 (+0000)
Subject: package.bbclass: Ensure paths to rpmmarcos and rpmpopt are set
X-Git-Tag: 2015-4~12735
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fb01bd81197057e62106aac966f9ebc4c5054f97;p=openembedded-core.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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: