summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-22 13:01:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-22 13:07:11 +0000
commit7a2458f451f9e189ee77fa5905fc862f6fc3e5ac (patch)
tree66fe98f0bc6021c81110a87dd43a9b126865449a /meta
parentd43175e747d6982cf3ca1a463eafc960b67966e2 (diff)
downloadpoky-7a2458f451f9e189ee77fa5905fc862f6fc3e5ac.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
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
1112fi 1112fi
1113} 1113}
1114 1114
1115RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc'" 1115RPMDEPS = "${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"
1116 1116
1117# Collect perfile run-time dependency metadata 1117# Collect perfile run-time dependency metadata
1118# Output: 1118# Output: