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>
This commit is contained in:
parent
9a5e6dae05
commit
779228d7a4
|
@ -33,7 +33,7 @@ IMAGE_CMD_wic () {
|
||||||
mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
|
mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
|
||||||
rm -rf "$out/"
|
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
|
# 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)}"
|
USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}"
|
||||||
|
|
|
@ -79,6 +79,7 @@ def qemuboot_vars(d):
|
||||||
return build_vars + [k for k in d.keys() if k.startswith('QB_')]
|
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[vardeps] += "${@' '.join(qemuboot_vars(d))}"
|
||||||
|
do_write_qemuboot_conf[vardepsexclude] += "TOPDIR"
|
||||||
python do_write_qemuboot_conf() {
|
python do_write_qemuboot_conf() {
|
||||||
import configparser
|
import configparser
|
||||||
|
|
||||||
|
|
|
@ -305,6 +305,7 @@ python write_image_test_data() {
|
||||||
os.remove(testdata_link)
|
os.remove(testdata_link)
|
||||||
os.symlink(os.path.basename(testdata), testdata_link)
|
os.symlink(os.path.basename(testdata), testdata_link)
|
||||||
}
|
}
|
||||||
|
write_image_test_data[vardepsexclude] += "TOPDIR"
|
||||||
|
|
||||||
# Check for unsatisfied recommendations (RRECOMMENDS)
|
# Check for unsatisfied recommendations (RRECOMMENDS)
|
||||||
python rootfs_log_check_recommends() {
|
python rootfs_log_check_recommends() {
|
||||||
|
|
Loading…
Reference in New Issue