diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-04-06 20:26:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-10 09:10:36 +0100 |
| commit | 144faeb10c79cc50249143591c63e500cbb9849e (patch) | |
| tree | d698fcc75f8341241ea013e98aba2bc9a04cfb37 /meta/recipes-core/meta | |
| parent | 29f65bda6d2c9fea4adb125c4857ee64f9312b9f (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/recipes-core/meta')
| -rw-r--r-- | meta/recipes-core/meta/signing-keys.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 () { | |||
| 69 | do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" | 69 | do_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 |
| 71 | do_deploy[cleandirs] = "${DEPLOYDIR}" | 71 | do_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 | ||
| 73 | do_deploy[stamp-extra-info] = "" | 74 | do_deploy[stamp-extra-info] = "" |
| 74 | addtask deploy after do_get_public_keys | 75 | addtask deploy after do_get_public_keys |
| 75 | 76 | ||