diff options
author | Rainer Keller <Rainer.Keller@qt.io> | 2018-03-06 16:25:02 +0100 |
---|---|---|
committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2018-03-10 13:31:30 +0000 |
commit | 00e3a0149a9da44a90400a232aeb481770170dea (patch) | |
tree | b56ef2dae1986100236b7ff73adfe94fa7b35178 /coin | |
parent | 9cb66c01143afa2b8115507c693a7266a31da6bb (diff) |
Properly download and install RHEL EPEL repo
Use the same approach as in the other scripts.
Change-Id: Ie48103e2c4a528a9d29318c4cabd6ead71dc5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh | 48 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 5 |
2 files changed, 48 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh new file mode 100755 index 00000000..e31f4869 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh @@ -0,0 +1,48 @@ +#!/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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +package="epel-release-6-8.noarch.rpm" +primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package" +cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package" +sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a" +targetFile="/tmp/$package" + +DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" + +sudo rpm -ivh "$targetFile" +rm "$targetFile" + diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index 552e7586..6152c7e5 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -7,11 +7,6 @@ set -ex sudo yum install -y python-devel python-virtualenv -# install the EPEL repository which provides python3 -wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm -sudo rpm -Uvh epel-release-latest-6.noarch.rpm -sudo rm -f epel-release-latest-6.noarch.rpm - # install python3 sudo yum install -y python34-devel |