Skip to contentSkip to conversation

distro/vruntime: DISTRO_FEATURES_DEFAULT is obsolete

PATCH In review Tim Orling 3 participants 3 messages Apr 24

lore
Share & tools
lore

Tim Orling

author
#0 lore raw

PATCH 1/1 distro/vruntime: DISTRO_FEATURES_DEFAULT is obsolete

Replace with DISTRO_FEATURES_DEFAULTS

https://git.openembedded.org/openembedded-core/commit/meta/conf?id=0548ea447445834647be7ef35ed0ae8d1d3387b3

Fixes:
ERROR: Nothing PROVIDES 'nativesdk-libseccomp' ...

---
 conf/distro/vruntime.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
conf/distro/vruntime.conf +2 -2
index 0ea43e62..56c5ad6a 100644
@@ -46,8 +46,8 @@ DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci vcontainer vxn"
 DISTRO_FEATURES_OPTED_OUT = "pulseaudio gobject-introspection-data opengl ptest multiarch wayland vulkan"
 
 # Native and nativesdk classes need full features for build tools
-DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
-DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULTS} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULTS} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
 # Default to ext4, but image recipes may override to squashfs
 IMAGE_FSTYPES = "ext4"
Signature · 1 line
2.50.1 (Apple Git-155)
#1 lore raw
Quoted 17 lines · Tim Orling via lists.yoctoproject.org

Replace with DISTRO_FEATURES_DEFAULTS

https://git.openembedded.org/openembedded-core/commit/meta/conf?id=0548ea447445834647be7ef35ed0ae8d1d3387b3

Fixes:
ERROR: Nothing PROVIDES 'nativesdk-libseccomp' ...

---
 conf/distro/vruntime.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
conf/distro/vruntime.conf +0 -0
index 0ea43e62..56c5ad6a 100644

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci vcontainer vxn" · line 53

Quoted 10 lines
conf/distro/vruntime.conf +2 -2
@@ -46,8 +46,8 @@ DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci vcontainer vxn"
 DISTRO_FEATURES_OPTED_OUT = "pulseaudio gobject-introspection-data opengl ptest multiarch wayland vulkan"
 
 # Native and nativesdk classes need full features for build tools
-DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
-DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULTS} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULTS} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
 # Default to ext4, but image recipes may override to squashfs
 IMAGE_FSTYPES = "ext4"

Hi Tim,

This is the wrong approach as it bypasses the default feature filtering. Instead, just drop DISTRO_FEATURES_DEFAULT, the defaults are appended automatically after filtering for opt-outs.

See the corresponding change in poky [1] for an example.

[1]: https://git.yoctoproject.org/meta-yocto/commit/?id=96085aaec5bfb33c4e4322465eaf0af370db6fc0

Best regards,

Signature · 1 line
Paul Barker
#2 lore raw
Quoted 39 lines · Paul Barker
Quoted 3 lines · Tim Orling via lists.yoctoproject.org

Replace with DISTRO_FEATURES_DEFAULTS

https://git.openembedded.org/openembedded-core/commit/meta/conf?id=0548ea447445834647be7ef35ed0ae8d1d3387b3

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci

Quoted 14 lines

Fixes:
ERROR: Nothing PROVIDES 'nativesdk-libseccomp' ...

---
 conf/distro/vruntime.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
conf/distro/vruntime.conf +0 -0
index 0ea43e62..56c5ad6a 100644
@@ -46,8 +46,8 @@ DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci

vcontainer vxn"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci · line 46

Quoted 1 line
conf/distro/vruntime.conf +0 -0
 DISTRO_FEATURES_OPTED_OUT = "pulseaudio gobject-introspection-data

opengl ptest multiarch wayland vulkan"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci · line 48

Quoted 3 lines
conf/distro/vruntime.conf +0 -1
 # Native and nativesdk classes need full features for build tools
-DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT}

${POKY_DEFAULT_DISTRO_FEATURES}"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci · line 49

Quoted 1 line
conf/distro/vruntime.conf +0 -1
-DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT}

${POKY_DEFAULT_DISTRO_FEATURES}"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci · line 48

Quoted 1 line
conf/distro/vruntime.conf +1 -0
+DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULTS}

${POKY_DEFAULT_DISTRO_FEATURES}"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci · line 49

Quoted 1 line
conf/distro/vruntime.conf +1 -0
+DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULTS}

${POKY_DEFAULT_DISTRO_FEATURES}"

conf/distro/vruntime.conf DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci vcontainer vxn" · line 53

Quoted 3 lines
conf/distro/vruntime.conf +0 -0
 # Default to ext4, but image recipes may override to squashfs
 IMAGE_FSTYPES = "ext4"

Hi Tim,

Quoted 10 lines

This is the wrong approach as it bypasses the default feature filtering. Instead, just drop DISTRO_FEATURES_DEFAULT, the defaults are appended automatically after filtering for opt-outs.

See the corresponding change in poky [1] for an example.

[1]:
https://git.yoctoproject.org/meta-yocto/commit/?id=96085aaec5bfb33c4e4322465eaf0af370db6fc0

Thank you, Paul. Updated version sent.
https://lists.yoctoproject.org/g/meta-virtualization/message/9743

--Tim

Quoted 6 lines

Best regards,

--
Paul Barker