Fix static-library related issues
v2 cover Fix static-library related issues
Fixes and test case for static-library related items.
v2:
The first three patches were combined into a single patch originally.
This has been split apart to make it more clear the three individual changes.
Mark Hatle (4):
package.py: Fix static debuginfo split
package.py: Fix inode link target
package.py: Fix static library processing
selftest-hardlink: Add additional test cases
.../selftest-hardlink/selftest-hardlink.bb | 13 +++++ meta/lib/oe/package.py | 60 ++++++++++++++++++---- meta/lib/oeqa/selftest/cases/package.py | 24 +++++++++ 3 files changed, 87 insertions(+), 10 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/4 package.py: Fix static debuginfo split
From: Mark Hatle <[email protected]>
Fix:
NameError: name 'shutil' is not defined
--- meta/lib/oe/package.py | 2 ++ 1 file changed, 2 insertions(+)
meta/lib/oe/package.py +2 -0
@@ -838,6 +838,8 @@ def splitdebuginfo(file, dvar, dv, d): return (file, sources) def splitstaticdebuginfo(file, dvar, dv, d): + import shutil + # 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.
Signature · 1 line
1.8.3.1
Re: [OE-core] [PATCH v2 1/4] package.py: Fix static debuginfo split
Quoted 22 lines · Mark Hatle via lists.openembedded.org
From: Mark Hatle <[email protected]>
Fix:
NameError: name 'shutil' is not definedSigned-off-by Mark Hatle <[email protected]>Signed-off-by Mark Hatle <[email protected]>---
meta/lib/oe/package.py | 2 ++1 file changed, 2 insertions(+)meta/lib/oe/package.py +0
-0@@ -838,6 +838,8 @@ def splitdebuginfo(file, dvar, dv, d): return (file, sources)
defsplitstaticdebuginfo(file, dvar, dv, d):
+ import shutil
+
# Unlike the function above, there is no way to split a static library
Quoted 3 lines
# two components. So to get similar results we will copy the unmodified # static library (containing the debug symbols) into a new directory.
For a really minor performance tweak and general python styling, this should probably go at the top of the file since there isn't any real reason to have it in this function.
Cheers,
Richard
PATCH v2 2/4 package.py: Fix inode link target
In reply to Mark HatleFrom: Mark Hatle <[email protected]>
The process_split_and_strip_files attempts to reconstruct hardlinks through the .debug directory components. Unfortunately there was an error in the 'dest' calculation that cause the SRC and DEST to be the same when they both exist in the same path. This did not trigger an error due to the os.access(fpath) check in the original code. Fix the dest calculation by using 'file' instead of target, as this will ensure we get the correct target filename at all times.
--- meta/lib/oe/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package.py +1 -1
@@ -1207,7 +1207,7 @@ def process_split_and_strip_files(d): target = inodes[ref][0][len(dvar):] for file in inodes[ref][1:]: src = file[len(dvar):] - dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(target) + dv["append"] + dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(file) + dv["append"] fpath = dvar + dest ftarget = dvar + dv["libdir"] + os.path.dirname(target) + dv["dir"] + "/" + os.path.basename(target) + dv["append"] bb.utils.mkdirhier(os.path.dirname(fpath))
Signature · 1 line
1.8.3.1
PATCH v2 3/4 package.py: Fix static library processing
In reply to Mark HatleFrom: Mark Hatle <[email protected]>
When PACKAGE_STRIP_STATIC is enabled the system did not pay attention to hardlinks. This could trigger a race condition during stripping of static libraries where multiple strips (through hardlinks) could run at the same time triggering a truncated or modified file error.
The hardlink breaking code is based on the existing code for elf files, but due to the nature of the symlinks needed to be done in a separate block of code.
Add support for static-library debugfs hardlinking through the existing inode processing code.
Print a note to the logs if the link target can't be found. This isn't strictly an error, but may be useful for debugging an issue where a file isn't present.
--- meta/lib/oe/package.py | 56 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 9 deletions(-)
meta/lib/oe/package.py +47 -9
@@ -1080,6 +1080,7 @@ def process_split_and_strip_files(d): d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'): checkelf = {} checkelflinks = {} + checkstatic = {} for root, dirs, files in cpath.walk(dvar): for f in files: file = os.path.join(root, f)
@@ -1093,10 +1094,6 @@ def process_split_and_strip_files(d): if file in skipfiles: continue - if oe.package.is_static_lib(file): - staticlibs.append(file) - continue - try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget)
@@ -1108,6 +1105,13 @@ def process_split_and_strip_files(d): continue if not s: continue + + if oe.package.is_static_lib(file): + # Use a reference of device ID and inode number to identify files + file_reference = "%d_%d" % (s.st_dev, s.st_ino) + checkstatic[file] = (file, file_reference) + continue + # Check its an executable if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) \ or (s[stat.ST_MODE] & stat.S_IXOTH) \
@@ -1172,6 +1176,27 @@ def process_split_and_strip_files(d): # Modified the file so clear the cache cpath.updatecache(file) + # Do the same hardlink processing as above, but for static libraries + results = list(checkstatic.keys()) + + # As above, sort the results. + results.sort(key=lambda x: x[0]) + + for file in results: + # Use a reference of device ID and inode number to identify files + file_reference = checkstatic[file][1] + if file_reference in inodes: + os.unlink(file) + os.link(inodes[file_reference][0], file) + inodes[file_reference].append(file) + else: + inodes[file_reference] = [file] + # break hardlink + bb.utils.break_hardlinks(file) + staticlibs.append(file) + # Modified the file so clear the cache + cpath.updatecache(file) + def strip_pkgd_prefix(f): nonlocal dvar
@@ -1210,11 +1235,24 @@ def process_split_and_strip_files(d): dest = dv["libdir"] + os.path.dirname(src) + dv["dir"] + "/" + os.path.basename(file) + dv["append"] fpath = dvar + dest 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): - #bb.note("Link %s -> %s" % (fpath, ftarget)) - os.link(ftarget, fpath) + if os.access(ftarget, os.R_OK): + 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): + #bb.note("Link %s -> %s" % (fpath, ftarget)) + os.link(ftarget, fpath) + elif (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + deststatic = dv["staticlibdir"] + os.path.dirname(src) + dv["staticdir"] + "/" + os.path.basename(file) + dv["staticappend"] + fpath = dvar + deststatic + ftarget = dvar + dv["staticlibdir"] + os.path.dirname(target) + dv["staticdir"] + "/" + os.path.basename(target) + dv["staticappend"] + if os.access(ftarget, os.R_OK): + 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): + #bb.note("Link %s -> %s" % (fpath, ftarget)) + os.link(ftarget, fpath) + else: + bb.note("Unable to find inode link target %s" % (target)) # Create symlinks for all cases we were able to split symbols for file in symlinks:
Signature · 1 line
1.8.3.1
PATCH v2 4/4 selftest-hardlink: Add additional test cases
In reply to Mark HatleFrom: Mark Hatle <[email protected]>
Additional test cases for debug symlink generation both binaries and static libraries.
This also has the side effect of testing for race conditions in the hardlink debug generation and stripping.
--- .../selftest-hardlink/selftest-hardlink.bb | 13 ++++++++++++ meta/lib/oeqa/selftest/cases/package.py | 24 ++++++++++++++++++++++ 2 files changed, 37 insertions(+)
meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb +13 -0
@@ -11,6 +11,9 @@ UNPACKDIR = "${S}" do_compile () { ${CC} hello.c -o hello1 ${CFLAGS} ${LDFLAGS} + + ${CC} hello.c -c -o hello.o ${CFLAGS} + ${AR} rcs libhello.a hello.o } do_install () {
@@ -23,9 +26,19 @@ do_install () { ln ${D}${bindir}/hello1 ${D}${libexecdir}/hello3 ln ${D}${bindir}/hello1 ${D}${libexecdir}/hello4 + # We need so many hardlink copies to look for specific race conditions + install -d ${D}${libdir} + install -m 0644 libhello.a ${D}${libdir} + for num in `seq 1 100` ; do + ln ${D}${libdir}/libhello.a ${D}${libdir}/libhello-${num}.a + done + dd if=/dev/zero of=${D}${bindir}/sparsetest bs=1 count=0 seek=1M } RDEPENDS:${PN}-gdb += "gdb" PACKAGES =+ "${PN}-gdb" FILES:${PN}-gdb = "${bindir}/gdb.sh" + +PACKAGE_STRIP_STATIC = "1" +PACKAGE_DEBUG_STATIC_SPLIT = "1"
meta/lib/oeqa/selftest/cases/package.py +24 -0
@@ -103,11 +103,35 @@ class PackageTests(OESelftestTestCase): dest = get_bb_var('PKGDEST', 'selftest-hardlink') bindir = get_bb_var('bindir', 'selftest-hardlink') + libdir = get_bb_var('libdir', 'selftest-hardlink') + libexecdir = get_bb_var('libexecdir', 'selftest-hardlink') def checkfiles(): # Recipe creates 4 hardlinked files, there is a copy in package/ and a copy in packages-split/ # so expect 8 in total. self.assertEqual(os.stat(dest + "/selftest-hardlink" + bindir + "/hello1").st_nlink, 8) + self.assertEqual(os.stat(dest + "/selftest-hardlink" + libexecdir + "/hello3").st_nlink, 8) + + # Check dbg version + # 4 items, a copy in both package/packages-split so 8 + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + bindir + "/.debug/hello1").st_nlink, 8) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + bindir + "/.debug/hello2").st_nlink, 8) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libexecdir + "/.debug/hello3").st_nlink, 8) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libexecdir + "/.debug/hello4").st_nlink, 8) + + # Check the staticdev libraries + # 101 items, a copy in both package/packages-split so 202 + self.assertEqual(os.stat(dest + "/selftest-hardlink-staticdev" + libdir + "/libhello.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-staticdev" + libdir + "/libhello-25.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-staticdev" + libdir + "/libhello-50.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-staticdev" + libdir + "/libhello-75.a").st_nlink, 202) + + # Check static dbg + # 101 items, a copy in both package/packages-split so 202 + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libdir + "/.debug-static/libhello.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libdir + "/.debug-static/libhello-25.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libdir + "/.debug-static/libhello-50.a").st_nlink, 202) + self.assertEqual(os.stat(dest + "/selftest-hardlink-dbg" + libdir + "/.debug-static/libhello-75.a").st_nlink, 202) # Test a sparse file remains sparse sparsestat = os.stat(dest + "/selftest-hardlink" + bindir + "/sparsetest")
Signature · 1 line
1.8.3.1
Re: [OE-core] [PATCH v2 4/4] selftest-hardlink: Add additional test cases
Quoted 8 lines · Mark Hatle via lists.openembedded.org
From: Mark Hatle <[email protected]>
Additional test cases for debug symlink generation both binaries and static libraries.
This also has the side effect of testing for race conditions in the hardlink debug generation and stripping.
Quoted 6 lines
Signed-off-by Mark Hatle <[email protected]>Signed-off-by Mark Hatle <[email protected]>---
.../selftest-hardlink/selftest-hardlink.bb | 13 ++++++++++++ meta/lib/oeqa/selftest/cases/package.py | 24 ++++++++++++++++++++++2 files changed, 37 insertions(+)
This caused selftest failures, e.g.:
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6984/steps/14/logs/stdio
Cheers,
Richard