[oe-commits] org.oe.dev module_strip.bbclass: filter out directories to stop recent binutils from barfing

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9bc80e3bf4d08b6ed77ce96de58c776c9d4fcfe2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9bc80e3bf4d08b6ed77ce96de58c776c9d4fcfe2
Files:
1
classes/module_strip.bbclass
classes/package.bbclass
Diffs:

#
# mt diff -rad1166f61d6d481ac69e056549877746f94be421 -r9bc80e3bf4d08b6ed77ce96de58c776c9d4fcfe2
#
# 
# 
# patch "classes/module_strip.bbclass"
#  from [7a318c281c600f023cac8b2ed028ecf477d05819]
#    to [8e3caa4f01451918944e4ef6945431c922296b96]
# 
# patch "classes/package.bbclass"
#  from [b817cbbcad90778c23cc0370dc9294a886863dee]
#    to [320367e4ff24da31f0dab02120c1fbb76909eaa6]
# 
============================================================
--- classes/module_strip.bbclass	7a318c281c600f023cac8b2ed028ecf477d05819
+++ classes/module_strip.bbclass	8e3caa4f01451918944e4ef6945431c922296b96
@@ -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
============================================================
--- classes/package.bbclass	b817cbbcad90778c23cc0370dc9294a886863dee
+++ classes/package.bbclass	320367e4ff24da31f0dab02120c1fbb76909eaa6
@@ -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