diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-05 09:04:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 09:04:05 +0200 |
commit | 95ff2f4870a3fce4d3f96c721e9d2868ecea9347 (patch) | |
tree | f3af3fe508386a0215462635971fd95d46f21a08 | |
parent | b38531445110823f76726d9e7f4117ed94597942 (diff) | |
parent | 3fb555a773f5a6fc651127bfbc5e96057baec522 (diff) | |
download | qt5-95ff2f4870a3fce4d3f96c721e9d2868ecea9347.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh | 6 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh) | 0 |
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh new file mode 100644 index 00000000..852c1100 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -0,0 +1,6 @@ +# provides: fix for possible bug in the subscription manager +# version: provided by RedHat +# needed for yum to work properly in case there is incorrect data in +# the sslclientkey repository parameter value +sudo rm -f /etc/pki/entitlement/* +sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..f6c90a75 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh |