From bcec98bf1c0d3ff62852331ada5041b24eac6524 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 22 Nov 2011 13:01:42 +0000 Subject: [PATCH] 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) (From OE-Core rev: 15f50ab3ee454dc3510801d61bb09bf37d78d1af) Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2847f852ba..deaa87b922 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1110,7 +1110,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: