-
Notifications
You must be signed in to change notification settings - Fork 868
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.
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
Add packages and libraries to filter list for dep checking on linux #150
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff --git a/chrome/installer/linux/debian/update_dist_package_versions.py b/chrome/installer/linux/debian/update_dist_package_versions.py | ||
index 481dfd7b1930385ff44862dc9cd0ba112b422417..ae2283c515e9ae7c2ee9f8bb5c276a5204de7e04 100755 | ||
--- a/chrome/installer/linux/debian/update_dist_package_versions.py | ||
+++ b/chrome/installer/linux/debian/update_dist_package_versions.py | ||
@@ -40,6 +40,7 @@ PACKAGE_FILTER = set([ | ||
"libatk-bridge2.0-0", | ||
"libc6", | ||
"libcairo2", | ||
+ "libcairo-gobject2", | ||
"libcups2", | ||
"libdbus-1-3", | ||
"libexpat1", | ||
@@ -65,6 +66,7 @@ PACKAGE_FILTER = set([ | ||
"libxrender1", | ||
"libxss1", | ||
"libxtst6", | ||
+ "zlib1g", | ||
]) | ||
|
||
def create_temp_file_from_data(data): |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/chrome/installer/linux/rpm/update_package_provides.py b/chrome/installer/linux/rpm/update_package_provides.py | ||
index 4ce30012357a32e1316dbb3930ce55ddf9acacfa..c8a661351b8279b5d6ce239eb4c61725c27ae8f6 100755 | ||
--- a/chrome/installer/linux/rpm/update_package_provides.py | ||
+++ b/chrome/installer/linux/rpm/update_package_provides.py | ||
@@ -32,6 +32,7 @@ PACKAGE_FILTER = [ | ||
"libatk-bridge-2.0.so", | ||
"libc.so", | ||
"libcairo.so", | ||
+ "libcairo-gobject.so.2", | ||
"libcups.so", | ||
"libdbus-1.so", | ||
"libdl.so", | ||
@@ -50,11 +51,15 @@ PACKAGE_FILTER = [ | ||
"libnssutil3.so", | ||
"libpango-1.0.so", | ||
"libpangocairo-1.0.so", | ||
+ "libplc4.so", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what are these from? |
||
+ "libplds4.so", | ||
"libpthread.so", | ||
+ "libresolv.so.2", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are both from https://staging.ci.brave.com/job/brave-browser-build-linux/28/console There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. must be deps of the new deps. Ok |
||
"librt.so", | ||
"libsmime3.so", | ||
"libstdc++.so", | ||
"libxcb.so", | ||
+ "libz.so.1", | ||
"rtld(GNU_HASH)", | ||
] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we'll be less likely to run into conflicts if we put these at the top of the list instead of keeping the alphabetical order - same with the other file