From: Koen Kooi <koen@openembedded.org>
Date: Wed, 18 Oct 2006 21:37:27 +0000 (+0000)
Subject: module_strip.bbclass: filter out directories to stop recent binutils from barfing
X-Git-Tag: Release-2010-05/1~9453^2~567^2~98^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc37acd5c46fb97318648d2e58f88798b9a2e0cb;p=openembedded.git

module_strip.bbclass: filter out directories to stop recent binutils from barfing
package.bbclass: likewise
---

diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass
index 116e8b902f..63e6569799 100644
--- a/classes/module_strip.bbclass
+++ b/classes/module_strip.bbclass
@@ -5,7 +5,11 @@ do_strip_modules () {
 		if test -e ${WORKDIR}/install/$p/lib/modules; then
 			modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`"
 			if [ -n "$modules" ]; then
-				${STRIP} -v -g $modules
+				for module in $modules ; do
+					if ! [ -d "$module"  ] ; then
+						${STRIP} -v -g $module
+					fi
+				done	
 #				NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules
 			fi
 		fi
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 27d5a3a685..7d3068852f 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -275,7 +275,7 @@ python populate_packages () {
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
-				if not os.path.islink(file) and isexec(file):
+				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					stripfunc += "\trunstrip %s || st=1\n" % (file)
 		if not stripfunc == "":
 			from bb import build