diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2026-04-23 16:47:41 +0100 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-04-28 11:27:58 +0000 |
| commit | 3c4b5325bcaeed30df377f70a32486902643f8d7 (patch) | |
| tree | f25cf5ee609b9970826f85c1cbc272be61db3723 | |
| parent | 085c82e65d159f74b2681861f5c7a86723680f83 (diff) | |
| download | meta-virtualization-3c4b5325bcaeed30df377f70a32486902643f8d7.tar.gz | |
layer.conf/qemu-system-native: Improve native DISTRO_FEATURE handling
OE-Core needs to make some improvements to the way DISTRO_FEATURES is being built
but this will break the way meta-virtualization is handling native propagation.
Use DISTRO_FEATURES_FILTER_NATIVE which is designed for this.
That then means updating the bbappend just to look at DISTRO_FEATURES and to
look for both possible values.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | conf/layer.conf | 2 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-system-native_%.bbappend | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index eababe00..2a4a4c91 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
| @@ -72,7 +72,7 @@ HOSTTOOLS_NONFATAL += "getent" | |||
| 72 | 72 | ||
| 73 | # Propagate virtualization/vcontainer to native DISTRO_FEATURES for qemu virtfs support | 73 | # Propagate virtualization/vcontainer to native DISTRO_FEATURES for qemu virtfs support |
| 74 | # This enables virtio-9p in qemu-system-native for container-cross-install batch imports | 74 | # This enables virtio-9p in qemu-system-native for container-cross-install batch imports |
| 75 | DISTRO_FEATURES_NATIVE:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'vcontainer virtualization', 'virtualization', '', d)}" | 75 | DISTRO_FEATURES_FILTER_NATIVE:append = " vcontainer virtualization" |
| 76 | 76 | ||
| 77 | NON_MULTILIB_RECIPES:append:x86-64 = " kubernetes" | 77 | NON_MULTILIB_RECIPES:append:x86-64 = " kubernetes" |
| 78 | 78 | ||
diff --git a/recipes-devtools/qemu/qemu-system-native_%.bbappend b/recipes-devtools/qemu/qemu-system-native_%.bbappend index 1b77db02..e6703c0c 100644 --- a/recipes-devtools/qemu/qemu-system-native_%.bbappend +++ b/recipes-devtools/qemu/qemu-system-native_%.bbappend | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | # This is required for the fast batch-import path in container-cross-install. | 6 | # This is required for the fast batch-import path in container-cross-install. |
| 7 | # | 7 | # |
| 8 | # Note: Native recipes don't see target DISTRO_FEATURES directly. | 8 | # Note: Native recipes don't see target DISTRO_FEATURES directly. |
| 9 | # The layer.conf propagates virtualization to DISTRO_FEATURES_NATIVE when | 9 | # The layer.conf propagates virtualization and vcontainer to DISTRO_FEATURES |
| 10 | # vcontainer or virtualization is in the target DISTRO_FEATURES. | 10 | # using DISTRO_FEATURES_FILTER_NATIVE. |
| 11 | 11 | ||
| 12 | PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'virtualization', ' virtfs', '', d)}" | 12 | PACKAGECONFIG:append = "${@bb.utils.contains_any('DISTRO_FEATURES', 'virtualization vcontainer', ' virtfs', '', d)}" |