summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-05-01 16:50:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-03 06:11:57 +0100
commit5eb53830942141bfe57251dffecda36df90a62c1 (patch)
tree28e613e889f8c7f321a97d4fd0a878a9cd3d69be /meta-poky/conf
parentd9e8b11b6c04445512de0739632ce9a8b5b1f653 (diff)
downloadpoky-5eb53830942141bfe57251dffecda36df90a62c1.tar.gz
meta-poky: remove obsolete DISTRO_FEATURES_LIBC
(From meta-yocto rev: 2d548e8f5f2eaf0b6ae39d01e612284e47ec0899) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-rw-r--r--meta-poky/conf/distro/poky-tiny.conf4
-rw-r--r--meta-poky/conf/distro/poky.conf2
-rw-r--r--meta-poky/conf/local.conf.sample.extended20
3 files changed, 7 insertions, 19 deletions
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index 243d492918..a82d043e48 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -78,8 +78,8 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
78DISTRO_FEATURES_append_libc-uclibc = " largefile" 78DISTRO_FEATURES_append_libc-uclibc = " largefile"
79DISTRO_FEATURES_append_libc-musl = " largefile" 79DISTRO_FEATURES_append_libc-musl = " largefile"
80 80
81DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" 81DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
82DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" 82DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
83 83
84# enable mdev/busybox for init 84# enable mdev/busybox for init
85VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" 85VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index b5207f535d..78621e6dbf 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -19,7 +19,7 @@ POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
19POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" 19POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
20POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" 20POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
21 21
22DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" 22DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
23 23
24PREFERRED_VERSION_linux-yocto ?= "5.0%" 24PREFERRED_VERSION_linux-yocto ?= "5.0%"
25 25
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended
index 87d211db30..26603debe6 100644
--- a/meta-poky/conf/local.conf.sample.extended
+++ b/meta-poky/conf/local.conf.sample.extended
@@ -24,22 +24,10 @@
24# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would 24# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
25# be appropriate for example. 25# be appropriate for example.
26 26
27 27# If you want to get an image based on directfb without x11 alter
28# glibc configurability is used to reduce minimal image's size. 28# DISTRO_FEATURES:
29# the all supported glibc options are listed in DISTRO_FEATURES_LIBC 29DISTRO_FEATURES_append = " directfb"
30# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC 30DISTRO_FEATURES_remove = "x11"
31# and DISTRO_FEATURES definitions to local.conf to enable the options.
32#DISTRO_FEATURES_LIBC = "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
33# libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
34# libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-locales libc-locale-code \
35# libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \
36# libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
37# libc-posix-wchar-io"
38
39#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
40
41# If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf
42#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}"
43 31
44# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale 32# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
45# packages at build time using qemu-native. Disabling it (by setting it to 0) 33# packages at build time using qemu-native. Disabling it (by setting it to 0)