From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 17 Nov 2011 12:28:13 +0000 (+0000)
Subject: package.bbclass: Ensure we tell rpmdeps where to find its magic file
X-Git-Tag: yocto-4.0~39143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abe2a948905a997314c61a8fcd35e2b42a3f4408;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

package.bbclass: Ensure we tell rpmdeps where to find its magic file

Without this, if rpmddeps came from a sstate package which was relocated
it might not find its magic file and if that happens, requires/provides
in packages could get corrupted. This leads to failures at rootfs time
during builds with messages like:

libdbus-1.so.3 is needed by libdbus-glib-1-2-0.92-r1.armv5te

since the provides would be missing in the dbus package.

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

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d01275f33a3..6775fda4802 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"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps  --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc'"
 
 # Collect perfile run-time dependency metadata
 # Output: