summaryrefslogtreecommitdiffstats
path: root/meta/classes/rootfs_rpm.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-08-01 12:34:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-02 14:32:11 +0100
commit06d4cf01ffff6b358c7dc9f4434aae2714496fd8 (patch)
tree6c1aebb16801e6a822cbd82bfaaca9eb1202febf /meta/classes/rootfs_rpm.bbclass
parentf9da3c269fd7c8260e3457f7f77b22ef659d3752 (diff)
downloadpoky-06d4cf01ffff6b358c7dc9f4434aae2714496fd8.tar.gz
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>
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r--meta/classes/rootfs_rpm.bbclass15
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 () {
55 # install packages 55 # install packages
56 # This needs to work in the same way as populate_sdk_rpm.bbclass! 56 # This needs to work in the same way as populate_sdk_rpm.bbclass!
57 export INSTALL_ROOTFS_RPM="${IMAGE_ROOTFS}" 57 export INSTALL_ROOTFS_RPM="${IMAGE_ROOTFS}"
58 export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
59 export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
60 export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}"
61 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}"
62 export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}"
63 export INSTALL_PROVIDENAME_RPM=""
64 export INSTALL_TASK_RPM="rootfs_rpm_do_rootfs"
58 65
59 # Setup base system configuration 66 # Setup base system configuration
60 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ 67 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
@@ -85,14 +92,6 @@ mutex_set_max 163840
85# ================ Replication 92# ================ Replication
86EOF 93EOF
87 94
88 export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
89 export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
90 export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}"
91 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}"
92 export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}"
93 export INSTALL_PROVIDENAME_RPM=""
94 export INSTALL_TASK_RPM="rootfs_rpm_do_rootfs"
95
96 # List must be prefered to least preferred order 95 # List must be prefered to least preferred order
97 INSTALL_PLATFORM_EXTRA_RPM="" 96 INSTALL_PLATFORM_EXTRA_RPM=""
98 for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS}; do 97 for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS}; do