populate_sdk_*: Sync SDK and regular rootfs functions

In order for things to be easier to maintain in the future, sync up
the sdk and rootfs versions.

(From OE-Core rev: 3c78da15457d8d20c9964cd845f6e021d442aaae)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 4f627a52eb..7c06064e72 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -55,6 +55,13 @@ fakeroot rootfs_rpm_do_rootfs () {
         # install packages
         # This needs to work in the same way as populate_sdk_rpm.bbclass!
         export INSTALL_ROOTFS_RPM="${IMAGE_ROOTFS}"
+        export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
+        export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
+        export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}"
+        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}"
+        export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}"
+        export INSTALL_PROVIDENAME_RPM=""
+        export INSTALL_TASK_RPM="rootfs_rpm_do_rootfs"
 
         # Setup base system configuration
         mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
@@ -85,14 +92,6 @@ mutex_set_max           163840
 # ================ Replication
 EOF
 
-        export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
-        export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
-        export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}"
-        export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}"
-        export INSTALL_PROVIDENAME_RPM=""
-        export INSTALL_TASK_RPM="rootfs_rpm_do_rootfs"
-
         # List must be prefered to least preferred order
         INSTALL_PLATFORM_EXTRA_RPM=""
         for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS}; do