summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass19
1 files changed, 6 insertions, 13 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 84eafbd..4927fb9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -390,10 +390,6 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir,
390 dvar = d.getVar('PKGD') 390 dvar = d.getVar('PKGD')
391 objcopy = d.getVar("OBJCOPY") 391 objcopy = d.getVar("OBJCOPY")
392 392
393 # We ignore kernel modules, we don't generate debug info files.
394 if file.find("/lib/modules/") != -1 and file.endswith(".ko"):
395 return (file, sources)
396
397 newmode = None 393 newmode = None
398 if not os.access(file, os.W_OK) or os.access(file, os.R_OK): 394 if not os.access(file, os.W_OK) or os.access(file, os.R_OK):
399 origmode = os.stat(file)[stat.ST_MODE] 395 origmode = os.stat(file)[stat.ST_MODE]
@@ -1122,7 +1118,6 @@ python split_and_strip_files () {
1122 # 1118 #
1123 elffiles = {} 1119 elffiles = {}
1124 symlinks = {} 1120 symlinks = {}
1125 kernmods = []
1126 staticlibs = [] 1121 staticlibs = []
1127 inodes = {} 1122 inodes = {}
1128 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir")) 1123 libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir"))
@@ -1145,9 +1140,6 @@ python split_and_strip_files () {
1145 if file in skipfiles: 1140 if file in skipfiles:
1146 continue 1141 continue
1147 1142
1148 if file.endswith(".ko") and file.find("/lib/modules/") != -1:
1149 kernmods.append(file)
1150 continue
1151 if oe.package.is_static_lib(file): 1143 if oe.package.is_static_lib(file):
1152 staticlibs.append(file) 1144 staticlibs.append(file)
1153 continue 1145 continue
@@ -1164,8 +1156,11 @@ python split_and_strip_files () {
1164 if not s: 1156 if not s:
1165 continue 1157 continue
1166 # Check its an executable 1158 # Check its an executable
1167 if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) or (s[stat.ST_MODE] & stat.S_IXOTH) \ 1159 if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) \
1168 or ((file.startswith(libdir) or file.startswith(baselibdir)) and (".so" in f or ".node" in f)): 1160 or (s[stat.ST_MODE] & stat.S_IXOTH) \
1161 or ((file.startswith(libdir) or file.startswith(baselibdir)) \
1162 and (".so" in f or ".node" in f)) \
1163 or (f.startswith('vmlinux') or ".ko" in f):
1169 1164
1170 if cpath.islink(file): 1165 if cpath.islink(file):
1171 checkelflinks[file] = ltarget 1166 checkelflinks[file] = ltarget
@@ -1312,8 +1307,6 @@ python split_and_strip_files () {
1312 elf_file = int(elffiles[file]) 1307 elf_file = int(elffiles[file])
1313 #bb.note("Strip %s" % file) 1308 #bb.note("Strip %s" % file)
1314 sfiles.append((file, elf_file, strip)) 1309 sfiles.append((file, elf_file, strip))
1315 for f in kernmods:
1316 sfiles.append((f, 16, strip))
1317 if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): 1310 if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'):
1318 for f in staticlibs: 1311 for f in staticlibs:
1319 sfiles.append((f, 16, strip)) 1312 sfiles.append((f, 16, strip))
@@ -1878,7 +1871,7 @@ python package_do_shlibs() {
1878 sonames.add(prov) 1871 sonames.add(prov)
1879 if libdir_re.match(os.path.dirname(file)): 1872 if libdir_re.match(os.path.dirname(file)):
1880 needs_ldconfig = True 1873 needs_ldconfig = True
1881 if snap_symlinks and (os.path.basename(file) != this_soname): 1874 if needs_ldconfig and snap_symlinks and (os.path.basename(file) != this_soname):
1882 renames.append((file, os.path.join(os.path.dirname(file), this_soname))) 1875 renames.append((file, os.path.join(os.path.dirname(file), this_soname)))
1883 return (needs_ldconfig, needed, sonames, renames) 1876 return (needs_ldconfig, needed, sonames, renames)
1884 1877