From: Mark Hatle <mark.hatle@kernel.crashing.org>
Date: Fri, 7 Feb 2020 20:20:07 +0000 (-0600)
Subject: package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs
X-Git-Tag: uninative-2.8~248
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c50fcd54ffe60b63d042d05e6cf538a593dc410f;p=openembedded-core.git

package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs

Change the order of the skip processing to happen before any .ko and static
library processing.  This will allow these types of files to be individually
skipped if necessary.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 46ec9b6b3a..7080d63287 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -955,12 +955,6 @@ python split_and_strip_files () {
         for root, dirs, files in cpath.walk(dvar):
             for f in files:
                 file = os.path.join(root, f)
-                if file.endswith(".ko") and file.find("/lib/modules/") != -1:
-                    kernmods.append(file)
-                    continue
-                if oe.package.is_static_lib(file):
-                    staticlibs.append(file)
-                    continue
 
                 # Skip debug files
                 if debugappend and file.endswith(debugappend):
@@ -971,6 +965,13 @@ python split_and_strip_files () {
                 if file in skipfiles:
                     continue
 
+                if file.endswith(".ko") and file.find("/lib/modules/") != -1:
+                    kernmods.append(file)
+                    continue
+                if oe.package.is_static_lib(file):
+                    staticlibs.append(file)
+                    continue
+
                 try:
                     ltarget = cpath.realpath(file, dvar, False)
                     s = cpath.lstat(ltarget)