summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/default-distrovars.inc3
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 9002fd6f43..f07354771a 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -19,7 +19,8 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
19 libc-posix-wchar-io" 19 libc-posix-wchar-io"
20DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" 20DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
21DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" 21DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
22DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}" 22DISTRO_FEATURES_INITMAN ?= "sysvinit"
23DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}"
23 24
24IMAGE_FEATURES ?= "" 25IMAGE_FEATURES ?= ""
25 26
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 16ad4e3ef8..94e9e32f0b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -26,7 +26,7 @@ RCONFLICTS_${PN} = "task-core-boot"
26# Distro can override the following VIRTUAL-RUNTIME providers: 26# Distro can override the following VIRTUAL-RUNTIME providers:
27VIRTUAL-RUNTIME_dev_manager ?= "udev" 27VIRTUAL-RUNTIME_dev_manager ?= "udev"
28VIRTUAL-RUNTIME_login_manager ?= "tinylogin" 28VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
29VIRTUAL-RUNTIME_init_manager ?= "sysvinit" 29VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
30VIRTUAL-RUNTIME_initscripts ?= "initscripts" 30VIRTUAL-RUNTIME_initscripts ?= "initscripts"
31VIRTUAL-RUNTIME_keymaps ?= "keymaps" 31VIRTUAL-RUNTIME_keymaps ?= "keymaps"
32 32