[oe-commits] Tom Rini : external-toolchain-csl: Allow for sbin to be empty, update RPROVIDES

git version control git at git.openembedded.org
Fri Dec 17 16:33:54 UTC 2010


Module: openembedded.git
Branch: master
Commit: b7b5aa0a9b5a6ca6f0475c41e57b81c4286b6b87
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b7b5aa0a9b5a6ca6f0475c41e57b81c4286b6b87

Author: Tom Rini <tom_rini at mentor.com>
Date:   Fri Dec 17 09:26:02 2010 -0700

external-toolchain-csl: Allow for sbin to be empty, update RPROVIDES

Make the RPROVIDES list for glibc-dev match the real one.  In some
cases the sbin directory is empty, and that is OK.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/meta/external-toolchain-csl.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
index 3dcee49..2e109c8 100644
--- a/recipes/meta/external-toolchain-csl.bb
+++ b/recipes/meta/external-toolchain-csl.bb
@@ -24,7 +24,7 @@ PROVIDES = "\
 	linux-libc-headers \
 "
 
-RPROVIDES_glibc-dev += "libc-dev"
+RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
 PACKAGES_DYNAMIC += "glibc-gconv-*"
 PACKAGES_DYNAMIC += "glibc-locale-*"
 
@@ -211,9 +211,11 @@ do_install() {
 
 	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/lib/* ${D}${base_libdir}
 	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/etc/* ${D}${sysconfdir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/sbin/* ${D}${base_sbindir}
+	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/sbin/* ${D}${base_sbindir} \
+		|| true
 	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
 	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
+
 	rm -rf ${D}${bindir}/gdbserver
 	rm -rf ${D}${sysconfdir}/rpc
 	rm -rf ${D}${datadir}/zoneinfo





More information about the Openembedded-commits mailing list