From ab0e1bed22b5054db5a2b62862134ad3b0714181 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 15 Feb 2011 22:56:13 -0600 Subject: package_rpm: Fix solverdb generation The RPM solverdb was potentially being generated multiple times. Fix this by ensuring we only process each directory once. Also correct an issue where the solution did not necessarily follow the preferred architecture ordering, reverse the default Poky ordering so that preferred is listed first. Signed-off-by: Mark Hatle --- meta/classes/rootfs_rpm.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/classes/rootfs_rpm.bbclass') diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 6fe11f77e4..a722e68ae1 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -48,8 +48,6 @@ fakeroot rootfs_rpm_do_rootfs () { #install pacakges export INSTALL_ROOTFS_RPM="${IMAGE_ROOTFS}" - export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" - export INSTALL_PLATFORM_EXTRA_RPM="${PACKAGE_ARCHS}" export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}" export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}" @@ -57,6 +55,13 @@ fakeroot rootfs_rpm_do_rootfs () { export INSTALL_PROVIDENAME_RPM="" export INSTALL_TASK_RPM="populate_sdk" + # List must be prefered to least preferred order + INSTALL_PLATFORM_RPM="" + for each_arch in ${PACKAGE_ARCHS} ; do + INSTALL_PLATFORM_RPM="$each_arch $INSTALL_PLATFORM_RPM" + done + export INSTALL_PLATFORM_RPM + package_install_internal_rpm export D=${IMAGE_ROOTFS} -- cgit v1.2.3-54-g00ecf