[oe-commits] : uclibc 0.9.29: fix -dbg packaging

[OE GIT Trial]

Module: OE.dev
Branch: master
Commit: 09f05b8660d539d404cf3964a2f7b3aa47a851a2
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=09f05b8660d539d404cf3964a2f7b3aa47a851a2

Author:  <koen at openembedded.org>
Date:   Sat Sep  6 13:09:25 2008 +0000

uclibc 0.9.29: fix -dbg packaging

---

 packages/uclibc/uclibc-0.9.29/uClibc.distro |    2 +-
 packages/uclibc/uclibc-initial_0.9.28.bb    |    4 ++++
 packages/uclibc/uclibc.inc                  |   12 ++++++++----
 packages/uclibc/uclibc_0.9.29.bb            |    2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.distro b/packages/uclibc/uclibc-0.9.29/uClibc.distro
index 022d247..af02b06 100644
--- a/packages/uclibc/uclibc-0.9.29/uClibc.distro
+++ b/packages/uclibc/uclibc-0.9.29/uClibc.distro
@@ -132,7 +132,7 @@ CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
-DOSTRIP=y
+DOSTRIP=n
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/packages/uclibc/uclibc-initial_0.9.28.bb b/packages/uclibc/uclibc-initial_0.9.28.bb
index 4bfbdb6..845875a 100644
--- a/packages/uclibc/uclibc-initial_0.9.28.bb
+++ b/packages/uclibc/uclibc-initial_0.9.28.bb
@@ -7,6 +7,10 @@ DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
+do_stage_avr32() {
+	:
+}
+
 do_stage() {
 	# Install initial headers into the cross dir
 	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 5b0ef91..f20caa2 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -26,7 +26,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
 # Blackfin needs a wrapper around ld
-DEPENDS_append_bfin = " elf2flt "
+#DEPENDS_append_bfin = " elf2flt "
 
 INHIBIT_DEFAULT_DEPS = "1"
 PARALLEL_MAKE = ""
@@ -132,6 +132,7 @@ do_configure() {
 
 	# Mangle the resulting .config depending on OE variables
 	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
+	sed -i -e s:'$(CROSS)strip':true: ${S}/Rules.mak	
 	perl -i -p -e '${configmangle}' ${S}/.config
 
    	sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
@@ -176,11 +177,11 @@ do_stage() {
 do_install() {
         # Tis MUST be done first because we
         # will install crt1.o in the install_dev stage and gcc needs it)
-	oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+	oe_runmake STRIPTOOL=true PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		install_dev install_runtime
 
-	oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+	oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
 		install_dev install_runtime 
 
 	# We don't really need this in ${includedir}
@@ -209,7 +210,10 @@ do_install() {
 	fi
 
         oe_runmake utils
-        oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+        oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_utils
+	
+	# oe_runstrip needs +x on files	
+	chmod +x ${D}/${base_libdir}/*
 }
 
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 90b52b3..6431e3e 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r26"
+PR = "r27"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc