diff options
3 files changed, 50 insertions, 21 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh new file mode 100755 index 00000000..4eb9882d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +package="epel-release-7-11.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" +rm "$targetFile" + diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index d95f4f21..45565766 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -35,21 +35,9 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - 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 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 20e82868..41f181b2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -37,15 +37,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -packageEpel="epel-release-latest-7.noarch.rpm" -OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" -CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" -SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" - -DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel -sudo rpm -Uvh $packageEpel -sudo rm -f $packageEpel - # install python3 sudo yum install -y python34-devel |