diff --git a/conf/distro/include/oel.inc b/conf/distro/include/oel.inc index 08aa407..4cf538b 100644 --- a/conf/distro/include/oel.inc +++ b/conf/distro/include/oel.inc @@ -69,11 +69,10 @@ INIT_MANAGER ?= "systemd" DISTRO_EXTRA_RDEPENDS += "${OEL_DEFAULT_EXTRA_RDEPENDS}" -DISTRO_FEATURES_OPTED_OUT ?= " \ - acl alsa bluetooth debuginfod ext2 \ - wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp pulseaudio \ - gobject-introspection-data ldconfig opengl ptest multiarch wayland vulkan \ -" +# Opt in to OE-Core's default features explicitly instead of opting out of +# the rest: a feature OE-Core later adds to its defaults stays off in oel +# until it is listed here. +DISTRO_FEATURES_DEFAULTS ?= "ipv4 ipv6" # Exclude DATE from DISTRO/SDK_VERSION checksums DISTRO_VERSION[vardepsexclude] = "DATE" diff --git a/conf/distro/oel-tiny.conf b/conf/distro/oel-tiny.conf index 422a52d..c0e295b 100644 --- a/conf/distro/oel-tiny.conf +++ b/conf/distro/oel-tiny.conf @@ -68,8 +68,13 @@ DISTRO_FEATURES = " \ ${DISTRO_FEATURES_WIFI} \ " -DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULTS} ${OEL_DEFAULT_DISTRO_FEATURES}" -DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULTS} ${OEL_DEFAULT_DISTRO_FEATURES}" +# Native and nativesdk recipes take only the DISTRO_FEATURES_FILTER_NATIVE{,SDK} +# features from here (debuginfod opengl wayland), on top of +# DISTRO_FEATURES_NATIVE{,SDK}. Keep the ones OE-Core enables by default, as +# oel's DISTRO_FEATURES_DEFAULTS no longer carries them. +DISTRO_FEATURES_TINY_NATIVE = "debuginfod opengl wayland ${OEL_DEFAULT_DISTRO_FEATURES}" +DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_TINY_NATIVE}" +DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_TINY_NATIVE}" # Use tmpdevfs and the busybox runtime services VIRTUAL-RUNTIME_dev_manager = ""