From 0407b7db5ea8cb30019aab6e63b05bee5c5ca6f6 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 26 Sep 2017 00:23:35 +1300 Subject: classes: drop image dependencies on TOPDIR variable We don't need a dependency on this variable changing, and having one causes locked signature warnings during eSDK installation if you have INITRAMFS_IMAGE_* set (since TOPDIR will always be different between the eSDK and the environment in which it was built). Relates to [YOCTO #12102]. (From OE-Core master rev: 073610af04be326f9245ca91714526b390fb72cd) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- meta/classes/qemuboot.bbclass | 1 + meta/classes/rootfs-postcommands.bbclass | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 4711c24593..68f251cfd0 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -33,7 +33,7 @@ IMAGE_CMD_wic () { mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" rm -rf "$out/" } -IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" +IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" # Rebuild when the wks file or vars in WICVARS change USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 86b306037f..3468d1c670 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -79,6 +79,7 @@ def qemuboot_vars(d): return build_vars + [k for k in d.keys() if k.startswith('QB_')] do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" +do_write_qemuboot_conf[vardepsexclude] += "TOPDIR" python do_write_qemuboot_conf() { import configparser diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2503d89e28..31f2560fb8 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -305,6 +305,7 @@ python write_image_test_data() { os.remove(testdata_link) os.symlink(os.path.basename(testdata), testdata_link) } +write_image_test_data[vardepsexclude] += "TOPDIR" # Check for unsatisfied recommendations (RRECOMMENDS) python rootfs_log_check_recommends() { -- cgit 1.2.3-korg