diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-09-26 00:23:35 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-07 17:07:56 +0000 |
commit | 779228d7a4686761351a48a089a19fc7d3616d0a (patch) | |
tree | 7afa5b03330c06f7ec2fbe7f88f919e98f9d3bc8 | |
parent | 9a5e6dae054ef54e0da9837eb47f99a03eddf97e (diff) | |
download | poky-779228d7a4686761351a48a089a19fc7d3616d0a.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 master rev: 073610af04be326f9245ca91714526b390fb72cd)
(From OE-Core rev: 94a9f9a7dc5a736b7986b889895c736f02110715)
(From OE-Core rev: 8bf158857d7c597c58efc4023bdd9c2785d43ad3)
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.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/qemuboot.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 1 |
3 files changed, 3 insertions, 1 deletions
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 () { | |||
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 | } |
36 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" | 36 | IMAGE_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 |
39 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" | 39 | 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): | |||
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 | ||
81 | do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" | 81 | do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" |
82 | do_write_qemuboot_conf[vardepsexclude] += "TOPDIR" | ||
82 | python do_write_qemuboot_conf() { | 83 | python 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 4b91972ce7..c19ff87389 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -305,6 +305,7 @@ python write_image_test_data() { | |||
305 | os.remove(testdata_link) | 305 | os.remove(testdata_link) |
306 | os.symlink(os.path.basename(testdata), testdata_link) | 306 | os.symlink(os.path.basename(testdata), testdata_link) |
307 | } | 307 | } |
308 | write_image_test_data[vardepsexclude] += "TOPDIR" | ||
308 | 309 | ||
309 | # Check for unsatisfied recommendations (RRECOMMENDS) | 310 | # Check for unsatisfied recommendations (RRECOMMENDS) |
310 | python rootfs_log_check_recommends() { | 311 | python rootfs_log_check_recommends() { |