summaryrefslogtreecommitdiff
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:01:45 +0000
commitfb01bd81197057e62106aac966f9ebc4c5054f97 (patch)
treeab1cfb914f8aec6d44f4bf7c747b12dc1e79ef93 /meta
parentdd2fdf9f5a3923c37e4ea2e46e347bb0657c2f5b (diff)
downloadopenembedded-core-fb01bd81197057e62106aac966f9ebc4c5054f97.tar.gz
openembedded-core-fb01bd81197057e62106aac966f9ebc4c5054f97.tar.bz2
openembedded-core-fb01bd81197057e62106aac966f9ebc4c5054f97.zip
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>
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
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: