Commit af5173b2 authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Fix RPM build with newer versions of rpmlib

Newer versions of rpmlib add the dependency "rpmlib(FileDigests) <= 4.6.0-1".
The only distro where this requirement would not be satisfied is RHEL 5, which
has extended support until 30 November 2020, but we've already broken support on
that release anyway.

The lack of listing rpmlib(FileDigests) as an expected dependency was causing
the RPM build to fail on gLinux, so this CL adds it.  Additionally, it's added
as a manual dependency to prevent the RPM build from breaking when using older
versions of rpmlib (like on the bots).

BUG=None

Change-Id: I243e49330d938795c2b1e502004294e80ee722ac
Reviewed-on: https://chromium-review.googlesource.com/1060077
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558888}
parent 4b3d3b5c
...@@ -23,6 +23,11 @@ libappindicator3.so.1()(64bit) ...@@ -23,6 +23,11 @@ libappindicator3.so.1()(64bit)
libnss3.so(NSS_3.22)(64bit) libnss3.so(NSS_3.22)(64bit)
libssl3.so(NSS_3.28)(64bit) libssl3.so(NSS_3.28)(64bit)
# This dependency is added by newer versions of rpmlib. To ensure consistency
# of expected dependencies when Chrome is built with the older versions, add it
# as a manual dependency.
rpmlib(FileDigests) <= 4.6.0-1
# For uploading crash reports with Breakpad. # For uploading crash reports with Breakpad.
wget wget
......
...@@ -60,6 +60,7 @@ verify_package() { ...@@ -60,6 +60,7 @@ verify_package() {
local ACTUAL_DEPENDS="${TMPFILEDIR}/actual_rpm_depends" local ACTUAL_DEPENDS="${TMPFILEDIR}/actual_rpm_depends"
local ADDITIONAL_RPM_DEPENDS="/bin/sh, \ local ADDITIONAL_RPM_DEPENDS="/bin/sh, \
rpmlib(CompressedFileNames) <= 3.0.4-1, \ rpmlib(CompressedFileNames) <= 3.0.4-1, \
rpmlib(FileDigests) <= 4.6.0-1, \
rpmlib(PayloadFilesHavePrefix) <= 4.0-1, \ rpmlib(PayloadFilesHavePrefix) <= 4.0-1, \
/usr/sbin/update-alternatives" /usr/sbin/update-alternatives"
if [ ${IS_OFFICIAL_BUILD} -ne 0 ]; then if [ ${IS_OFFICIAL_BUILD} -ne 0 ]; then
...@@ -67,7 +68,7 @@ verify_package() { ...@@ -67,7 +68,7 @@ verify_package() {
rpmlib(PayloadIsXz) <= 5.2-1" rpmlib(PayloadIsXz) <= 5.2-1"
fi fi
echo "${DEPENDS}" "${ADDITIONAL_RPM_DEPENDS}" | sed 's/,/\n/g' | \ echo "${DEPENDS}" "${ADDITIONAL_RPM_DEPENDS}" | sed 's/,/\n/g' | \
sed 's/^ *//' | LANG=C sort > "${EXPECTED_DEPENDS}" sed 's/^ *//' | LANG=C sort | uniq > "${EXPECTED_DEPENDS}"
rpm -qpR "${OUTPUTDIR}/${PKGNAME}.${ARCHITECTURE}.rpm" | LANG=C sort | uniq \ rpm -qpR "${OUTPUTDIR}/${PKGNAME}.${ARCHITECTURE}.rpm" | LANG=C sort | uniq \
> "${ACTUAL_DEPENDS}" > "${ACTUAL_DEPENDS}"
BAD_DIFF=0 BAD_DIFF=0
......
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