summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-08-01 17:34:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-02 13:32:11 (GMT)
commit06d4cf01ffff6b358c7dc9f4434aae2714496fd8 (patch)
tree6c1aebb16801e6a822cbd82bfaaca9eb1202febf
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>
-rw-r--r--meta/classes/populate_sdk_deb.bbclass24
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass68
-rw-r--r--meta/classes/rootfs_rpm.bbclass15
3 files changed, 82 insertions, 25 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 25d90c7..1bf1b95 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -11,30 +11,38 @@ populate_sdk_post_deb () {
11 11
12fakeroot populate_sdk_deb () { 12fakeroot populate_sdk_deb () {
13 13
14 # update index
14 package_update_index_deb 15 package_update_index_deb
15 16
16 export INSTALL_TASK_DEB="populate_sdk" 17 ## install target ##
17 export INSTALL_PACKAGES_LINGUAS_DEB="" 18 # This needs to work in the same way as rootfs_deb.bbclass
18 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
19
20 #install target
21 echo "Installing TARGET packages" 19 echo "Installing TARGET packages"
20
21 mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
22
22 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 23 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
23 export INSTALL_BASEARCH_DEB="${DPKG_ARCH}" 24 export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
24 export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}" 25 export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
25 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}" 26 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}"
27 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
28 export PACKAGES_LINGUAS_DEB=""
29 export INSTALL_TASK_DEB="populate_sdk-target"
26 30
27 package_install_internal_deb 31 package_install_internal_deb
32
28 populate_sdk_post_deb ${INSTALL_ROOTFS_DEB} 33 populate_sdk_post_deb ${INSTALL_ROOTFS_DEB}
29 34
30 populate_sdk_log_check populate_sdk 35 populate_sdk_log_check populate_sdk
31 36
32 #install host 37 ## install nativesdk ##
33 echo "Installing HOST packages" 38 echo "Installing NATIVESDK packages"
34 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" 39 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
35 export INSTALL_BASEARCH_DEB="${SDK_ARCH}" 40 export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
36 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
37 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" 41 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
42 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
43 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
44 export PACKAGES_LINGUAS_DEB=""
45 export INSTALL_TASK_DEB="populate_sdk-nativesdk"
38 46
39 package_install_internal_deb 47 package_install_internal_deb
40 populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE} 48 populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE}
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 560e40c..5fb0234 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -26,21 +26,49 @@ fakeroot populate_sdk_rpm () {
26 package_update_index_rpm 26 package_update_index_rpm
27 package_generate_rpm_conf 27 package_generate_rpm_conf
28 28
29 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="" 29 ## install target ##
30 export INSTALL_PACKAGES_LINGUAS_RPM="" 30 # This needs to work in the same way as rootfs_rpm.bbclass!
31 export INSTALL_PROVIDENAME_RPM="/bin/sh" 31 #
32 export INSTALL_TASK_RPM="populate_sdk"
33
34
35 #install target
36 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 32 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
37 export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" 33 export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
38 export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" 34 export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
39 export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" 35 export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}"
36 export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
37 export INSTALL_PACKAGES_LINGUAS_RPM=""
38 export INSTALL_PROVIDENAME_RPM=""
39 export INSTALL_TASK_RPM="populate_sdk-target"
40
41 # Setup base system configuration
42 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
43 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}
44 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log
45 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF
46# ================ Environment
47set_data_dir .
48set_create_dir .
49set_lg_dir ./log
50set_tmp_dir ./tmp
51
52# -- thread_count must be >= 8
53set_thread_count 64
54
55# ================ Logging
56
57# ================ Memory Pool
58set_mp_mmapsize 268435456
59
60# ================ Locking
61set_lk_max_locks 16384
62set_lk_max_lockers 16384
63set_lk_max_objects 16384
64mutex_set_max 163840
65
66# ================ Replication
67EOF
40 68
41 # List must be prefered to least preferred order 69 # List must be prefered to least preferred order
42 INSTALL_PLATFORM_EXTRA_RPM="" 70 INSTALL_PLATFORM_EXTRA_RPM=""
43 for each_arch in ${PACKAGE_ARCHS} ; do 71 for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS} ; do
44 INSTALL_PLATFORM_EXTRA_RPM="$each_arch $INSTALL_PLATFORM_EXTRA_RPM" 72 INSTALL_PLATFORM_EXTRA_RPM="$each_arch $INSTALL_PLATFORM_EXTRA_RPM"
45 done 73 done
46 export INSTALL_PLATFORM_EXTRA_RPM 74 export INSTALL_PLATFORM_EXTRA_RPM
@@ -48,11 +76,16 @@ fakeroot populate_sdk_rpm () {
48 package_install_internal_rpm 76 package_install_internal_rpm
49 populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} 77 populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM}
50 78
51 #install host 79 ## install nativesdk ##
80 echo "Installing NATIVESDK packages"
52 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}" 81 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}"
53 export INSTALL_PLATFORM_RPM="${SDK_ARCH}" 82 export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
54 export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" 83 export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
55 export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" 84 export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
85 export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
86 export INSTALL_PACKAGES_LINGUAS_RPM=""
87 export INSTALL_PROVIDENAME_RPM="/bin/sh"
88 export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"
56 89
57 # List must be prefered to least preferred order 90 # List must be prefered to least preferred order
58 INSTALL_PLATFORM_EXTRA_RPM="" 91 INSTALL_PLATFORM_EXTRA_RPM=""
@@ -80,3 +113,20 @@ fakeroot populate_sdk_rpm () {
80 resolve_package_rpm foo ${RPMCONF_TARGET_BASE}.conf || true 113 resolve_package_rpm foo ${RPMCONF_TARGET_BASE}.conf || true
81 fi 114 fi
82} 115}
116
117python () {
118 ml_package_archs = ""
119 multilibs = d.getVar('MULTILIBS', True) or ""
120 for ext in multilibs.split():
121 eext = ext.split(':')
122 if len(eext) > 1 and eext[0] == 'multilib':
123 localdata = bb.data.createCopy(d)
124 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1]
125 localdata.setVar("OVERRIDES", overrides)
126 # TEMP: OVERRIDES isn't working right
127 localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "")
128 ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or ""
129 #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
130 bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)
131}
132
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 4f627a5..7c06064 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