]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: Ensure we tell rpmdeps where to find its magic file
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 17 Nov 2011 12:28:13 +0000 (12:28 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 17 Nov 2011 12:30:51 +0000 (12:30 +0000)
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>
meta/classes/package.bbclass

index d01275f33a3e43adee89180029c9c5c55eeb8858..6775fda48029d8a80225cc1b4e1c6de55b471622 100644 (file)
@@ -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: