diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-23 00:59:54 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:33 +0000 |
commit | 979c8fbec4674d79ce541aff0093df680003df5d (patch) | |
tree | f983e2bdcc4dd463d893bffb330fa9da3df9f697 /meta/classes | |
parent | f220abcff7ce74b8af447ea42ac5a294921b353a (diff) | |
download | poky-979c8fbec4674d79ce541aff0093df680003df5d.tar.gz |
classes/populate_sdk*: add dependencies on script files
If the script files we use to construct the SDK installer change then
that really ought to trigger re-execution of the do_populate_sdk(_ext)
task, so add file-checksums varflags to ensure that happens.
(From OE-Core rev: 59fc4bdefb3853d6893b9e3792018d54bb6bf99f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 99b64f7429..966161f824 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -243,6 +243,9 @@ populate_sdk_log_check() { | |||
243 | done | 243 | done |
244 | } | 244 | } |
245 | 245 | ||
246 | do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ | ||
247 | ${COREBASE}/meta/files/toolchain-shar-extract.sh:True" | ||
248 | |||
246 | do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" | 249 | do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" |
247 | do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" | 250 | do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" |
248 | do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}" | 251 | do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}" |
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 2944576398..a115127ebc 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -259,6 +259,7 @@ install_tools() { | |||
259 | 259 | ||
260 | install -m 0644 ${COREBASE}/meta/files/ext-sdk-prepare.py ${SDK_OUTPUT}/${SDKPATH} | 260 | install -m 0644 ${COREBASE}/meta/files/ext-sdk-prepare.py ${SDK_OUTPUT}/${SDKPATH} |
261 | } | 261 | } |
262 | do_populate_sdk_ext[file-checksums] += "${COREBASE}/meta/files/ext-sdk-prepare.py:True" | ||
262 | 263 | ||
263 | # Since bitbake won't run as root it doesn't make sense to try and install | 264 | # Since bitbake won't run as root it doesn't make sense to try and install |
264 | # the extensible sdk as root. | 265 | # the extensible sdk as root. |
@@ -358,4 +359,8 @@ do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar | |||
358 | # Make sure codes change in copy_buildsystem can result in rebuilt | 359 | # Make sure codes change in copy_buildsystem can result in rebuilt |
359 | do_populate_sdk_ext[vardeps] += "copy_buildsystem" | 360 | do_populate_sdk_ext[vardeps] += "copy_buildsystem" |
360 | 361 | ||
362 | do_populate_sdk_ext[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ | ||
363 | ${COREBASE}/meta/files/toolchain-shar-extract.sh:True \ | ||
364 | ${COREBASE}/scripts/gen-lockedsig-cache:True" | ||
365 | |||
361 | addtask populate_sdk_ext after do_sdk_depends | 366 | addtask populate_sdk_ext after do_sdk_depends |