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 116e8b9..63e6569 100644 (file)
--- 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 27d5a3a..7d30688 100644 (file)
--- 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