diff mbox series

default-distrovars: Drop DISTRO_FEATURES_LIBC

Message ID 20190225185954.15628-1-raj.khem@gmail.com
State Superseded
Headers show
Series default-distrovars: Drop DISTRO_FEATURES_LIBC | expand

Commit Message

Khem Raj Feb. 25, 2019, 6:59 p.m. UTC
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@gmail.com>

---
 meta/conf/distro/include/default-distrovars.inc | 10 +---------
 meta/conf/local.conf.sample.extended            | 16 ++--------------
 2 files changed, 3 insertions(+), 23 deletions(-)

-- 
2.20.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Jacob Kroon Feb. 25, 2019, 7:39 p.m. UTC | #1
On Mon, Feb 25, 2019 at 8:00 PM Khem Raj <raj.khem@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@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 \

> -                                       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}"

>


Maybe remove DISTRO_FEATURES_DEFAULT too ?

>  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@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Andre McCurdy Feb. 25, 2019, 8:14 p.m. UTC | #2
On Mon, Feb 25, 2019 at 11:00 AM Khem Raj <raj.khem@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@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.

> -                                       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@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Feb. 25, 2019, 9:14 p.m. UTC | #3
On Mon, Feb 25, 2019 at 12:14 PM Andre McCurdy <armccurdy@gmail.com> wrote:
>

> On Mon, Feb 25, 2019 at 11:00 AM Khem Raj <raj.khem@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@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@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Feb. 25, 2019, 9:19 p.m. UTC | #4
On Mon, Feb 25, 2019 at 11:41 AM Jacob Kroon <jacob.kroon@gmail.com> wrote:
>

> On Mon, Feb 25, 2019 at 8:00 PM Khem Raj <raj.khem@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@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 \

> > -                                       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}"

> >

>

> Maybe remove DISTRO_FEATURES_DEFAULT too ?

>


yes,  I think that can be done as well.

> >  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@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Scott Rifenbark Feb. 26, 2019, 4:40 p.m. UTC | #5
Hi,

The DISTRO_FEATURES_LIBC variable appears in the YP reference manual.  Will
it be safe to remove this for the 2.7 release?

Scott

On Mon, Feb 25, 2019 at 11:00 AM Khem Raj <raj.khem@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@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 \

> -                                       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@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div dir="ltr"><div>Hi, <br></div><div><br></div><div>The DISTRO_FEATURES_LIBC variable appears in the YP reference manual.  Will it be safe to remove this for the 2.7 release?</div><div><br></div><div>Scott<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Feb 25, 2019 at 11:00 AM Khem Raj &lt;<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">After eglibc was merged into glibc, Kconfig support was also dropped so<br>
these libc features therefore are not effective anymore and can be<br>
removed<br>
<br>
Signed-off-by: Khem Raj &lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt;<br>

---<br>
 meta/conf/distro/include/default-distrovars.inc | 10 +---------<br>
 meta/conf/local.conf.sample.extended            | 16 ++--------------<br>
 2 files changed, 3 insertions(+), 23 deletions(-)<br>
<br>
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc<br>
index 76edff6480..35da7f10e1 100644<br>
--- a/meta/conf/distro/include/default-distrovars.inc<br>
+++ b/meta/conf/distro/include/default-distrovars.inc<br>
@@ -11,15 +11,7 @@ LOCALE_UTF8_IS_DEFAULT ?= &quot;1&quot;<br>
 LOCALE_UTF8_IS_DEFAULT_class-nativesdk = &quot;0&quot;<br>
<br>
 DISTRO_FEATURES_DEFAULT ?= &quot;acl alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11&quot;<br>
-DISTRO_FEATURES_LIBC_DEFAULT ?= &quot;ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \<br>
-                                       libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \<br>
-                                       libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \<br>
-                                       libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \<br>
-                                       libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \<br>
-                                       libc-posix-wchar-io&quot;<br>
-DISTRO_FEATURES_LIBC ?= &quot;${DISTRO_FEATURES_LIBC_DEFAULT}&quot;<br>
-DISTRO_FEATURES_LIBC_class-nativesdk = &quot;${DISTRO_FEATURES_LIBC_DEFAULT}&quot;<br>
-DISTRO_FEATURES ?= &quot;${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}&quot;<br>
+DISTRO_FEATURES ?= &quot;${DISTRO_FEATURES_DEFAULT}&quot;<br>
<br>
 IMAGE_FEATURES ?= &quot;&quot;<br>
<br>
diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended<br>
index 010bf6ca6f..91e321047f 100644<br>
--- a/meta/conf/local.conf.sample.extended<br>
+++ b/meta/conf/local.conf.sample.extended<br>
@@ -24,22 +24,10 @@<br>
 # For a quad-core machine, BB_NUMBER_THREADS = &quot;4&quot;, PARALLEL_MAKE = &quot;-j 4&quot; would<br>
 # be appropriate for example.<br>
<br>
-<br>
-# glibc configurability is used to reduce minimal image&#39;s size.<br>
-# the all supported glibc options are listed in DISTRO_FEATURES_LIBC<br>
-# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC<br>
-# and DISTRO_FEATURES definitions to local.conf to enable the options.<br>
-#DISTRO_FEATURES_LIBC = &quot;ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \<br>
-#               libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \<br>
-#               libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-locales libc-locale-code \<br>
-#               libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \<br>
-#               libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \<br>
-#               libc-posix-wchar-io&quot;<br>
-<br>
-#DISTRO_FEATURES = &quot;alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}&quot;<br>
+#DISTRO_FEATURES = &quot;alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci&quot;<br>
<br>
 # If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf<br>
-#DISTRO_FEATURES = &quot;alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}&quot;<br>
+#DISTRO_FEATURES = &quot;alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb&quot;<br>
<br>
 # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale<br>
 # packages at build time using qemu-native. Disabling it (by setting it to 0)<br>
-- <br>
2.20.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Richard Purdie Feb. 26, 2019, 4:45 p.m. UTC | #6
On Tue, 2019-02-26 at 08:40 -0800, Scott Rifenbark wrote:
> Hi, 

> 

> The DISTRO_FEATURES_LIBC variable appears in the YP reference

> manual.  Will it be safe to remove this for the 2.7 release?


Yes, I'm going to take some variant of this cleanup for 2.7.

Cheers,

Richard

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

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 \
-					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)