diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-09-26 00:23:35 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-25 14:15:10 +0100 |
| commit | 073610af04be326f9245ca91714526b390fb72cd (patch) | |
| tree | ef76fb01baf622e11cd9c7cea63d6adcc11ea9aa /meta/classes | |
| parent | fc3a86ae68919cec72c1a8ae0f9ba1f98ae13f0d (diff) | |
| download | openembedded-core-073610af04be326f9245ca91714526b390fb72cd.tar.gz openembedded-core-073610af04be326f9245ca91714526b390fb72cd.tar.bz2 openembedded-core-073610af04be326f9245ca91714526b390fb72cd.zip | |
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].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -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 b825b47ce5..e60dca7237 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 bd2f01db23..7243cc5257 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 f6d31a00f7..3755f94090 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -307,6 +307,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() { |