corrections to library finding algo pt 2

Author: rbreu

tools/build_appimage.py

@@ -94,6 +94,7 @@ def download_file(url, filename):
     data = json.loads(f.read())
 libs = data['libs']
 packages = data['packages']
+excludes = data['excludes']
 paths = set()
 
 if not args.skip_apt:
@@ -109,7 +110,9 @@ def download_file(url, filename):
     if os.path.basename(lib) in existing_files:
         logger.debug(f'Skipping {lib} (already in appimage)')
         continue
-
+    if os.path.basename(lib) in excludes:
+        logger.debug(f'Skipping {lib} (excluded)')
+        continue
     paths.add(os.path.dirname(lib))
     if os.path.exists(lib):
         filename = lib

tools/find_linux_libs.py

@@ -6,6 +6,7 @@
 import json
 import logging
 import os
+import pathlib
 import re
 import subprocess
 import sys
@@ -43,6 +44,17 @@ def strip_minor_versions(path):
     return re.sub('(.so.[0-9]*)[.0-9]*$', r'\1', path)
 
 
+def what_links_to(path):
+    links = set()
+    dirname = os.path.dirname(path)
+    for filename in os.listdir(dirname):
+        filename = os.path.join(dirname, filename)
+        if (os.path.islink(filename)
+                and str(pathlib.Path(filename).resolve()) == path):
+            links.add(filename)
+    return sorted(links, key=len)
+
+
 def is_lib(path):
     return ('.so' in path
             and os.path.expanduser('~') not in path
@@ -56,7 +68,7 @@ def iter_lsofoutput(output):
         if line[3] == 'mem':
             path = line[-1]
             if is_lib(path):
-                yield strip_minor_versions(path)
+                yield path
 
 
 PID = args.pid[0]
@@ -96,6 +108,12 @@ def iter_lsofoutput(output):
 
 
 for lib in iter_lsofoutput(output):
+    links = what_links_to(path)
+    if len(links) == 1:
+        lib = links[0]
+    else:
+        logger.warning(f'Double check: {path} {links}')
+        lib = links[0]
     if lib in known_libs:
         logger.debug(f'Found known lib: {lib}')
     else:

tools/linux_libs.json

@@ -1,26 +1,26 @@
 {
     "libs": [
-        "/lib/x86_64-linux-gnu/ld-2.31.so",
+        "/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2",
         "/lib/x86_64-linux-gnu/libbz2.so.1",
-        "/lib/x86_64-linux-gnu/libc-2.31.so",
+        "/lib/x86_64-linux-gnu/libc.so.6",
         "/lib/x86_64-linux-gnu/libcom_err.so.2",
         "/lib/x86_64-linux-gnu/libdbus-1.so.3",
-        "/lib/x86_64-linux-gnu/libdl-2.31.so",
+        "/lib/x86_64-linux-gnu/libdl.so.2",
         "/lib/x86_64-linux-gnu/libexpat.so.1",
         "/lib/x86_64-linux-gnu/libgcc_s.so.1",
         "/lib/x86_64-linux-gnu/libgpg-error.so.0",
         "/lib/x86_64-linux-gnu/libkeyutils.so.1",
         "/lib/x86_64-linux-gnu/liblzma.so.5",
-        "/lib/x86_64-linux-gnu/libm-2.31.so",
+        "/lib/x86_64-linux-gnu/libm.so.6",
         "/lib/x86_64-linux-gnu/libpcre.so.3",
-        "/lib/x86_64-linux-gnu/libpthread-2.31.so",
-        "/lib/x86_64-linux-gnu/libresolv-2.31.so",
-        "/lib/x86_64-linux-gnu/librt-2.31.so",
+        "/lib/x86_64-linux-gnu/libpthread.so.0",
+        "/lib/x86_64-linux-gnu/libresolv.so.2",
+        "/lib/x86_64-linux-gnu/librt.so.1",
         "/lib/x86_64-linux-gnu/libselinux.so.1",
-        "/lib/x86_64-linux-gnu/libutil-2.31.so",
+        "/lib/x86_64-linux-gnu/libutil.so.1",
         "/lib/x86_64-linux-gnu/libz.so.1",
         "/usr/lib/x86_64-linux-gnu/gio/modules/libgvfsdbus.so",
-        "/usr/lib/x86_64-linux-gnu/gtk-3.0/modules/libcanberra-gtk3-module.so",
+        "/usr/lib/x86_64-linux-gnu/gtk-3.0/modules/libcanberra-gtk-module.so",
         "/usr/lib/x86_64-linux-gnu/gvfs/libgvfscommon.so",
         "/usr/lib/x86_64-linux-gnu/libGLX.so.0",
         "/usr/lib/x86_64-linux-gnu/libGLdispatch.so.0",
@@ -48,7 +48,7 @@
         "/usr/lib/x86_64-linux-gnu/libcairo.so.2",
         "/usr/lib/x86_64-linux-gnu/libcanberra-gtk3.so.0",
         "/usr/lib/x86_64-linux-gnu/libcanberra.so.0",
-        "/usr/lib/x86_64-linux-gnu/libcrypto.so.1",
+        "/usr/lib/x86_64-linux-gnu/libcrypto.so",
         "/usr/lib/x86_64-linux-gnu/libdatrie.so.1",
         "/usr/lib/x86_64-linux-gnu/libepoxy.so.0",
         "/usr/lib/x86_64-linux-gnu/libffi.so.7",
@@ -81,8 +81,8 @@
         "/usr/lib/x86_64-linux-gnu/libpcre2-8.so.0",
         "/usr/lib/x86_64-linux-gnu/libpixman-1.so.0",
         "/usr/lib/x86_64-linux-gnu/libpng16.so.16",
-        "/usr/lib/x86_64-linux-gnu/libsqlite3.so.0",
-        "/usr/lib/x86_64-linux-gnu/libssl.so.1",
+        "/usr/lib/x86_64-linux-gnu/libsqlite3.so",
+        "/usr/lib/x86_64-linux-gnu/libssl.so",
         "/usr/lib/x86_64-linux-gnu/libstdc++.so.6",
         "/usr/lib/x86_64-linux-gnu/libsystemd.so.0",
         "/usr/lib/x86_64-linux-gnu/libtdb.so.1",
@@ -210,22 +210,29 @@
         "zlib1g"
     ],
     "excludes": [
+        "ld-linux-x86-64.so.2",
         "libGLX.so.0",
         "libGLdispatch.so.0",
         "libX11-xcb.so.1",
         "libX11.so.6",
+        "libc.so.6",
         "libcom_err.so.2",
+        "libdl.so.2",
         "libexpat.so.1",
         "libfontconfig.so.1",
         "libfreetype.so.6",
         "libfribidi.so.0",
         "libgcc_s.so.1",
         "libgpg-error.so.0",
         "libharfbuzz.so.0",
+        "libm.so.6",
+        "libpthread.so.0",
+        "libresolv.so.2",
+        "librt.so.1",
         "libstdc++.so.6",
         "libthai.so.0",
-        "libuuid.so.1",
+        "libutil.so.1",
         "libxcb.so.1",
         "libz.so.1"
     ]
-}
+}