diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:25:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-03 06:12:24 +0200 |
commit | ec7bf6356ccbdaf14f5274e36f49d73013fc5a06 (patch) | |
tree | 5dfb5ecf03920307bb56d8df4ac87155d0efa3a2 /coin/provisioning/qtci-linux-RHEL-7.6-x86_64 | |
parent | 7cd2473966b08aab3117dc58025a209c68283a44 (diff) | |
parent | 29befcc995ebb3572ebe082c28e0e01f47b2baa2 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.6-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh | 1 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh index 548cb9ca..28f7faa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -38,6 +38,7 @@ set -ex echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 5cdf7df0..0a29d842 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -46,6 +46,5 @@ targetFile="/tmp/$package" DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - |