diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2023-06-06 16:44:20 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-06-12 11:10:21 +0000 |
| commit | 0ccbb175eb5efdb59d0231198b295a21e3c466db (patch) | |
| tree | ccd24cf81672a66b11755ec923c6df865f65fdc8 | |
| parent | 5643c3d74cf81dc803453aad364b6c8f36603cd4 (diff) | |
meta-agl-ic-container: update for meta-agl-core changes
Changes:
- Pull in image .bb files instead of .inc files.
- Remove IMAGE_LINGUAS definitions, as they were the same as the
default value in meta-agl-core.
- Replace some :append usage with += to avoid creating problems
for downstream users.
Bug-AGL: SPEC-4813
Change-Id: I78a865057c9679fa7dd010ee8f99ee6424ecfb40
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
| -rw-r--r-- | meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb | 8 | ||||
| -rw-r--r-- | meta-agl-ic-container/recipes-platform/images/lxc-host-image-minimal.bb | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb index 5e2025a7..ca53456c 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb @@ -1,12 +1,10 @@ -SUMMARY = "A minimal container guest image" - -require recipes-platform/images/agl-image-boot.inc +require recipes-platform/images/agl-image-boot.bb -IMAGE_LINGUAS = " " +SUMMARY = "A minimal container guest image" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" -IMAGE_INSTALL:append = " \ +IMAGE_INSTALL += " \ packagegroup-agl-ic-core \ packagegroup-agl-container-feature-logging-guest \ " diff --git a/meta-agl-ic-container/recipes-platform/images/lxc-host-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/lxc-host-image-minimal.bb index 305d1dd8..59f36a5c 100644 --- a/meta-agl-ic-container/recipes-platform/images/lxc-host-image-minimal.bb +++ b/meta-agl-ic-container/recipes-platform/images/lxc-host-image-minimal.bb @@ -1,6 +1,6 @@ -SUMMARY = "A minimal container host image" +require recipes-platform/images/agl-image-boot.bb -require recipes-platform/images/agl-image-boot.inc +SUMMARY = "A minimal container host image" IMAGE_INSTALL += " \ kernel-image \ @@ -11,8 +11,6 @@ IMAGE_INSTALL += " \ CONTAINER_IMAGES ??= "" -IMAGE_LINGUAS ?= " " - NO_RECOMMENDATIONS = "1" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" |