From 29e7799bdb3773c40492e01448e0c614ed44583d Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 6 Apr 2018 20:26:55 +0200 Subject: 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/deploy.bbclass | 2 +- meta/classes/image.bbclass | 2 +- meta/classes/package.bbclass | 2 +- meta/classes/populate_sdk_base.bbclass | 2 +- meta/classes/populate_sdk_ext.bbclass | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/classes') 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 () { } addtask do_deploy_setscene do_deploy[dirs] = "${DEPLOYDIR} ${B}" -do_deploy[stamp-extra-info] = "${MACHINE}" +do_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" SSTATE_SKIP_CREATION_task-image-complete = '1' do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" -do_image_complete[stamp-extra-info] = "${MACHINE}" +do_image_complete[stamp-extra-info] = "${MACHINE_ARCH}" addtask do_image_complete after do_image before do_build python do_image_complete_setscene () { 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" do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" -do_packagedata[stamp-extra-info] = "${MACHINE}" +do_packagedata[stamp-extra-info] = "${MACHINE_ARCH}" python do_packagedata_setscene () { 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' do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}" do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" -do_populate_sdk[stamp-extra-info] = "${MACHINE}${SDKMACHINE}" +do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}" fakeroot create_sdk_files() { 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' do_populate_sdk_ext[cleandirs] = "${SDKEXTDEPLOYDIR}" do_populate_sdk_ext[sstate-inputdirs] = "${SDKEXTDEPLOYDIR}" do_populate_sdk_ext[sstate-outputdirs] = "${SDK_DEPLOY}" -do_populate_sdk_ext[stamp-extra-info] = "${MACHINE}" +do_populate_sdk_ext[stamp-extra-info] = "${MACHINE_ARCH}" addtask populate_sdk_ext after do_sdk_depends -- cgit 1.2.3-korg