From 59fc4bdefb3853d6893b9e3792018d54bb6bf99f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 23 Jan 2016 00:59:54 +1300 Subject: 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. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 3 +++ meta/classes/populate_sdk_ext.bbclass | 5 +++++ 2 files changed, 8 insertions(+) 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() { done } +do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ + ${COREBASE}/meta/files/toolchain-shar-extract.sh:True" + do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" 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() { install -m 0644 ${COREBASE}/meta/files/ext-sdk-prepare.py ${SDK_OUTPUT}/${SDKPATH} } +do_populate_sdk_ext[file-checksums] += "${COREBASE}/meta/files/ext-sdk-prepare.py:True" # Since bitbake won't run as root it doesn't make sense to try and install # the extensible sdk as root. @@ -358,4 +359,8 @@ do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar # Make sure codes change in copy_buildsystem can result in rebuilt do_populate_sdk_ext[vardeps] += "copy_buildsystem" +do_populate_sdk_ext[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ + ${COREBASE}/meta/files/toolchain-shar-extract.sh:True \ + ${COREBASE}/scripts/gen-lockedsig-cache:True" + addtask populate_sdk_ext after do_sdk_depends -- cgit 1.2.3-korg