From 23b8d4a02066be27792383f71feca2beec820608 Mon Sep 17 00:00:00 2001 From: Lucien Mueller Date: Fri, 6 Aug 2021 16:12:19 +0200 Subject: [PATCH] Merge all distro features. BugzID: 73589 Signed-off-by: Lucien Mueller --- conf/distro/netmodule-linux.conf | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf index 9e92171..e4e71b9 100644 --- a/conf/distro/netmodule-linux.conf +++ b/conf/distro/netmodule-linux.conf @@ -15,19 +15,13 @@ TARGET_VENDOR = "-netmodule" LOCALCONF_VERSION = "1" -# Override these in poky based distros -POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch" -POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" -POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" - -DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" -DISTRO_FEATURES_remove = "x11 3g" +DISTRO_FEATURES = "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci nfc vfat largefile opengl ptest multiarch usrmerge systemd sota usrmerge pulseaudio gobject-introspection-data ldconfig" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" -DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" +DISTRO_EXTRA_RDEPENDS = "packagegroup-core-boot" +DISTRO_EXTRA_RRECOMMENDS = "kernel-module-af-packet" POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" @@ -77,8 +71,6 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # OELAYOUT_ABI = "11" -DISTRO_FEATURES_append = " usrmerge" -DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"