Skip to contentSkip to conversation

default-distrovars: Drop DISTRO_FEATURES_LIBC

PATCH Superseded Khem Raj 2 participants 4 messages Feb 25, 2019 – Feb 27, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/2 default-distrovars: Drop DISTRO_FEATURES_LIBC

After eglibc was merged into glibc, Kconfig support was also dropped so these libc features therefore are not effective anymore and can be removed

---
v2:
- Add ipv4 and ipv6 to default distro features, they are not libc specific anyway
- Remove DISTRO_FEATURES_DEFAULT as this is redundant now

 meta/conf/distro/include/default-distrovars.inc | 11 +----------
 meta/conf/local.conf.sample.extended            | 16 ++--------------
 2 files changed, 3 insertions(+), 24 deletions(-)
meta/conf/distro/include/default-distrovars.inc +1 -10
index 76edff6480..d57329ec17 100644
@@ -10,16 +10,7 @@ LOCALE_UTF8_ONLY ?= "0"
 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 ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
 
 IMAGE_FEATURES ?= ""
 
meta/conf/local.conf.sample.extended +2 -14
index 010bf6ca6f..0743fefece 100644
@@ -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 ipv4 ipv6 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 ipv4 ipv6 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)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 2/2 mesa-gl: Set PACKAGECONFIG for target

mesa.inc uses PACKAGECONFIG_class-target override to setup default packageconfigs, which means that when we build mesa-gl for target then it does no honor the ??= setting we have in mesa-gl recipe, and ends up compiling egl, gles2 as well, which is not intended.

---
 meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb +1 -0
index 73267eb4f0..d4b1c1c454 100644
@@ -7,3 +7,4 @@ PROVIDES = "virtual/libgl virtual/mesa"
 S = "${WORKDIR}/mesa-${PV}"
 
 PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 2/2] mesa-gl: Set PACKAGECONFIG for target

Fixes e.g.:
ERROR: weston-5.0.0-r0 do_prepare_recipe_sysroot: The file /usr/lib/libEGL.so.1.0.0 is installed by both mesa-gl and libhybris, aborting

but there is still:
ERROR: weston-5.0.0-r0 do_prepare_recipe_sysroot: The file /usr/include/KHR/khrplatform.h is installed by both mesa-gl and libhybris, aborting

I believe this header wasn't included in mesa-gl before recent changes, maybe something else needs to be filtered out?

Quoted 31 lines · Khem Raj

mesa.inc uses PACKAGECONFIG_class-target override to setup default packageconfigs, which means that when we build mesa-gl for target then it does no honor the ??= setting we have in mesa-gl recipe, and ends up compiling egl, gles2 as well, which is not intended.

---
 meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb +0 -0
index 73267eb4f0..d4b1c1c454 100644
@@ -7,3 +7,4 @@ PROVIDES = "virtual/libgl virtual/mesa"
 S = "${WORKDIR}/mesa-${PV}"
 
 PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES',

'x11', d)}"
+PACKAGECONFIG_class-target = "opengl dri
${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
--
2.20.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#3 lore raw

Re: [PATCH 2/2] mesa-gl: Set PACKAGECONFIG for target

Quoted 9 lines · Martin Jansa

Fixes e.g.:
ERROR: weston-5.0.0-r0 do_prepare_recipe_sysroot: The file /usr/lib/libEGL.so.1.0.0 is installed by both mesa-gl and libhybris, aborting

but there is still:
ERROR: weston-5.0.0-r0 do_prepare_recipe_sysroot: The file /usr/include/KHR/khrplatform.h is installed by both mesa-gl and libhybris, aborting

I believe this header wasn't included in mesa-gl before recent changes, maybe something else needs to be filtered out?

Yes, https://patchwork.freedesktop.org/patch/166596/
worked in past but does not work anymore with latest version maybe a regression or may be it will work with meson. irrespective of what/where gets fixed, this patch helps us to move

For rpi layer, I have fixed it like this
https://github.com/YoeDistro/meta-raspberrypi/commit/46dbdbb1f9059dcd36e032a074023ac9c78be4aa

probably, that fix should be made to main mesa-gl recipe itself so all can use it.

Quoted 29 lines · Khem Raj
Quoted 28 lines

mesa.inc uses PACKAGECONFIG_class-target override to setup default packageconfigs, which means that when we build mesa-gl for target then it does no honor the ??= setting we have in mesa-gl recipe, and ends up compiling egl, gles2 as well, which is not intended.

---
 meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb +1 -1
index 73267eb4f0..d4b1c1c454 100644
@@ -7,3 +7,4 @@ PROVIDES = "virtual/libgl virtual/mesa"
 S = "${WORKDIR}/mesa-${PV}"
 
 PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
--

2.20.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core