diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-03-12 19:15:25 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-03-12 19:18:50 +0000 |
| commit | 6240456e2d113ce1b7fe7bb43bf769035f23d465 (patch) | |
| tree | d4e37f4319d5207868868e4d71249acd32a594b8 /conf | |
| parent | c2eeba33360b0941ff2a89f44712e9212066f786 (diff) | |
| download | meta-virtualization-6240456e2d113ce1b7fe7bb43bf769035f23d465.tar.gz | |
container-registry: use FEATURE_PACKAGES for IMAGE_FEATURES validation
Move FEATURE_PACKAGES_container-registry from container-image-host.bb
to meta-virt-container.inc so it is available to all image recipes.
image.bbclass check_image_features() auto-discovers FEATURE_PACKAGES_*
variables as valid image features (line 72), so defining the variable
globally is sufficient — no IMAGE_FEATURES[validitems] needed.
This avoids the signature pollution that IMAGE_FEATURES[validitems]
causes when set globally, while allowing container-registry to be
used as an IMAGE_FEATURES value in any image recipe.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/meta-virt-container.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/conf/distro/include/meta-virt-container.inc b/conf/distro/include/meta-virt-container.inc index d3e91eef..6472d855 100644 --- a/conf/distro/include/meta-virt-container.inc +++ b/conf/distro/include/meta-virt-container.inc | |||
| @@ -40,3 +40,13 @@ | |||
| 40 | 40 | ||
| 41 | CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}" | 41 | CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}" |
| 42 | ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}" | 42 | ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}" |
| 43 | |||
| 44 | # Container registry IMAGE_FEATURES support. | ||
| 45 | # Defining FEATURE_PACKAGES_container-registry globally makes | ||
| 46 | # "container-registry" a valid IMAGE_FEATURES value for any image | ||
| 47 | # recipe (image.bbclass check_image_features auto-discovers | ||
| 48 | # FEATURE_PACKAGES_* variables). This avoids IMAGE_FEATURES[validitems] | ||
| 49 | # which pollutes signatures when set globally. | ||
| 50 | # Default is empty (validation only); container-image-host.bb sets the | ||
| 51 | # actual packages. | ||
| 52 | FEATURE_PACKAGES_container-registry ?= "" | ||
