summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-21 15:43:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 16:35:53 +0100
commitbd006a96711167c4498cc7e78994900435e42921 (patch)
treee3a8338ac501bd30158966d5368890efd28fef9e
parent6e9606ebc3595228653c367383779dc0816f4e21 (diff)
downloadpoky-bd006a96711167c4498cc7e78994900435e42921.tar.gz
uclibc: Fix packaging to match the new package order
This gets rid of some phony rdepends on uclibc-dev being reported (From OE-Core rev: 4eab0ed5dd23c2093992854c19ad5ab8c862746e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc28
1 files changed, 15 insertions, 13 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 67692793dc..4dae3031df 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -13,7 +13,7 @@ SECTION = "libs"
13LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 13LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
14 file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \ 14 file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
15file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960" 15file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
16INC_PR = "r7" 16INC_PR = "r8"
17 17
18require uclibc-config.inc 18require uclibc-config.inc
19STAGINGCC = "gcc-cross-intermediate" 19STAGINGCC = "gcc-cross-intermediate"
@@ -50,7 +50,7 @@ INHIBIT_DEFAULT_DEPS = "1"
50 50
51# Ensure the uclibc-dev package is processed before uclibc-staticdev to allow 51# Ensure the uclibc-dev package is processed before uclibc-staticdev to allow
52# *_nonshared.a libraries to be packaged in the uclibc-dev package. 52# *_nonshared.a libraries to be packaged in the uclibc-dev package.
53PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN} ${PN}-doc ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt" 53PACKAGES = "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
54 54
55FILES_uclibc-libcrypt = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so" 55FILES_uclibc-libcrypt = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so"
56FILES_uclibc-libintl = "${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so" 56FILES_uclibc-libintl = "${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so"
@@ -62,34 +62,36 @@ FILES_uclibc-libutil = "${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so
62FILES_uclibc-libpthread = "${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so" 62FILES_uclibc-libpthread = "${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so"
63FILES_uclibc-librt = "${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so" 63FILES_uclibc-librt = "${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so"
64 64
65FILES_ldd = "${bindir}/ldd"
66FILES_uclibc-utils = "${bindir} ${sbindir}"
67FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
68FILES_uclibc-gconv = "${libdir}/gconv"
69FILES_uclibc-thread-db = "${base_libdir}/libthread_db*"
70FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*"
71FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*"
72
65# The last line (gdb and lib1) is for uclinux-uclibc builds 73# The last line (gdb and lib1) is for uclinux-uclibc builds
66uclibc_baselibs = "${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \ 74uclibc_baselibs = "${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \
67 ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \ 75 ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \
68 ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \ 76 ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \
69 " 77 "
70FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ 78FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
71 ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" 79FILES_${PN}-dev += "\
72FILES_ldd = "${bindir}/ldd"
73FILES_${PN}-dev_append = "\
74 ${libdir}/lib*.so \ 80 ${libdir}/lib*.so \
75 ${libdir}/*_nonshared.a \ 81 ${libdir}/*_nonshared.a \
76 ${libdir}/[S]*crt[1in].o \ 82 ${libdir}/[S]*crt[1in].o \
77 ${libdir}/crtreloc*.o \ 83 ${libdir}/crtreloc*.o \
78 ${includedir}/*.h ${includedir}/*/*.h \ 84 ${includedir}/*.h ${includedir}/*/*.h \
79 " 85 "
80FILES_uclibc-utils = "${bindir} ${sbindir}" 86FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
81FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" 87 ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
82FILES_uclibc-gconv = "${libdir}/gconv"
83FILES_uclibc-thread-db = "${base_libdir}/libthread_db*"
84FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*"
85FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*"
86 88
87RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" 89RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
88# uclibc does not really have libsegfault but then using the one from glibc is also not 90# uclibc does not really have libsegfault but then using the one from glibc is also not
89# going to work. So we pretend that we have it to make bitbake not pull other recipes 91# going to work. So we pretend that we have it to make bitbake not pull other recipes
90# to satisfy this dependency for the images/tasks 92# to satisfy this dependency for the images/tasks
91 93
92RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH)" 94RPROVIDES_${PN} += "libsegfault rtld(GNU_HASH)"
93 95
94SRC_URI = "\ 96SRC_URI = "\
95 http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \ 97 http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \