summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-06 18:35:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:04 +0000
commitbb3fa3e7a729482159a155fd3f3928d4cbb74601 (patch)
tree6ed2df9d37675a164d5e6d8d620cb7ac515ded96 /meta/conf
parentd82e303921f24b811b2fea9a5eb846736d997975 (diff)
downloadpoky-bb3fa3e7a729482159a155fd3f3928d4cbb74601.tar.gz
default-distrovars: don't add INITMAN to DISTRO_FEATURES and DISTRO_FEATURES_BACKFILL
DISTRO_FEATURES_INITMAN is going away as it's not useful in a hybrid init script environment. (From OE-Core rev: 7afd57993277ae7aa30e56edda327bb5f28ad153) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f0fec2a011..eafbcc2ddf 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -18,7 +18,7 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
18DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" 18DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
19DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" 19DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
20DISTRO_FEATURES_INITMAN ?= "sysvinit" 20DISTRO_FEATURES_INITMAN ?= "sysvinit"
21DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" 21DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 ${DISTRO_FEATURES_LIBC}"
22 22
23IMAGE_FEATURES ?= "" 23IMAGE_FEATURES ?= ""
24 24