[oe-commits] Henning Heinold : dietlibc: move do_stage to do_install

[git version control]

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

Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date:   Tue Oct 19 15:47:26 2010 +0200

dietlibc: move do_stage to do_install

* bump INC_PR

---

 recipes/dietlibc/dietlibc.inc |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/recipes/dietlibc/dietlibc.inc b/recipes/dietlibc/dietlibc.inc
index 64bc6be..5532648 100644
--- a/recipes/dietlibc/dietlibc.inc
+++ b/recipes/dietlibc/dietlibc.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "The diet libc is a libc that is optimized for small size. \
 It can be used to create small statically linked binaries"
 LICENSE = "GPLv2"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/dietlibc/dietlibc-${PV}.tar.bz2" 
 
@@ -18,28 +18,25 @@ do_compile () {
 }
 
 #no packages needed, all binaries will be compiled with -static
-PACKAGES = " "
+PACKAGES = ""
 
 #otherwise the whole run scripts got broken
-do_install () {
-:
-}
 
-do_stage () {
+do_install () {
 	DIETLIBC_BUILD_ARCH=`echo ${BUILD_ARCH} | sed -e s'/.86/386/'`
 	DIETLIBC_TARGET_ARCH=`echo ${TARGET_ARCH} | sed -e s'/.86/386/'`
-	rm -rf ${STAGING_DIR_TARGET}/lib/dietlibc || true
-	rm ${TOOLCHAIN_PATH}/bin/diet || true
-	install -d ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH}
-	install -d ${STAGING_DIR_TARGET}/lib/dietlibc/include
-        for i in `find include -name \*.h`; do install -m 644 -D $i ${STAGING_DIR_TARGET}/lib/dietlibc/$i; done
 
-        install -m755 bin-${DIETLIBC_BUILD_ARCH}/diet-i ${TOOLCHAIN_PATH}/bin/diet
+	install -d ${D}${libdir}/dietlibc/include
+        for i in `find include -name \*.h`; do install -m 644 -D $i ${D}${libdir}/dietlibc/$i; done
+
+        install -d ${D}${bindir} 
+        install -m755 bin-${DIETLIBC_BUILD_ARCH}/diet-i ${D}${bindir}/diet
 	
 	cd bin-${DIETLIBC_TARGET_ARCH}
+	install -d ${D}${libdir}/dietlibc/lib-${DIETLIBC_TARGET_ARCH}
 	install -m 644 start.o libm.a libpthread.a librpc.a \
                        liblatin1.a libcompat.a libcrypt.a \
-		       ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH}
-        install -m 644 dietlibc.a ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH}/libc.a
+		       ${D}${libdir}/dietlibc/lib-${DIETLIBC_TARGET_ARCH}
+        install -m 644 dietlibc.a ${D}${libdir}/dietlibc/lib-${DIETLIBC_TARGET_ARCH}/libc.a
 }