Commit 019eaa79 authored by Tomas Popela's avatar Tomas Popela Committed by Commit Bot

Don't depend on redhat-lsb to avoid pulling in excessive dependencies

redhat-lsb implies many dependencies and on Fedora or RHEL some of these are
not needed at all (the most obvious one is qt3) and Chrome is usually the one
who pulls them to the system by requiring the whole lsb. Require only
lsb_release from the lsb as that's the only thing that we are using.

Tested by modifying the build system to be able to build Chromium RPM
packages and tested them on recent Fedora 26, RHEL 7 and OpenSUSE Leap
42.2.

BUG=133327

Change-Id: Ic291c3107320a8b195d939c561f677016f2bd1ee
Reviewed-on: https://chromium-review.googlesource.com/591107
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarPaweł Hajdan Jr. <phajdan.jr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490728}
parent 02e4b5d1
...@@ -121,7 +121,10 @@ do_package() { ...@@ -121,7 +121,10 @@ do_package() {
exit $BAD_DIFF exit $BAD_DIFF
fi fi
# lsb implies many dependencies. # lsb implies many dependencies and on Fedora or RHEL some of these are not
# needed at all (the most obvious one is qt3) and Chrome is usually the one
# who pulls them to the system by requiring the whole lsb. Require only
# lsb_release from the lsb as that's the only thing that we are using.
# #
# nss (bundled) is optional in LSB 4.0. Also specify a more recent version # nss (bundled) is optional in LSB 4.0. Also specify a more recent version
# for security and stability updates. While we depend on libnss3.so and not # for security and stability updates. While we depend on libnss3.so and not
...@@ -145,7 +148,7 @@ do_package() { ...@@ -145,7 +148,7 @@ do_package() {
# for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564 # for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564
# TODO(thestig): Use the liberation-fonts package once its available on all # TODO(thestig): Use the liberation-fonts package once its available on all
# supported distros. # supported distros.
DEPENDS="lsb >= 4.0, \ DEPENDS="/usr/bin/lsb_release, \
libnss3.so(NSS_3.22)${PKG_ARCH}, \ libnss3.so(NSS_3.22)${PKG_ARCH}, \
libssl3.so(NSS_3.28)${PKG_ARCH}, \ libssl3.so(NSS_3.28)${PKG_ARCH}, \
wget, \ wget, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment