summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-09 11:24:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-16 14:31:27 +0000
commit5df29d420ad5b6432960ddf6d35fa16f1945078c (patch)
tree55ea3a62d6c59f346eea36bbaf4d0f0e0404fab1 /meta/classes
parent1f1367a59d9920b9e7a902200e9145cfcd9bd20a (diff)
downloadpoky-5df29d420ad5b6432960ddf6d35fa16f1945078c.tar.gz
image-buildinfo,oeqa/selftest/containerimage: Ensure image-buildinfo doesn't break tests
Having image-buildinfo enabled causes containerimage.ContainerImageTests.test_expected_files to fail due to the presence of an unexpected file: ['./', './etc/', - './etc/build', './etc/default/', './etc/default/postinst', Tweak the class to allow it to be disabled and disable it from the test just in case it was enabled. (From OE-Core rev: af67bf422a4df5b7e07894512ff73a5f493682ab) (From OE-Core rev: f49ab8b1610c045acaed7b964d12f07f969df856) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image-buildinfo.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 213fb9cf9b..87a6a1a489 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -64,6 +64,8 @@ def buildinfo_target(d):
64 64
65# Write build information to target filesystem 65# Write build information to target filesystem
66python buildinfo () { 66python buildinfo () {
67 if not d.getVar('IMAGE_BUILDINFO_FILE'):
68 return
67 with open(d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_FILE}'), 'w') as build: 69 with open(d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_FILE}'), 'w') as build:
68 build.writelines(( 70 build.writelines((
69 '''----------------------- 71 '''-----------------------