Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add libselinux.so.1 to package allow list #3661

Merged
merged 3 commits into from
Aug 20, 2020
Merged

Add libselinux.so.1 to package allow list #3661

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25fd14b
Add libselinux.so.1 to pacakge allow list
ferdnyc Aug 10, 2020
0d7b39a
Merge branch 'develop' into package-with-libselinux
ferdnyc Aug 18, 2020
ec63f09
freeze.py: Formatting, tighten flow
ferdnyc Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ def find_files(directory, patterns):
libpath = libdetailsparts[0].strip()
libpath_file = os.path.basename(libpath)
if (libpath
and os.path.exists(libpath)
and not libpath.startswith("/lib")
and "libnvidia-glcore.so" not in libpath
and libpath_file not in [
Expand All @@ -306,13 +307,21 @@ def find_files(directory, patterns):
"libpangocairo-1.0.so.0",
"libpangoft2-1.0.so.0",
"libharfbuzz.so.0",
"libthai.so.0" ]
) or libpath_file in ["libgcrypt.so.11", "libQt5DBus.so.5", "libpng12.so.0",
"libbz2.so.1.0", "libqxcb.so", "libxcb-xinerama.so.0", "libpcre.so.3"]:
# Ignore missing files
if os.path.exists(libpath):
filepath, filename = os.path.split(libpath)
external_so_files.append((libpath, filename))
"libthai.so.0",
]
) or libpath_file in [
"libgcrypt.so.11",
"libQt5DBus.so.5",
"libpng12.so.0",
"libbz2.so.1.0",
"libqxcb.so",
"libxcb-xinerama.so.0",
"libpcre.so.3",
"libselinux.so.1",
]:
external_so_files.append((libpath, libpath_file))
# Any other lib deps that fail to meet the inclusion
# criteria above will be silently skipped over

elif sys.platform == "darwin":
# Copy Mac specific files that cx_Freeze misses
Expand Down