[meta-virtualization] [PATCH] lasyer.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 <[email protected]>
---
 conf/layer.conf                                     | 2 +-
 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"
 
 # Propagate virtualization/vcontainer to native DISTRO_FEATURES for qemu virtfs support
 # This enables virtio-9p in qemu-system-native for container-cross-install batch imports
-DISTRO_FEATURES_NATIVE:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'vcontainer virtualization', 'virtualization', '', d)}"
+DISTRO_FEATURES_FILTER_NATIVE:append = " vcontainer virtualization"
 
 NON_MULTILIB_RECIPES:append:x86-64 = " kubernetes"
 
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 @@
 # This is required for the fast batch-import path in container-cross-install.
 #
 # Note: Native recipes don't see target DISTRO_FEATURES directly.
-# The layer.conf propagates virtualization to DISTRO_FEATURES_NATIVE when
-# vcontainer or virtualization is in the target DISTRO_FEATURES.
+# The layer.conf propagates virtualization and vcontainer to DISTRO_FEATURES
+# using DISTRO_FEATURES_FILTER_NATIVE.
 
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'virtualization', ' virtfs', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains_any('DISTRO_FEATURES', 'virtualization vcontainer', ' virtfs', '', d)}"