Skip to contentSkip to conversation

classes: drop image dependencies on TOPDIR variable

PATCH New Paul Eggleton 1 participant 2 messages Sep 25, 2017

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover classes: drop image dependencies on TOPDIR variable

The following changes since commit acc5036a6b74a76d719e6f7224a398f47df4a041:

qemu: Security fixes (2017-09-22 17:14:44 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/esdk-sigs-fix
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/esdk-sigs-fix

Paul Eggleton (1):
classes: drop image dependencies on TOPDIR variable

 meta/classes/image_types_wic.bbclass     | 2 +-
 meta/classes/qemuboot.bbclass            | 1 +
 meta/classes/rootfs-postcommands.bbclass | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.9.5
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
---
 meta/classes/image_types_wic.bbclass     | 2 +-
 meta/classes/qemuboot.bbclass            | 1 +
 meta/classes/rootfs-postcommands.bbclass | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
meta/classes/image_types_wic.bbclass +1 -1
index b825b47..e60dca7 100644
@@ -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)}"
meta/classes/qemuboot.bbclass +1 -0
index bd2f01d..7243cc5 100644
@@ -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
meta/classes/rootfs-postcommands.bbclass +1 -0
index f6d31a0..3755f94 100644
@@ -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() {
Signature · 1 line
2.9.5