summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-10 14:55:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:42 +0000
commitb772c8cde5a8d53de5588ff5d2771c1bd3eb259f (patch)
tree60251b8473d901544fb39acae4d0b9b780e81575 /meta
parent6c92cfc02014a55c4d3a40d70ff29308ad6255e7 (diff)
downloadpoky-b772c8cde5a8d53de5588ff5d2771c1bd3eb259f.tar.gz
bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change makes the purpose of the staging directory more obvious and the taskname more true to what it now actually does. The layout version number is increased due to the change in layout but code to convert existing directories and insert a symlink for backwards compatibility is included. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass28
-rw-r--r--meta/classes/bootimg.bbclass10
-rw-r--r--meta/classes/image.bbclass8
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/insserv.bbclass2
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/package_deb.bbclass4
-rw-r--r--meta/classes/package_ipk.bbclass4
-rw-r--r--meta/classes/package_rpm.bbclass4
-rw-r--r--meta/classes/package_tar.bbclass4
-rw-r--r--meta/classes/packaged-staging.bbclass28
-rw-r--r--meta/classes/patch.bbclass2
-rw-r--r--meta/classes/rootfs_deb.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass4
-rw-r--r--meta/classes/rootfs_rpm.bbclass6
-rw-r--r--meta/classes/sanity.bbclass7
-rw-r--r--meta/classes/sdl.bbclass2
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/packages/linux/linux-mx31.inc2
-rw-r--r--meta/packages/linux/linux-nokia800.inc2
-rw-r--r--meta/packages/linux/linux-omap.inc2
-rw-r--r--meta/packages/linux/linux-simtec.inc2
-rw-r--r--meta/packages/uclibc/uclibc.inc2
-rw-r--r--meta/packages/zaurus-updater/zaurus-updater.bb2
25 files changed, 71 insertions, 64 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 053d80f6fd..a37949c7d4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -890,7 +890,7 @@ python base_eventhandler() {
890 890
891addtask configure after do_unpack do_patch 891addtask configure after do_unpack do_patch
892do_configure[dirs] = "${S} ${B}" 892do_configure[dirs] = "${S} ${B}"
893do_configure[deptask] = "do_populate_staging" 893do_configure[deptask] = "do_populate_sysroot"
894base_do_configure() { 894base_do_configure() {
895 : 895 :
896} 896}
@@ -978,26 +978,26 @@ def is_legacy_staging(d):
978 legacy = True 978 legacy = True
979 return legacy 979 return legacy
980 980
981do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \ 981do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
982 ${STAGING_DIR_TARGET}/${includedir} \ 982 ${STAGING_DIR_TARGET}/${includedir} \
983 ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ 983 ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
984 ${STAGING_INCDIR_NATIVE} \ 984 ${STAGING_INCDIR_NATIVE} \
985 ${STAGING_DATADIR} \ 985 ${STAGING_DATADIR} \
986 ${S} ${B}" 986 ${S} ${B}"
987 987
988# Could be compile but populate_staging and do_install shouldn't run at the same time 988# Could be compile but populate_sysroot and do_install shouldn't run at the same time
989addtask populate_staging after do_install 989addtask populate_sysroot after do_install
990 990
991PSTAGING_ACTIVE = "0" 991PSTAGING_ACTIVE = "0"
992SYSROOT_PREPROCESS_FUNCS ?= "" 992SYSROOT_PREPROCESS_FUNCS ?= ""
993SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" 993SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
994SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" 994SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
995 995
996python populate_staging_prehook () { 996python populate_sysroot_prehook () {
997 return 997 return
998} 998}
999 999
1000python populate_staging_posthook () { 1000python populate_sysroot_posthook () {
1001 return 1001 return
1002} 1002}
1003 1003
@@ -1005,7 +1005,7 @@ packagedstaging_fastpath () {
1005 : 1005 :
1006} 1006}
1007 1007
1008python do_populate_staging () { 1008python do_populate_sysroot () {
1009 # 1009 #
1010 # if do_stage exists, we're legacy. In that case run the do_stage, 1010 # if do_stage exists, we're legacy. In that case run the do_stage,
1011 # modify the SYSROOT_DESTDIR variable and then run the staging preprocess 1011 # modify the SYSROOT_DESTDIR variable and then run the staging preprocess
@@ -1023,10 +1023,10 @@ python do_populate_staging () {
1023 bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) 1023 bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True))
1024 lock = bb.utils.lockfile(lockfile) 1024 lock = bb.utils.lockfile(lockfile)
1025 bb.build.exec_func('do_stage', d) 1025 bb.build.exec_func('do_stage', d)
1026 bb.build.exec_func('populate_staging_prehook', d) 1026 bb.build.exec_func('populate_sysroot_prehook', d)
1027 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): 1027 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
1028 bb.build.exec_func(f, d) 1028 bb.build.exec_func(f, d)
1029 bb.build.exec_func('populate_staging_posthook', d) 1029 bb.build.exec_func('populate_sysroot_posthook', d)
1030 bb.utils.unlockfile(lock) 1030 bb.utils.unlockfile(lock)
1031 else: 1031 else:
1032 dest = bb.data.getVar('D', d, True) 1032 dest = bb.data.getVar('D', d, True)
@@ -1057,7 +1057,7 @@ base_do_package() {
1057 : 1057 :
1058} 1058}
1059 1059
1060addtask build after do_populate_staging 1060addtask build after do_populate_sysroot
1061do_build = "" 1061do_build = ""
1062do_build[func] = "1" 1062do_build[func] = "1"
1063 1063
@@ -1109,19 +1109,19 @@ def base_after_parse(d):
1109 srcuri = bb.data.getVar('SRC_URI', d, 1) 1109 srcuri = bb.data.getVar('SRC_URI', d, 1)
1110 if "git://" in srcuri: 1110 if "git://" in srcuri:
1111 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" 1111 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
1112 depends = depends + " git-native:do_populate_staging" 1112 depends = depends + " git-native:do_populate_sysroot"
1113 bb.data.setVarFlag('do_fetch', 'depends', depends, d) 1113 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
1114 1114
1115 # Mercurial packages should DEPEND on mercurial-native 1115 # Mercurial packages should DEPEND on mercurial-native
1116 elif "hg://" in srcuri: 1116 elif "hg://" in srcuri:
1117 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" 1117 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
1118 depends = depends + " mercurial-native:do_populate_staging" 1118 depends = depends + " mercurial-native:do_populate_sysroot"
1119 bb.data.setVarFlag('do_fetch', 'depends', depends, d) 1119 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
1120 1120
1121 # OSC packages should DEPEND on osc-native 1121 # OSC packages should DEPEND on osc-native
1122 elif "osc://" in srcuri: 1122 elif "osc://" in srcuri:
1123 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" 1123 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
1124 depends = depends + " osc-native:do_populate_staging" 1124 depends = depends + " osc-native:do_populate_sysroot"
1125 bb.data.setVarFlag('do_fetch', 'depends', depends, d) 1125 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
1126 1126
1127 # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback 1127 # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback
@@ -1131,7 +1131,7 @@ def base_after_parse(d):
1131 import hashlib 1131 import hashlib
1132 except ImportError: 1132 except ImportError:
1133 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" 1133 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
1134 depends = depends + " shasum-native:do_populate_staging" 1134 depends = depends + " shasum-native:do_populate_sysroot"
1135 bb.data.setVarFlag('do_fetch', 'depends', depends, d) 1135 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
1136 1136
1137 # 'multimachine' handling 1137 # 'multimachine' handling
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 37a59c2d71..5e838db56c 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -12,11 +12,11 @@
12# ${APPEND} - an override list of append strings for each label 12# ${APPEND} - an override list of append strings for each label
13# ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited 13# ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited
14 14
15do_bootimg[depends] += "dosfstools-native:do_populate_staging \ 15do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
16 syslinux:do_populate_staging \ 16 syslinux:do_populate_sysroot \
17 syslinux-installer-native:do_populate_staging \ 17 syslinux-installer-native:do_populate_sysroot \
18 mtools-native:do_populate_staging \ 18 mtools-native:do_populate_sysroot \
19 cdrtools-native:do_populate_staging" 19 cdrtools-native:do_populate_sysroot"
20 20
21PACKAGES = " " 21PACKAGES = " "
22 22
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c5a2dd2c50..e4e8900f98 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -12,7 +12,7 @@ export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
12PACKAGE_INSTALL_ATTEMPTONLY ?= "" 12PACKAGE_INSTALL_ATTEMPTONLY ?= ""
13 13
14# We need to recursively follow RDEPENDS and RRECOMMENDS for images 14# We need to recursively follow RDEPENDS and RRECOMMENDS for images
15do_rootfs[recrdeptask] += "do_deploy do_populate_staging" 15do_rootfs[recrdeptask] += "do_deploy do_populate_sysroot"
16 16
17# Images are generally built explicitly, do not need to be part of world. 17# Images are generally built explicitly, do not need to be part of world.
18EXCLUDE_FROM_WORLD = "1" 18EXCLUDE_FROM_WORLD = "1"
@@ -23,15 +23,15 @@ PID = "${@os.getpid()}"
23 23
24PACKAGE_ARCH = "${MACHINE_ARCH}" 24PACKAGE_ARCH = "${MACHINE_ARCH}"
25 25
26do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging ldconfig-native:do_populate_staging" 26do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot"
27 27
28python () { 28python () {
29 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" 29 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
30 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split(): 30 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
31 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []): 31 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
32 deps += " %s:do_populate_staging" % dep 32 deps += " %s:do_populate_sysroot" % dep
33 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split(): 33 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
34 deps += " %s:do_populate_staging" % dep 34 deps += " %s:do_populate_sysroot" % dep
35 bb.data.setVarFlag('do_rootfs', 'depends', deps, d) 35 bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
36 36
37 runtime_mapping_rename("PACKAGE_INSTALL", d) 37 runtime_mapping_rename("PACKAGE_INSTALL", d)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 4b993b55d4..e74633051a 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -473,7 +473,7 @@ python do_package_qa () {
473 473
474 474
475# The Staging Func, to check all staging 475# The Staging Func, to check all staging
476addtask qa_staging after do_populate_staging before do_build 476addtask qa_staging after do_populate_sysroot before do_build
477python do_qa_staging() { 477python do_qa_staging() {
478 bb.note("QA checking staging") 478 bb.note("QA checking staging")
479 479
diff --git a/meta/classes/insserv.bbclass b/meta/classes/insserv.bbclass
index d8e88c70ff..14290a77e2 100644
--- a/meta/classes/insserv.bbclass
+++ b/meta/classes/insserv.bbclass
@@ -1,4 +1,4 @@
1do_rootfs[depends] += "insserv-native:do_populate_staging" 1do_rootfs[depends] += "insserv-native:do_populate_sysroot"
2run_insserv () { 2run_insserv () {
3 insserv -p ${IMAGE_ROOTFS}/etc/init.d -c ${STAGING_ETCDIR_NATIVE}/insserv.conf 3 insserv -p ${IMAGE_ROOTFS}/etc/init.d -c ${STAGING_ETCDIR_NATIVE}/insserv.conf
4} 4}
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6d384bebc1..a1e369e0e3 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -119,7 +119,7 @@ python () {
119 if bb.data.getVar('PACKAGES', d, True) != '': 119 if bb.data.getVar('PACKAGES', d, True) != '':
120 deps = bb.data.getVarFlag('do_package', 'depends', d) or "" 120 deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
121 for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split(): 121 for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
122 deps += " %s:do_populate_staging" % dep 122 deps += " %s:do_populate_sysroot" % dep
123 bb.data.setVarFlag('do_package', 'depends', deps, d) 123 bb.data.setVarFlag('do_package', 'depends', deps, d)
124 124
125 deps = (bb.data.getVarFlag('do_package', 'deptask', d) or "").split() 125 deps = (bb.data.getVarFlag('do_package', 'deptask', d) or "").split()
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 5c002465b8..94a07b3481 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -252,8 +252,8 @@ python do_package_deb () {
252python () { 252python () {
253 if bb.data.getVar('PACKAGES', d, True) != '': 253 if bb.data.getVar('PACKAGES', d, True) != '':
254 deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split() 254 deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
255 deps.append('dpkg-native:do_populate_staging') 255 deps.append('dpkg-native:do_populate_sysroot')
256 deps.append('fakeroot-native:do_populate_staging') 256 deps.append('fakeroot-native:do_populate_sysroot')
257 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) 257 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
258} 258}
259 259
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 2621fa8e91..db6f5c5401 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -302,8 +302,8 @@ python do_package_ipk () {
302python () { 302python () {
303 if bb.data.getVar('PACKAGES', d, True) != '': 303 if bb.data.getVar('PACKAGES', d, True) != '':
304 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() 304 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
305 deps.append('opkg-utils-native:do_populate_staging') 305 deps.append('opkg-utils-native:do_populate_sysroot')
306 deps.append('fakeroot-native:do_populate_staging') 306 deps.append('fakeroot-native:do_populate_sysroot')
307 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) 307 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
308} 308}
309 309
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 49e84678b8..0e7bfa0f44 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -210,8 +210,8 @@ python do_package_rpm () {
210python () { 210python () {
211 if bb.data.getVar('PACKAGES', d, True) != '': 211 if bb.data.getVar('PACKAGES', d, True) != '':
212 deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split() 212 deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
213 deps.append('rpm-native:do_populate_staging') 213 deps.append('rpm-native:do_populate_sysroot')
214 deps.append('fakeroot-native:do_populate_staging') 214 deps.append('fakeroot-native:do_populate_sysroot')
215 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) 215 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
216} 216}
217 217
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index 24a77be93c..c63b6c9fa5 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -93,8 +93,8 @@ python do_package_tar () {
93python () { 93python () {
94 if bb.data.getVar('PACKAGES', d, True) != '': 94 if bb.data.getVar('PACKAGES', d, True) != '':
95 deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() 95 deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split()
96 deps.append('tar-native:do_populate_staging') 96 deps.append('tar-native:do_populate_sysroot')
97 deps.append('fakeroot-native:do_populate_staging') 97 deps.append('fakeroot-native:do_populate_sysroot')
98 bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) 98 bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d)
99} 99}
100 100
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 82a4450bc3..c572daedaf 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -52,7 +52,7 @@ python () {
52 # as inactive. 52 # as inactive.
53 if pstage_allowed: 53 if pstage_allowed:
54 deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" 54 deps = bb.data.getVarFlag('do_setscene', 'depends', d) or ""
55 deps += " stagemanager-native:do_populate_staging" 55 deps += " stagemanager-native:do_populate_sysroot"
56 bb.data.setVarFlag('do_setscene', 'depends', deps, d) 56 bb.data.setVarFlag('do_setscene', 'depends', deps, d)
57 57
58 policy = bb.data.getVar("BB_STAMP_POLICY", d, True) 58 policy = bb.data.getVar("BB_STAMP_POLICY", d, True)
@@ -157,7 +157,7 @@ staging_helper () {
157 fi 157 fi
158} 158}
159 159
160PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging" 160PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging"
161 161
162SCENEFUNCS += "packagestage_scenefunc" 162SCENEFUNCS += "packagestage_scenefunc"
163 163
@@ -259,21 +259,21 @@ python packagedstage_stampfixing_eventhandler() {
259 return NotHandled 259 return NotHandled
260} 260}
261 261
262populate_staging_preamble () { 262populate_sysroot_preamble () {
263 if [ "$PSTAGING_ACTIVE" = "1" ]; then 263 if [ "$PSTAGING_ACTIVE" = "1" ]; then
264 stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true 264 stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true
265 stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true 265 stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true
266 fi 266 fi
267} 267}
268 268
269populate_staging_postamble () { 269populate_sysroot_postamble () {
270 if [ "$PSTAGING_ACTIVE" = "1" ]; then 270 if [ "$PSTAGING_ACTIVE" = "1" ]; then
271 # list the packages currently installed in staging 271 # list the packages currently installed in staging
272 # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list 272 # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list
273 273
274 # exitcode == 5 is ok, it means the files change 274 # exitcode == 5 is ok, it means the files change
275 set +e 275 set +e
276 stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging 276 stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/sysroots
277 exitcode=$? 277 exitcode=$?
278 if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then 278 if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
279 exit $exitcode 279 exit $exitcode
@@ -288,20 +288,20 @@ populate_staging_postamble () {
288 288
289packagedstaging_fastpath () { 289packagedstaging_fastpath () {
290 if [ "$PSTAGING_ACTIVE" = "1" ]; then 290 if [ "$PSTAGING_ACTIVE" = "1" ]; then
291 mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ 291 mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
292 mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ 292 mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
293 cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true 293 cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
294 cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true 294 cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
295 fi 295 fi
296} 296}
297 297
298do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" 298do_populate_sysroot[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
299python populate_staging_prehook() { 299python populate_sysroot_prehook() {
300 bb.build.exec_func("populate_staging_preamble", d) 300 bb.build.exec_func("populate_sysroot_preamble", d)
301} 301}
302 302
303python populate_staging_posthook() { 303python populate_sysroot_posthook() {
304 bb.build.exec_func("populate_staging_postamble", d) 304 bb.build.exec_func("populate_sysroot_postamble", d)
305} 305}
306 306
307 307
@@ -444,9 +444,9 @@ python do_package_stage () {
444} 444}
445 445
446# 446#
447# Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging 447# Note an assumption here is that do_deploy runs before do_package_write/do_populate_sysroot
448# 448#
449addtask package_stage after do_package_write do_populate_staging before do_build 449addtask package_stage after do_package_write do_populate_sysroot before do_build
450 450
451do_package_stage_all () { 451do_package_stage_all () {
452 : 452 :
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 0706a02bc9..098bb92b89 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -450,7 +450,7 @@ def patch_init(d):
450addtask patch after do_unpack 450addtask patch after do_unpack
451do_patch[dirs] = "${WORKDIR}" 451do_patch[dirs] = "${WORKDIR}"
452 452
453PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging" 453PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
454do_patch[depends] = "${PATCHDEPENDENCY}" 454do_patch[depends] = "${PATCHDEPENDENCY}"
455 455
456python patch_do_patch() { 456python patch_do_patch() {
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 705b363d7b..16b8a86a58 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -5,7 +5,7 @@
5ROOTFS_PKGMANAGE = "run-postinsts dpkg" 5ROOTFS_PKGMANAGE = "run-postinsts dpkg"
6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
7 7
8do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" 8do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
9do_rootfs[recrdeptask] += "do_package_write_deb" 9do_rootfs[recrdeptask] += "do_package_write_deb"
10 10
11fakeroot rootfs_deb_do_rootfs () { 11fakeroot rootfs_deb_do_rootfs () {
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 065b78b814..ea1d6ba432 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -9,7 +9,7 @@ EXTRAOPKGCONFIG ?= ""
9ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}" 9ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}"
10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
11 11
12do_rootfs[depends] += "opkg-native:do_populate_staging opkg-utils-native:do_populate_staging" 12do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
13do_rootfs[recrdeptask] += "do_package_write_ipk" 13do_rootfs[recrdeptask] += "do_package_write_ipk"
14 14
15IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" 15IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}"
@@ -164,7 +164,7 @@ python () {
164 flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d) 164 flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d)
165 flags = flags.replace("do_package_write_ipk", "") 165 flags = flags.replace("do_package_write_ipk", "")
166 flags = flags.replace("do_deploy", "") 166 flags = flags.replace("do_deploy", "")
167 flags = flags.replace("do_populate_staging", "") 167 flags = flags.replace("do_populate_sysroot", "")
168 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) 168 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
169 bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_archlist\nipk_insert_feed_uris", d) 169 bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_archlist\nipk_insert_feed_uris", d)
170 bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d) 170 bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index da5243ddf2..dd0257625f 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -6,10 +6,10 @@ ROOTFS_PKGMANAGE = "rpm yum"
6 6
7ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 7ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
8 8
9do_rootfs[depends] += "rpm-native:do_populate_staging yum-native:do_populate_staging createrepo-native:do_populate_staging fakechroot-native:do_populate_staging" 9do_rootfs[depends] += "rpm-native:do_populate_sysroot yum-native:do_populate_sysroot createrepo-native:do_populate_sysroot fakechroot-native:do_populate_sysroot"
10 10
11# Needed for update-alternatives 11# Needed for update-alternatives
12do_rootfs[depends] += "opkg-native:do_populate_staging" 12do_rootfs[depends] += "opkg-native:do_populate_sysroot"
13 13
14do_rootfs[recrdeptask] += "do_package_write_rpm" 14do_rootfs[recrdeptask] += "do_package_write_rpm"
15 15
@@ -238,7 +238,7 @@ python () {
238 flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d) 238 flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d)
239 flags = flags.replace("do_package_write_rpm", "") 239 flags = flags.replace("do_package_write_rpm", "")
240 flags = flags.replace("do_deploy", "") 240 flags = flags.replace("do_deploy", "")
241 flags = flags.replace("do_populate_staging", "") 241 flags = flags.replace("do_populate_sysroot", "")
242 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) 242 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
243 bb.data.setVar('RPM_PREPROCESS_COMMANDS', "rpm_insert_feed_uris", d) 243 bb.data.setVar('RPM_PREPROCESS_COMMANDS', "rpm_insert_feed_uris", d)
244 bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) 244 bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 39f1e22003..71250b80af 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -147,6 +147,13 @@ def check_sanity(e):
147 if not abi.isdigit(): 147 if not abi.isdigit():
148 f = file(abifile, "w") 148 f = file(abifile, "w")
149 f.write(current_abi) 149 f.write(current_abi)
150 elif abi == "2" and current_abi == "3":
151 bb.note("Converting staging from layout version 2 to layout version 3")
152 os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))
153 os.system(bb.data.expand("ln -s sysroots ${TMPDIR}/staging", e.data))
154 os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data))
155 f = file(abifile, "w")
156 f.write(current_abi)
150 elif (abi != current_abi): 157 elif (abi != current_abi):
151 # Code to convert from one ABI to another could go here if possible. 158 # Code to convert from one ABI to another could go here if possible.
152 messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi) 159 messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
diff --git a/meta/classes/sdl.bbclass b/meta/classes/sdl.bbclass
index d478d97f18..a412ccbe0e 100644
--- a/meta/classes/sdl.bbclass
+++ b/meta/classes/sdl.bbclass
@@ -34,7 +34,7 @@ EOF
34} 34}
35 35
36EXPORT_FUNCTIONS do_sdl_install 36EXPORT_FUNCTIONS do_sdl_install
37addtask sdl_install after do_compile before do_populate_staging 37addtask sdl_install after do_compile before do_populate_sysroot
38 38
39SECTION = "x11/games" 39SECTION = "x11/games"
40SECTION_${PN}-opie = "opie/games" 40SECTION_${PN}-opie = "opie/games"
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index a6704254d4..3ffcb616ca 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "2" 7OELAYOUT_ABI = "3"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 33fc9c6b60..bcc858c287 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -250,7 +250,7 @@ D = "${WORKDIR}/image"
250S = "${WORKDIR}/${BP}" 250S = "${WORKDIR}/${BP}"
251B = "${S}" 251B = "${S}"
252 252
253STAGING_DIR = "${TMPDIR}/staging" 253STAGING_DIR = "${TMPDIR}/sysroots"
254 254
255STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 255STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
256STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" 256STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc
index 561dfea683..7df02c9b20 100644
--- a/meta/packages/linux/linux-mx31.inc
+++ b/meta/packages/linux/linux-mx31.inc
@@ -38,4 +38,4 @@ do_deploy() {
38 38
39do_deploy[dirs] = "${S}" 39do_deploy[dirs] = "${S}"
40 40
41addtask deploy before do_populate_staging after do_install 41addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta/packages/linux/linux-nokia800.inc
index 132bbfcc66..d373e4c907 100644
--- a/meta/packages/linux/linux-nokia800.inc
+++ b/meta/packages/linux/linux-nokia800.inc
@@ -43,4 +43,4 @@ do_deploy() {
43 43
44do_deploy[dirs] = "${S}" 44do_deploy[dirs] = "${S}"
45 45
46addtask deploy before do_populate_staging after do_install 46addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/linux/linux-omap.inc b/meta/packages/linux/linux-omap.inc
index 6037ee6408..6668deb154 100644
--- a/meta/packages/linux/linux-omap.inc
+++ b/meta/packages/linux/linux-omap.inc
@@ -38,5 +38,5 @@ do_deploy() {
38 38
39do_deploy[dirs] = "${S}" 39do_deploy[dirs] = "${S}"
40 40
41addtask deploy before do_populate_staging after do_install 41addtask deploy before do_populate_sysroot after do_install
42 42
diff --git a/meta/packages/linux/linux-simtec.inc b/meta/packages/linux/linux-simtec.inc
index b9503cef96..b9a65cc26b 100644
--- a/meta/packages/linux/linux-simtec.inc
+++ b/meta/packages/linux/linux-simtec.inc
@@ -19,4 +19,4 @@ do_deploy() {
19 19
20do_deploy[dirs] = "${S}" 20do_deploy[dirs] = "${S}"
21 21
22addtask deploy before do_populate_staging after do_install 22addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index d0afff5f3c..bb0b3643bc 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -73,7 +73,7 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}"
73OEMAKE_NO_CC = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \ 73OEMAKE_NO_CC = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \
74 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'" 74 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
75EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'" 75EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'"
76EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" 76EXTRA_OEMAKE_task_do_populate_sysroot = "${OEMAKE_NO_CC}"
77EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" 77EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
78 78
79KERNEL_SOURCE = "${STAGING_INCDIR}" 79KERNEL_SOURCE = "${STAGING_INCDIR}"
diff --git a/meta/packages/zaurus-updater/zaurus-updater.bb b/meta/packages/zaurus-updater/zaurus-updater.bb
index 0db411d750..4ab6fc43c4 100644
--- a/meta/packages/zaurus-updater/zaurus-updater.bb
+++ b/meta/packages/zaurus-updater/zaurus-updater.bb
@@ -32,4 +32,4 @@ do_deploy() {
32 esac 32 esac
33} 33}
34 34
35addtask deploy before do_populate_staging after do_compile 35addtask deploy before do_populate_sysroot after do_compile