[OE-core] [PATCH] default-distrovars: Drop DISTRO_FEATURES_LIBC

Khem Raj raj.khem at gmail.com
Mon Feb 25 21:14:28 UTC 2019


On Mon, Feb 25, 2019 at 12:14 PM Andre McCurdy <armccurdy at gmail.com> wrote:
>
> On Mon, Feb 25, 2019 at 11:00 AM Khem Raj <raj.khem at gmail.com> wrote:
> >
> > After eglibc was merged into glibc, Kconfig support was also dropped so
> > these libc features therefore are not effective anymore and can be
> > removed
> >
> > Signed-off-by: Khem Raj <raj.khem at gmail.com>
> > ---
> >  meta/conf/distro/include/default-distrovars.inc | 10 +---------
> >  meta/conf/local.conf.sample.extended            | 16 ++--------------
> >  2 files changed, 3 insertions(+), 23 deletions(-)
> >
> > diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> > index 76edff6480..35da7f10e1 100644
> > --- a/meta/conf/distro/include/default-distrovars.inc
> > +++ b/meta/conf/distro/include/default-distrovars.inc
> > @@ -11,15 +11,7 @@ LOCALE_UTF8_IS_DEFAULT ?= "1"
> >  LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
> >
> >  DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
> > -DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
>
> There are a lot of recipes which check the ipv6 distro feature. Those
> recipe should probably be updated before this is merged.
>

I think I will move ipv6 and ipv4 to DISTRO_FEATURES_DEFAULT
that will avoid immediate need to address it systemwide.

> > -                                       libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
> > -                                       libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \
> > -                                       libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \
> > -                                       libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
> > -                                       libc-posix-wchar-io"
> > -DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
> > -DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
> > -DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
> > +DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
> >
> >  IMAGE_FEATURES ?= ""
> >
> > diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended
> > index 010bf6ca6f..91e321047f 100644
> > --- a/meta/conf/local.conf.sample.extended
> > +++ b/meta/conf/local.conf.sample.extended
> > @@ -24,22 +24,10 @@
> >  # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
> >  # be appropriate for example.
> >
> > -
> > -# glibc configurability is used to reduce minimal image's size.
> > -# the all supported glibc options are listed in DISTRO_FEATURES_LIBC
> > -# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC
> > -# and DISTRO_FEATURES definitions to local.conf to enable the options.
> > -#DISTRO_FEATURES_LIBC = "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
> > -#               libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
> > -#               libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-locales libc-locale-code \
> > -#               libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \
> > -#               libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
> > -#               libc-posix-wchar-io"
> > -
> > -#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
> > +#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
> >
> >  # If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf
> > -#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}"
> > +#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb"
> >
> >  # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
> >  # packages at build time using qemu-native. Disabling it (by setting it to 0)
> > --
> > 2.20.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core


More information about the Openembedded-core mailing list