summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-17 12:28:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:39:05 +0000
commit5ee145ebbb32824e3870b6dd689ce2b3f9bf3f17 (patch)
treec6c6e41a66b1f35232349e8be2f193fc74bb2f06
parent869601da9aa43d77564c37d291d9072b9896d3e6 (diff)
downloadopenembedded-core-5ee145ebbb32824e3870b6dd689ce2b3f9bf3f17.tar.gz
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. (From OE-Core rev: abe2a948905a997314c61a8fcd35e2b42a3f4408) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0e1d8dbfc4..2847f852ba 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: