package: Split out package_debug_vars from split_and_strip_files
PATCH 1/3 package: Split out package_debug_vars from split_and_strip_files
From: Peter Kjellerstedt <[email protected]>
The split_and_strip_files() function is big and hard to follow. This takes a small step to improve that by splitting out the part that sets up the variables used to implement the various debug splitting methods specified by PACKAGE_DEBUG_SPLIT_STYLE.
--- meta/classes/package.bbclass | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
meta/classes/package.bbclass +18 -11
@@ -1069,17 +1069,7 @@ python fixup_perms () { fix_perms(each_file, fs_perms_table[dir].fmode, fs_perms_table[dir].fuid, fs_perms_table[dir].fgid, dir) } -python split_and_strip_files () { - import stat, errno - import subprocess - - dvar = d.getVar('PKGD') - pn = d.getVar('PN') - hostos = d.getVar('HOST_OS') - - oldcwd = os.getcwd() - os.chdir(dvar) - +def package_debug_vars(d): # We default to '.debug' style if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info
@@ -1117,6 +1107,23 @@ python split_and_strip_files () { debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" + return (debugappend, debugstaticappend, debugdir, debugstaticdir, + debuglibdir, debugstaticlibdir, debugsrcdir) + +python split_and_strip_files () { + import stat, errno + import subprocess + + dvar = d.getVar('PKGD') + pn = d.getVar('PN') + hostos = d.getVar('HOST_OS') + + oldcwd = os.getcwd() + os.chdir(dvar) + + debugappend, debugstaticappend, debugdir, debugstaticdir, \ + debuglibdir, debugstaticlibdir, debugsrcdir = package_debug_vars(d) + # # First lets figure out all of the files we may have to process ... do this only once! #
PATCH 2/3 package: Make package_debug_vars() return a dict
From: Peter Kjellerstedt <[email protected]>
It simplifies the API to return one dict instead of seven strings.
--- meta/classes/package.bbclass | 96 +++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 45 deletions(-)
meta/classes/package.bbclass +51 -45
@@ -1073,42 +1073,49 @@ def package_debug_vars(d): # We default to '.debug' style if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info - debugappend = ".debug" - debugstaticappend = "" - debugdir = "" - debugstaticdir = "" - debuglibdir = "/usr/lib/debug" - debugstaticlibdir = "/usr/lib/debug-static" - debugsrcdir = "/usr/src/debug" + debug_vars = { + "append": ".debug", + "staticappend": "", + "dir": "", + "staticdir": "", + "libdir": "/usr/lib/debug", + "staticlibdir": "/usr/lib/debug-static", + "srcdir": "/usr/src/debug", + } elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-without-src': # Original OE-core, a.k.a. ".debug", style debug info, but without sources in /usr/src/debug - debugappend = "" - debugstaticappend = "" - debugdir = "/.debug" - debugstaticdir = "/.debug-static" - debuglibdir = "" - debugstaticlibdir = "" - debugsrcdir = "" + debug_vars = { + "append": "", + "staticappend": "", + "dir": "/.debug", + "staticdir": "/.debug-static", + "libdir": "", + "staticlibdir": "", + "srcdir": "", + } elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': - debugappend = "" - debugstaticappend = "" - debugdir = "/.debug" - debugstaticdir = "/.debug-static" - debuglibdir = "" - debugstaticlibdir = "" - debugsrcdir = "/usr/src/debug" + debug_vars = { + "append": "", + "staticappend": "", + "dir": "/.debug", + "staticdir": "/.debug-static", + "libdir": "", + "staticlibdir": "", + "srcdir": "/usr/src/debug", + } else: # Original OE-core, a.k.a. ".debug", style debug info - debugappend = "" - debugstaticappend = "" - debugdir = "/.debug" - debugstaticdir = "/.debug-static" - debuglibdir = "" - debugstaticlibdir = "" - debugsrcdir = "/usr/src/debug" + debug_vars = { + "append": "", + "staticappend": "", + "dir": "/.debug", + "staticdir": "/.debug-static", + "libdir": "", + "staticlibdir": "", + "srcdir": "/usr/src/debug", + } - return (debugappend, debugstaticappend, debugdir, debugstaticdir, - debuglibdir, debugstaticlibdir, debugsrcdir) + return debug_vars python split_and_strip_files () { import stat, errno
@@ -1121,8 +1128,7 @@ python split_and_strip_files () { oldcwd = os.getcwd() os.chdir(dvar) - debugappend, debugstaticappend, debugdir, debugstaticdir, \ - debuglibdir, debugstaticlibdir, debugsrcdir = package_debug_vars(d) + dv = package_debug_vars(d) # # First lets figure out all of the files we may have to process ... do this only once!
@@ -1144,9 +1150,9 @@ python split_and_strip_files () { file = os.path.join(root, f) # Skip debug files - if debugappend and file.endswith(debugappend): + if dv["append"] and file.endswith(dv["append"]): continue - if debugdir and debugdir in os.path.dirname(file[len(dvar):]): + if dv["dir"] and dv["dir"] in os.path.dirname(file[len(dvar):]): continue if file in skipfiles:
@@ -1243,11 +1249,11 @@ python split_and_strip_files () { # First lets process debug splitting # if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'): - results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) + results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d)) - if debugsrcdir and not hostos.startswith("mingw"): + if dv["srcdir"] and not hostos.startswith("mingw"): if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): - results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, dv["staticdir"], dv["staticlibdir"], dv["staticappend"], dv["srcdir"], d)) else: for file in staticlibs: results.append( (file,source_info(file, d)) )
@@ -1266,9 +1272,9 @@ python split_and_strip_files () { target = inodes[ref][0][len(dvar):] for file in inodes[ref][1:]: src = file[len(dvar):] - dest = debuglibdir + os.path.dirname(src) + debugdir + "/" + os.path.basename(target) + debugappend + dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(target) + dv["append"] fpath = dvar + dest - ftarget = dvar + debuglibdir + os.path.dirname(target) + debugdir + "/" + os.path.basename(target) + debugappend + ftarget = dvar + dv["libdir"] + os.path.dirname(target) + dv["dir"] + "/" + os.path.basename(target) + dv["append"] bb.utils.mkdirhier(os.path.dirname(fpath)) # Only one hardlink of separated debug info file in each directory if not os.access(fpath, os.R_OK):
@@ -1278,7 +1284,7 @@ python split_and_strip_files () { # Create symlinks for all cases we were able to split symbols for file in symlinks: src = file[len(dvar):] - dest = debuglibdir + os.path.dirname(src) + debugdir + "/" + os.path.basename(src) + debugappend + dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(src) + dv["append"] fpath = dvar + dest # Skip it if the target doesn't exist try:
@@ -1294,17 +1300,17 @@ python split_and_strip_files () { lbase = os.path.basename(ltarget) ftarget = "" if lpath and lpath != ".": - ftarget += lpath + debugdir + "/" - ftarget += lbase + debugappend + ftarget += lpath + dv["dir"] + "/" + ftarget += lbase + dv["append"] if lpath.startswith(".."): ftarget = os.path.join("..", ftarget) bb.utils.mkdirhier(os.path.dirname(fpath)) #bb.note("Symlink %s -> %s" % (fpath, ftarget)) os.symlink(ftarget, fpath) - # Process the debugsrcdir if requested... + # Process the dv["srcdir"] if requested... # This copies and places the referenced sources for later debugging... - copydebugsources(debugsrcdir, sources, d) + copydebugsources(dv["srcdir"], sources, d) # # End of debug splitting #
@@ -1330,7 +1336,7 @@ python split_and_strip_files () { # Build "minidebuginfo" and reinject it back into the stripped binaries if d.getVar('PACKAGE_MINIDEBUGINFO') == '1': oe.utils.multiprocess_launch(inject_minidebuginfo, list(elffiles), d, - extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) + extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d)) # # End of strip
PATCH 3/3 package: Pass dv (debug_vars) around instead of individual vars
In reply to Peter KjellerstedtFrom: Peter Kjellerstedt <[email protected]>
This simplifies the APIs for splitdebuginfo(), splitstaticdebuginfo() and inject_minidebuginfo()
--- meta/classes/package.bbclass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
meta/classes/package.bbclass +11 -11
@@ -369,7 +369,7 @@ def source_info(file, d, fatal=True): return list(debugsources) -def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d): +def splitdebuginfo(file, dvar, dv, d): # Function to split a single file into two components, one is the stripped # target system binary, the other contains any debugging information. The # two files are linked to reference each other.
@@ -380,7 +380,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, import subprocess src = file[len(dvar):] - dest = debuglibdir + os.path.dirname(src) + debugdir + "/" + os.path.basename(src) + debugappend + dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(src) + dv["append"] debugfile = dvar + dest sources = []
@@ -403,7 +403,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, os.chmod(file, newmode) # We need to extract the debug src information here... - if debugsrcdir: + if dv["srcdir"]: sources = source_info(file, d) bb.utils.mkdirhier(os.path.dirname(debugfile))
@@ -418,7 +418,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, return (file, sources) -def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d): +def splitstaticdebuginfo(file, dvar, dv, d): # Unlike the function above, there is no way to split a static library # two components. So to get similar results we will copy the unmodified # static library (containing the debug symbols) into a new directory.
@@ -431,7 +431,7 @@ def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugsta import shutil src = file[len(dvar):] - dest = debugstaticlibdir + os.path.dirname(src) + debugstaticdir + "/" + os.path.basename(src) + debugstaticappend + dest = dv["staticlibdir"] + os.path.dirname(src) + dv["staticdir"] + "/" + os.path.basename(src) + dv["staticappend"] debugfile = dvar + dest sources = []
@@ -448,7 +448,7 @@ def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugsta os.chmod(file, newmode) # We need to extract the debug src information here... - if debugsrcdir: + if dv["srcdir"]: sources = source_info(file, d) bb.utils.mkdirhier(os.path.dirname(debugfile))
@@ -461,7 +461,7 @@ def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugsta return (file, sources) -def inject_minidebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d): +def inject_minidebuginfo(file, dvar, dv, d): # Extract just the symbols from debuginfo into minidebuginfo, # compress it with xz and inject it back into the binary in a .gnu_debugdata section. # https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html
@@ -475,7 +475,7 @@ def inject_minidebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsr minidebuginfodir = d.expand('${WORKDIR}/minidebuginfo') src = file[len(dvar):] - dest = debuglibdir + os.path.dirname(src) + debugdir + "/" + os.path.basename(src) + debugappend + dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(src) + dv["append"] debugfile = dvar + dest minidebugfile = minidebuginfodir + src + '.minidebug' bb.utils.mkdirhier(os.path.dirname(minidebugfile))
@@ -1249,11 +1249,11 @@ python split_and_strip_files () { # First lets process debug splitting # if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'): - results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d)) + results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, dv, d)) if dv["srcdir"] and not hostos.startswith("mingw"): if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): - results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, dv["staticdir"], dv["staticlibdir"], dv["staticappend"], dv["srcdir"], d)) + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, dv, d)) else: for file in staticlibs: results.append( (file,source_info(file, d)) )
@@ -1336,7 +1336,7 @@ python split_and_strip_files () { # Build "minidebuginfo" and reinject it back into the stripped binaries if d.getVar('PACKAGE_MINIDEBUGINFO') == '1': oe.utils.multiprocess_launch(inject_minidebuginfo, list(elffiles), d, - extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d)) + extraargs=(dvar, dv, d)) # # End of strip
Re: [OE-core] [honister][PATCH 3/3] package: Pass dv (debug_vars) around instead of individual vars
Hi Peter
Quoted 4 lines · Peter Kjellerstedt
From: Peter Kjellerstedt <[email protected]>
This simplifies the APIs for
splitdebuginfo(),splitstaticdebuginfo()andinject_minidebuginfo()
It doesn't look like these patches are fixing any bug so not appropriate for honister in my opinion.
Thanks,
Anuj
Quoted 152 lines
Signed-off-by Peter Kjellerstedt <[email protected]>Signed-off-by Richard Purdie <[email protected]>---
meta/classes/package.bbclass | 22 +++++++++++-----------1 file changed, 11 insertions(+), 11 deletions(-)meta/classes/package.bbclass +0
-0@@ -369,7 +369,7 @@ def source_info(file, d, fatal=True):
return list(debugsources)
-defsplitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d):
+defsplitdebuginfo(file, dvar, dv, d):
# Function to split a single file into two components, one is the stripped# target system binary, the other contains any debugging information. The # two files are linked to reference each other.meta/classes/package.bbclass +0
-0@@ -380,7 +380,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir,import subprocess
src = file[len(dvar):]
- dest = debuglibdir +os.path.dirname(src)+ debugdir + "/" +os.path.basename(src)+ debugappend
+ dest = dv["libdir"] +os.path.dirname(src)+ dv["dir"] + "/" +os.path.basename(src)+ dv["append"]
debugfile = dvar + dest
sources = []meta/classes/package.bbclass +0
-0@@ -403,7 +403,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, os.chmod(file, newmode)
# We need to extract the debug src information here... - if debugsrcdir:
+ if dv["srcdir"]:
sources =source_info(file, d)
bb.utils.mkdirhier(os.path.dirname(debugfile))meta/classes/package.bbclass +0
-0@@ -418,7 +418,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir,
return (file, sources)
-defsplitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d):
+defsplitstaticdebuginfo(file, dvar, dv, d):
# Unlike the function above, there is no way to split a static library# two components. So to get similar results we will copy the unmodified # static library (containing the debug symbols) into a new directory.meta/classes/package.bbclass +0
-0@@ -431,7 +431,7 @@ def splitstaticdebuginfo(file, dvar,debugstaticdir, debugstaticlibdir, debugsta
import shutil
src = file[len(dvar):]
- dest = debugstaticlibdir +os.path.dirname(src)+ debugstaticdir
+ "/" +os.path.basename(src)+ debugstaticappend
+ dest = dv["staticlibdir"] +os.path.dirname(src)+ dv["staticdir"] + "/" +os.path.basename(src)+ dv["staticappend"] debugfile = dvar + dest
sources = []meta/classes/package.bbclass +0
-0@@ -448,7 +448,7 @@ def splitstaticdebuginfo(file, dvar,debugstaticdir, debugstaticlibdir, debugsta
os.chmod(file, newmode)
# We need to extract the debug src information here... - if debugsrcdir:
+ if dv["srcdir"]:
sources =source_info(file, d)
bb.utils.mkdirhier(os.path.dirname(debugfile))meta/classes/package.bbclass +0
-0@@ -461,7 +461,7 @@ def splitstaticdebuginfo(file, dvar,debugstaticdir, debugstaticlibdir, debugsta
return (file, sources)
-definject_minidebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d):
+definject_minidebuginfo(file, dvar, dv, d):
# Extract just the symbols from debuginfo into minidebuginfo,# compress it with xz and inject it back into the binary in a .gnu_debugdata section. # https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.htmlmeta/classes/package.bbclass +0
-0@@ -475,7 +475,7 @@ def inject_minidebuginfo(file, dvar, debugdir,debuglibdir, debugappend, debugsr
minidebuginfodir =d.expand('${WORKDIR}/minidebuginfo')
src = file[len(dvar):]
- dest = debuglibdir +os.path.dirname(src)+ debugdir + "/" +os.path.basename(src)+ debugappend
+ dest = dv["libdir"] +os.path.dirname(src)+ dv["dir"] + "/" +os.path.basename(src)+ dv["append"]
debugfile = dvar + dest
minidebugfile = minidebuginfodir + src + '.minidebug' bb.utils.mkdirhier(os.path.dirname(minidebugfile))meta/classes/package.bbclass +0
-0@@ -1249,11 +1249,11 @@ python split_and_strip_files () { # First lets process debug splitting #if (
d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT')!= '1'):
- results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d))
+ results =oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, dv, d))
if dv["srcdir"] and nothostos.startswith("mingw"):
if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT')== '1'):
- results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, dv["staticdir"], dv["staticlibdir"], dv["staticappend"], dv["srcdir"], d))
+ results =oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, dv, d))
else:
for file in staticlibs:
results.append( (file,source_info(file, d)) )meta/classes/package.bbclass +0
-0@@ -1336,7 +1336,7 @@ python split_and_strip_files () { # Build "minidebuginfo" and reinject it back into the strippedbinaries
ifd.getVar('PACKAGE_MINIDEBUGINFO')== '1':
oe.utils.multiprocess_launch(inject_minidebuginfo, list(elffiles), d,
- extraargs=(dvar, dv["dir"], dv["libdir"], dv["append"], dv["srcdir"], d))
+ extraargs=(dvar, dv, d))
#
# End of strip-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#161520):
https://lists.openembedded.org/g/openembedded-core/message/161520
Mute This Topic: https://lists.openembedded.org/mt/88999266/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-