Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions conf/distro/include/oel.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions conf/distro/oel-tiny.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
Loading