[oe-commits] Richard Purdie : package.bbclass: Ensure paths to rpmmarcos and rpmpopt are set

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: fb01bd81197057e62106aac966f9ebc4c5054f97
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fb01bd81197057e62106aac966f9ebc4c5054f97

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Nov 22 13:01:42 2011 +0000

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 at linuxfoundation.org>

---

 meta/classes/package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index c351f26..2a78a8f 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: