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:06:34 +0000 |
| commit | 8bf158857d7c597c58efc4023bdd9c2785d43ad3 (patch) | |
| tree | 428d07f52959638043b0f82a7d0eeda242b0b227 | |
| parent | f549338b0ed4d53dedac84c86e70ea9ffd12a17e (diff) | |
| download | openembedded-core-contrib-8bf158857d7c597c58efc4023bdd9c2785d43ad3.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)
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 () { 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 4b91972ce7..c19ff87389 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() { |