summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@kernel.crashing.org>2020-02-07 14:20:07 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commitdae03ec7e801dd4dc781de582ba169a0fc580739 (patch)
treed791c8c5a8dd828280e73ca239578234a4e591ae /meta/classes
parent6a543159a33f3e215f0488cf21b80b90a4e0de47 (diff)
downloadpoky-dae03ec7e801dd4dc781de582ba169a0fc580739.tar.gz
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. (From OE-Core rev: c50fcd54ffe60b63d042d05e6cf538a593dc410f) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass13
1 files changed, 7 insertions, 6 deletions
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 () {
955 for root, dirs, files in cpath.walk(dvar): 955 for root, dirs, files in cpath.walk(dvar):
956 for f in files: 956 for f in files:
957 file = os.path.join(root, f) 957 file = os.path.join(root, f)
958 if file.endswith(".ko") and file.find("/lib/modules/") != -1:
959 kernmods.append(file)
960 continue
961 if oe.package.is_static_lib(file):
962 staticlibs.append(file)
963 continue
964 958
965 # Skip debug files 959 # Skip debug files
966 if debugappend and file.endswith(debugappend): 960 if debugappend and file.endswith(debugappend):
@@ -971,6 +965,13 @@ python split_and_strip_files () {
971 if file in skipfiles: 965 if file in skipfiles:
972 continue 966 continue
973 967
968 if file.endswith(".ko") and file.find("/lib/modules/") != -1:
969 kernmods.append(file)
970 continue
971 if oe.package.is_static_lib(file):
972 staticlibs.append(file)
973 continue
974
974 try: 975 try:
975 ltarget = cpath.realpath(file, dvar, False) 976 ltarget = cpath.realpath(file, dvar, False)
976 s = cpath.lstat(ltarget) 977 s = cpath.lstat(ltarget)