summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-04-06 20:26:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-10 09:10:36 +0100
commit144faeb10c79cc50249143591c63e500cbb9849e (patch)
treed698fcc75f8341241ea013e98aba2bc9a04cfb37
parent29f65bda6d2c9fea4adb125c4857ee64f9312b9f (diff)
downloadpoky-144faeb10c79cc50249143591c63e500cbb9849e.tar.gz
classes: Use ${MACHINE_ARCH} instead of ${MACHINE} for stamp-extra-info task flag
Without this change, there will be two sstate index files in tmp/sstate-control for any machine that contains a dash in the name. (From OE-Core rev: 29e7799bdb3773c40492e01448e0c614ed44583d) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/deploy.bbclass2
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/recipes-core/meta/signing-keys.bb3
6 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/deploy.bbclass b/meta/classes/deploy.bbclass
index 8ad07da015..6d52908783 100644
--- a/meta/classes/deploy.bbclass
+++ b/meta/classes/deploy.bbclass
@@ -8,4 +8,4 @@ python do_deploy_setscene () {
8} 8}
9addtask do_deploy_setscene 9addtask do_deploy_setscene
10do_deploy[dirs] = "${DEPLOYDIR} ${B}" 10do_deploy[dirs] = "${DEPLOYDIR} ${B}"
11do_deploy[stamp-extra-info] = "${MACHINE}" 11do_deploy[stamp-extra-info] = "${MACHINE_ARCH}"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1636eed6b0..2247b305da 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -289,7 +289,7 @@ SSTATETASKS += "do_image_complete"
289SSTATE_SKIP_CREATION_task-image-complete = '1' 289SSTATE_SKIP_CREATION_task-image-complete = '1'
290do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" 290do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}"
291do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" 291do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
292do_image_complete[stamp-extra-info] = "${MACHINE}" 292do_image_complete[stamp-extra-info] = "${MACHINE_ARCH}"
293addtask do_image_complete after do_image before do_build 293addtask do_image_complete after do_image before do_build
294python do_image_complete_setscene () { 294python do_image_complete_setscene () {
295 sstate_setscene(d) 295 sstate_setscene(d)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 504c0232ef..9bba021efb 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -2234,7 +2234,7 @@ SSTATETASKS += "do_packagedata"
2234do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" 2234do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}"
2235do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" 2235do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}"
2236do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" 2236do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}"
2237do_packagedata[stamp-extra-info] = "${MACHINE}" 2237do_packagedata[stamp-extra-info] = "${MACHINE_ARCH}"
2238 2238
2239python do_packagedata_setscene () { 2239python do_packagedata_setscene () {
2240 sstate_setscene(d) 2240 sstate_setscene(d)
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 77ec8aaec2..3560ef143c 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -156,7 +156,7 @@ SSTATE_SKIP_CREATION_task-populate-sdk = '1'
156do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}" 156do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}"
157do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" 157do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}"
158do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" 158do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}"
159do_populate_sdk[stamp-extra-info] = "${MACHINE}${SDKMACHINE}" 159do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}"
160 160
161fakeroot create_sdk_files() { 161fakeroot create_sdk_files() {
162 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ 162 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 655375416b..e1bba49eaf 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -722,6 +722,6 @@ SSTATE_SKIP_CREATION_task-populate-sdk-ext = '1'
722do_populate_sdk_ext[cleandirs] = "${SDKEXTDEPLOYDIR}" 722do_populate_sdk_ext[cleandirs] = "${SDKEXTDEPLOYDIR}"
723do_populate_sdk_ext[sstate-inputdirs] = "${SDKEXTDEPLOYDIR}" 723do_populate_sdk_ext[sstate-inputdirs] = "${SDKEXTDEPLOYDIR}"
724do_populate_sdk_ext[sstate-outputdirs] = "${SDK_DEPLOY}" 724do_populate_sdk_ext[sstate-outputdirs] = "${SDK_DEPLOY}"
725do_populate_sdk_ext[stamp-extra-info] = "${MACHINE}" 725do_populate_sdk_ext[stamp-extra-info] = "${MACHINE_ARCH}"
726 726
727addtask populate_sdk_ext after do_sdk_depends 727addtask populate_sdk_ext after do_sdk_depends
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index 6387d90d47..1e1c7e3459 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -69,7 +69,8 @@ do_deploy () {
69do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" 69do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}"
70# cleandirs should possibly be in deploy.bbclass but we need it 70# cleandirs should possibly be in deploy.bbclass but we need it
71do_deploy[cleandirs] = "${DEPLOYDIR}" 71do_deploy[cleandirs] = "${DEPLOYDIR}"
72# clear stamp-extra-info since MACHINE is normally put there by deploy.bbclass 72# clear stamp-extra-info since MACHINE_ARCH is normally put there by
73# deploy.bbclass
73do_deploy[stamp-extra-info] = "" 74do_deploy[stamp-extra-info] = ""
74addtask deploy after do_get_public_keys 75addtask deploy after do_get_public_keys
75 76