summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/autotools.bbclass7
-rw-r--r--meta/classes/autotools_stage.bbclass2
-rw-r--r--meta/classes/packaged-staging.bbclass40
3 files changed, 43 insertions, 6 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 365258f65f..82ed36816b 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -151,7 +151,9 @@ autotools_do_install() {
151 done 151 done
152} 152}
153 153
154# STAGE_TEMP_PREFIX is used for a speedup by packaged-staging
154STAGE_TEMP="${WORKDIR}/temp-staging" 155STAGE_TEMP="${WORKDIR}/temp-staging"
156STAGE_TEMP_PREFIX = ""
155 157
156autotools_stage_includes() { 158autotools_stage_includes() {
157 if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ] 159 if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ]
@@ -167,11 +169,12 @@ autotools_stage_includes() {
167autotools_stage_dir() { 169autotools_stage_dir() {
168 from="$1" 170 from="$1"
169 to="$2" 171 to="$2"
172 prefix="${STAGE_TEMP_PREFIX}"
170 # This will remove empty directories so we can ignore them 173 # This will remove empty directories so we can ignore them
171 rmdir "$from" 2> /dev/null || true 174 rmdir "$from" 2> /dev/null || true
172 if [ -d "$from" ]; then 175 if [ -d "$from" ]; then
173 mkdir -p "$to" 176 mkdir -p "$prefix$to"
174 cp -fpPR "$from"/* "$to" 177 cp -fpPR "$from"/* "$prefix$to"
175 fi 178 fi
176} 179}
177 180
diff --git a/meta/classes/autotools_stage.bbclass b/meta/classes/autotools_stage.bbclass
index 010117c250..ff0f4cd880 100644
--- a/meta/classes/autotools_stage.bbclass
+++ b/meta/classes/autotools_stage.bbclass
@@ -2,4 +2,4 @@ inherit autotools
2 2
3do_stage () { 3do_stage () {
4 autotools_stage_all 4 autotools_stage_all
5} \ No newline at end of file 5}
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 9b9ba16bff..5d0ee9aa99 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -63,6 +63,24 @@ python () {
63 bb.data.setVarFlag('do_setscene', 'recrdeptask', deps, d) 63 bb.data.setVarFlag('do_setscene', 'recrdeptask', deps, d)
64 64
65 bb.data.setVar("PSTAGING_ACTIVE", "1", d) 65 bb.data.setVar("PSTAGING_ACTIVE", "1", d)
66
67 #
68 # Here we notice if the staging function is one of our standard staging
69 # routines. If it is, we can remvoe the need to lock staging and take
70 # timestamps which gives a nice speedup
71 #
72 fastpath = False
73 stagefunc = bb.data.getVar('do_stage', d, 1).strip()
74 if stagefunc == "autotools_stage_all":
75 fastpath = True
76 if stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
77 fastpath = True
78 if fastpath:
79 bb.note("Can optimise " + bb.data.getVar('FILE', d, 1))
80 bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d)
81 bb.data.setVar("STAGE_TEMP_PREFIX", "${WORKDIR}/temp-staging-pstage", d)
82 else:
83 bb.data.setVar("PSTAGING_NEEDSTAMP", "1", d)
66 else: 84 else:
67 bb.data.setVar("PSTAGING_ACTIVE", "0", d) 85 bb.data.setVar("PSTAGING_ACTIVE", "0", d)
68} 86}
@@ -297,14 +315,30 @@ populate_staging_postamble () {
297 fi 315 fi
298} 316}
299 317
300do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock" 318autotools_staging_pstage () {
319 mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
320 cp -fpPR ${WORKDIR}/temp-staging-pstage/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/
321 cp -fpPR ${WORKDIR}/temp-staging-pstage/${STAGING_DIR}/* ${STAGING_DIR}/
322}
323
324#do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
301do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" 325do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
302python do_populate_staging_prepend() { 326python do_populate_staging_prepend() {
303 bb.build.exec_func("populate_staging_preamble", d) 327 needstamp = bb.data.getVar("PSTAGING_NEEDSTAMP", d, 1)
328 lock = bb.data.expand("${STAGING_DIR}/staging.lock", d)
329 if needstamp == "1":
330 stamplock = bb.utils.lockfile(lock)
331 bb.build.exec_func("populate_staging_preamble", d)
304} 332}
305 333
306python do_populate_staging_append() { 334python do_populate_staging_append() {
307 bb.build.exec_func("populate_staging_postamble", d) 335 if needstamp == "1":
336 bb.build.exec_func("populate_staging_postamble", d)
337 bb.utils.unlockfile(stamplock)
338 else:
339 stamplock = bb.utils.lockfile(lock)
340 bb.build.exec_func("autotools_staging_pstage", d)
341 bb.utils.unlockfile(stamplock)
308} 342}
309 343
310 344