From 6275ed9d70b840bb945e58338398c0c48f57d08c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 31 Oct 2017 10:17:49 +0200 Subject: [PATCH] Provisioning: Fix p7zip installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c Reviewed-by: Tony Sarajärvi Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh index d21fab6c..966f3045 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh @@ -32,11 +32,24 @@ ## $QT_END_LICENSE$ ## ############################################################################# +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -sudo wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm -sudo rpm -ivh epel-release-7-10.noarch.rpm -sudo yum -y install p7zip -sudo rm epel-release-7-10.noarch.rpm +name="p7zip" +version="7-11" +package="epel-release-$version.noarch.rpm" +primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" +cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" +sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +targetFile="/tmp/$package" + +DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" + +sudo rpm -ivh "$targetFile" +sudo yum -y install "$name" +sudo rm "$targetFile" # Link 7za to 7z so we can use existing installation scripts sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt +