summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-26 00:23:35 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-25 14:15:15 +0100
commit5532c4d72e044e1ffa8ccea93368796d8d24b94f (patch)
treedc215494dfd2d10e690433a74dce09a1c52e2d4c
parente4dae6320506db320d236c6b45f14f15a7c71c17 (diff)
downloadpoky-5532c4d72e044e1ffa8ccea93368796d8d24b94f.tar.gz
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 rev: 073610af04be326f9245ca91714526b390fb72cd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types_wic.bbclass2
-rw-r--r--meta/classes/qemuboot.bbclass1
-rw-r--r--meta/classes/rootfs-postcommands.bbclass1
3 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index b825b47ce5..e60dca7237 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -33,7 +33,7 @@ IMAGE_CMD_wic () {
33 mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" 33 mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
34 rm -rf "$out/" 34 rm -rf "$out/"
35} 35}
36IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" 36IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR"
37 37
38# Rebuild when the wks file or vars in WICVARS change 38# Rebuild when the wks file or vars in WICVARS change
39USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" 39USING_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 bd2f01db23..7243cc5257 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -79,6 +79,7 @@ def qemuboot_vars(d):
79 return build_vars + [k for k in d.keys() if k.startswith('QB_')] 79 return build_vars + [k for k in d.keys() if k.startswith('QB_')]
80 80
81do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" 81do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
82do_write_qemuboot_conf[vardepsexclude] += "TOPDIR"
82python do_write_qemuboot_conf() { 83python do_write_qemuboot_conf() {
83 import configparser 84 import configparser
84 85
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index f6d31a00f7..3755f94090 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -307,6 +307,7 @@ python write_image_test_data() {
307 os.remove(testdata_link) 307 os.remove(testdata_link)
308 os.symlink(os.path.basename(testdata), testdata_link) 308 os.symlink(os.path.basename(testdata), testdata_link)
309} 309}
310write_image_test_data[vardepsexclude] += "TOPDIR"
310 311
311# Check for unsatisfied recommendations (RRECOMMENDS) 312# Check for unsatisfied recommendations (RRECOMMENDS)
312python rootfs_log_check_recommends() { 313python rootfs_log_check_recommends() {