Assigning IMAGE_FEATURES="" in local.conf doesn't actually do anything
useful, as bitbake.conf has IMAGE_FEATURES += EXTRA_IMAGE_FEATURES after
the include of local.conf.

In this test case, this results in IMAGE_FEATURES still using
EXTRA_IMAGE_FEATURES, so the image contains the files installed by the
post-install-logging feature.

As the intention here is that container-test-image is as minimal as
possible, move the IMAGE_FEATURES assignment into the image itself so
it actually works, and update the expected file list to remove the
post-install-logging files.

Signed-off-by: Ross Burton <[email protected]>
---
 .../recipes-test/container-image/container-test-image.bb       | 1 +
 meta/lib/oeqa/selftest/cases/containerimage.py                 | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-selftest/recipes-test/container-image/container-test-image.bb 
b/meta-selftest/recipes-test/container-image/container-test-image.bb
index d5f939c6e98..26b6409d1d6 100644
--- a/meta-selftest/recipes-test/container-image/container-test-image.bb
+++ b/meta-selftest/recipes-test/container-image/container-test-image.bb
@@ -4,5 +4,6 @@ LICENSE = "MIT"
 
 IMAGE_FSTYPES = "container"
 IMAGE_LINGUAS = ""
+IMAGE_FEATURES = ""
 
 inherit core-image
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py 
b/meta/lib/oeqa/selftest/cases/containerimage.py
index 23c0a1408a3..d1ac305a845 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -42,7 +42,6 @@ class ContainerImageTests(OESelftestTestCase):
         self.write_config("""PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
 IMAGE_FSTYPES = "container"
 PACKAGE_CLASSES = "package_ipk"
-IMAGE_FEATURES = ""
 IMAGE_BUILDINFO_FILE = ""
 INIT_MANAGER = "sysvinit"
 IMAGE_INSTALL:remove = "ssh-pregen-hostkeys"
@@ -55,8 +54,6 @@ IMAGE_INSTALL:remove = "ssh-pregen-hostkeys"
         expected_files = [
                     './',
                     '.{bindir}/theapp',
-                    '.{sysconfdir}/default/',
-                    '.{sysconfdir}/default/postinst',
                     '.{sysconfdir}/ld.so.cache',
                     '.{sysconfdir}/timestamp',
                     '.{sysconfdir}/version',
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206748): 
https://lists.openembedded.org/g/openembedded-core/message/206748
Mute This Topic: https://lists.openembedded.org/mt/109412887/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to