[OE-core] [PATCH] uclibc: improve packaging granularity

[Saul Wold]

On 07/19/2011 09:01 AM, Phil Blundell wrote:
> Put each of the libraries into its own package rather than dumping them
> all into libc0.  This saves ~300kB on the installed size of an i586 micro-base-image
> and avoids the need to set the hated LEAD_SONAME.
>
> Signed-off-by: Phil Blundell<philb at gnu.org>
> ---
>   meta/recipes-core/uclibc/uclibc.inc |   31 ++++++++++++++++---------------
>   1 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
> index 23a8ecb..222c34f 100644
> --- a/meta/recipes-core/uclibc/uclibc.inc
> +++ b/meta/recipes-core/uclibc/uclibc.inc
> @@ -13,7 +13,7 @@ SECTION = "libs"
>   LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>   		    file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
>   file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
> -INC_PR = "r2"
> +INC_PR = "r4"
>
>   require uclibc-config.inc
>   STAGINGCC = "gcc-cross-intermediate"
> @@ -49,27 +49,28 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
>   INHIBIT_DEFAULT_DEPS = "1"
>
>   PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace"
> -
> -LEAD_SONAME = "libc.so"
> +PACKAGES =+ "uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm"
> +PACKAGES =+ "uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt"
> +
> +FILES_uclibc-libcrypt = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so"
> +FILES_uclibc-libintl = "${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so"
> +FILES_uclibc-libnsl = "${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so"
> +FILES_uclibc-libresolv = "${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so"
> +FILES_uclibc-libm = "${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so"
> +FILES_uclibc-libdl = "${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so"
> +FILES_uclibc-libutil = "${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so"
> +FILES_uclibc-libpthread = "${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so"
> +FILES_uclibc-librt = "${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so"
>
>   # The last line (gdb and lib1) is for uclinux-uclibc builds
> -uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \
> -                   ${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so \
> -                   ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so \
> -                   ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so \
> -                   ${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \
> +uclibc_baselibs = "${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \
>                      ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \
> -                   ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so \
> -                   ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so \
> -                   ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so \
> -                   ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so \
> -                   ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so \
>                      ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \
>                     "
>   FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
>                  ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
>   FILES_ldd = "${bindir}/ldd"
> -FILES_uclibc-dev_append = "\
> +FILES_${PN}-dev_append = "\
>           ${libdir}/lib*.so \
>           ${libdir}/*_nonshared.a \
>           ${libdir}/[S]*crt[1in].o \
> @@ -84,7 +85,7 @@ FILES_uclibc-thread-db = "${base_libdir}/libthread_db*"
>   FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*"
>   FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*"
>
> -RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"
> +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
>   # uclibc does not really have libsegfault but then using the one from glibc is also not
>   # going to work. So we pretend that we have it to make bitbake not pull other recipes
>   # to satisfy this dependency for the images/tasks

Merged into OE-Core

Thanks
	Sau!