From 499c5390b37f5a7eba39c820910741c0c960d977 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Apr 2016 01:00:42 +0300 Subject: [PATCH 1/5] Updated submodules. Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qt3d b/qt3d index 9c67288e..8fb8f65d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9c67288ea4791fee5e28d1b4f2981c232b95c9d0 +Subproject commit 8fb8f65da85e16a3f4d798d2175cec918d2c5afb diff --git a/qtbase b/qtbase index 8ce657d0..bbd1228b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ce657d0279566ef327af1b88339534041ddc012 +Subproject commit bbd1228b17ee3f3a5483f88b0a581d6a60c41cad diff --git a/qtconnectivity b/qtconnectivity index 80b6557b..dedff12a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 80b6557be3a23a5118ddf8c4b68bc28b66f52b49 +Subproject commit dedff12a896d51c469d2af82664b86a10f8fa7fe diff --git a/qtdeclarative b/qtdeclarative index d438b4f4..3b9d7ee1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d438b4f4b93d04a841edf031359e26af617d889d +Subproject commit 3b9d7ee10e2ae6565f0767219303d9a11d80f489 diff --git a/qtdoc b/qtdoc index 39ea341d..c99ffa60 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 39ea341d0e5466b7a7b46c7d3ce32ea69e686f68 +Subproject commit c99ffa6088ed1879ea74a978bae6350971ac9cbe diff --git a/qtenginio b/qtenginio index a6434420..cf717b99 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit a6434420574f775d3afa6e8912eb2ede8429db90 +Subproject commit cf717b99fdb1b7221dd556bf3be32feba0ed8afe diff --git a/qtlocation b/qtlocation index f40e92b1..d1f66746 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f40e92b147560be15e0f53dfd7f6b2d698c00fb9 +Subproject commit d1f66746ab0b77b4f3300cbeeaafe61d25d78e98 diff --git a/qtmultimedia b/qtmultimedia index 3fb3231a..2170a3b0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3fb3231a9e22dcb780d5b31ec57896429d40b0e5 +Subproject commit 2170a3b0fcda613daf76a337fa45cb97e0714cdf diff --git a/qtqa b/qtqa index 7c7310a7..4704f79e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7c7310a7e6b35591e64e6c978a179b5846296ee8 +Subproject commit 4704f79e9be910d9859d2649aa6a060f58c05bf8 diff --git a/qtquick1 b/qtquick1 index bf4efac4..563ce388 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c +Subproject commit 563ce3888f3c04abcc96ba236b20c7a822bc88e2 diff --git a/qtquickcontrols b/qtquickcontrols index b1d29faf..01e52200 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b1d29faf96ee6323bf2dad054291fd7c30a30c05 +Subproject commit 01e52200e2a76ec51c3bb9710617ac0c249a78bc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bed6b3d6..ac152bfc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bed6b3d633d83302a8e2167845db4b36e6847f0b +Subproject commit ac152bfcd37f94453e9705b57ca6520ad30bade0 diff --git a/qtrepotools b/qtrepotools index 333ca78f..0b1dba74 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb +Subproject commit 0b1dba7456f0e2cebf0d270bbaa4b04b4883c46e diff --git a/qtserialbus b/qtserialbus index 04b75569..7a05d8ed 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 04b75569f36eec14662505a08bf8c1d565cb10fe +Subproject commit 7a05d8ed0f123372b29662c84c16f04140de5b28 diff --git a/qtsvg b/qtsvg index b7228367..e02df9c0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b722836765dccca04683939d0d4f72a9e2585d88 +Subproject commit e02df9c098b4d304b34c0ff65806a0576e45ed1a diff --git a/qttools b/qttools index aec1d10c..e33532e0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit aec1d10c66a676781c767099e81871faa040162f +Subproject commit e33532e048fa12ee32429ca83ee31aa8f065147d diff --git a/qttranslations b/qttranslations index cbef985e..13f1f2f1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cbef985e3c3e9af2d124d40959fc674b3b8aa33f +Subproject commit 13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f diff --git a/qtwayland b/qtwayland index b94be414..26e27845 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b94be41409a6dfa58d8b3ae8413c6930e76fc040 +Subproject commit 26e27845a43319d0ecad0c6392f05d1ed50da2a2 diff --git a/qtwebengine b/qtwebengine index 4ed08bb0..643aa579 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4ed08bb0a8195746c333dabbdb9da3400d174296 +Subproject commit 643aa579fc94933eefa8eb20af6729e2140cf480 diff --git a/qtwebkit b/qtwebkit index 3b4c8503..71136c96 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 3b4c850361abbc2aae556dbf99c8e4c8086ae569 +Subproject commit 71136c9621103522e85654c8e144d5f1c961de1c diff --git a/qtwebsockets b/qtwebsockets index 3b128f9b..ba9306ec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3b128f9b45f4fafc305ff0c89cfc2cb665c856d5 +Subproject commit ba9306ec5a1271275d79b2f48ceb227f79352f33 diff --git a/qtwebview b/qtwebview index 29988395..87cc3318 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 299883956859a3eea1f2637a781adfec45c4b3c8 +Subproject commit 87cc3318cbd0aba2388e9c2623eb085b48db4e6c diff --git a/qtwinextras b/qtwinextras index e7d198e8..dbf43cd3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e7d198e87396eb160fa9b1163eb73af152e70da2 +Subproject commit dbf43cd34090cc66317ee5ffe5d12f874fe1576a diff --git a/qtxmlpatterns b/qtxmlpatterns index 7a8d395a..5e6acdb2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7a8d395a3b1eb5f24aa96509666326bad4218c14 +Subproject commit 5e6acdb2ea92add793835561e7a2d6b0ed8890f8 From d61ac6c2f03695a7184c964b0cc092c24b829f24 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Apr 2016 01:00:45 +0300 Subject: [PATCH 2/5] Updated submodules. Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index bbd1228b..072f5b51 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bbd1228b17ee3f3a5483f88b0a581d6a60c41cad +Subproject commit 072f5b513e486e884ea7fa4a1cac9aedf3846374 diff --git a/qtdeclarative b/qtdeclarative index 3b9d7ee1..2e6f7f36 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3b9d7ee10e2ae6565f0767219303d9a11d80f489 +Subproject commit 2e6f7f362e62c3285e7d395aca607502c8e8160e diff --git a/qtmultimedia b/qtmultimedia index 2170a3b0..7553a052 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2170a3b0fcda613daf76a337fa45cb97e0714cdf +Subproject commit 7553a0521356d0b28bacb8c8d07a25e4ba26097e diff --git a/qtquickcontrols b/qtquickcontrols index 01e52200..26f7894d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 01e52200e2a76ec51c3bb9710617ac0c249a78bc +Subproject commit 26f7894dae87ef2dd6cf596decf645d1c877c950 diff --git a/qtserialbus b/qtserialbus index 7a05d8ed..edf55f65 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7a05d8ed0f123372b29662c84c16f04140de5b28 +Subproject commit edf55f657a46fe16bf80d63f523848bb9b71d9f3 diff --git a/qtwayland b/qtwayland index 26e27845..2e08d3af 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26e27845a43319d0ecad0c6392f05d1ed50da2a2 +Subproject commit 2e08d3afc08ea305052d75a306dac381d3025134 diff --git a/qtwebengine b/qtwebengine index 643aa579..a3318c84 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 643aa579fc94933eefa8eb20af6729e2140cf480 +Subproject commit a3318c84b022282a5a4a2babc51d1e3ca634e25b diff --git a/qtwebview b/qtwebview index 87cc3318..b76a913c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 87cc3318cbd0aba2388e9c2623eb085b48db4e6c +Subproject commit b76a913c948e61184dbfe6e540cfcdc7f9f11585 From 2aff3114237294c08dee8a90d403c1b98c64b079 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 25 Apr 2016 15:00:02 +0200 Subject: [PATCH 3/5] Add coin provisioning directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- coin/README | 9 +++++++++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 coin/README create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh diff --git a/coin/README b/coin/README new file mode 100644 index 00000000..891d7202 --- /dev/null +++ b/coin/README @@ -0,0 +1,9 @@ +Continuous Integration +====================== + +This directory contains files used by Qt's Continuous Integration system (Coin). + +provisioning +------------ +Contains scripts that apply to different test machines in order to run automatic tests on them. + diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh new file mode 100644 index 00000000..f6c90a75 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh @@ -0,0 +1,4 @@ +# provides: odbc devel packages on RHEL +# version: provided by default Linux distribution repository +# needed for configure -plugin-sql-odbc in qtbase +sudo yum install -y unixODBC-devel From 54f1bfd10c5149271531d40f1a3056dace5f420b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 27 Apr 2016 14:52:15 +0200 Subject: [PATCH 4/5] Add script to install jom through powershell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/helpers.ps1 | 31 +++++++++++++++++++ coin/provisioning/common/jom.ps1 | 7 +++++ coin/provisioning/qtci-windows-10-x86/jom.ps1 | 6 ++++ .../qtci-windows-10-x86_64/jom.ps1 | 6 ++++ coin/provisioning/qtci-windows-7-x86/jom.ps1 | 6 ++++ coin/provisioning/qtci-windows-8-x86/jom.ps1 | 6 ++++ .../qtci-windows-8-x86_64/jom.ps1 | 6 ++++ 7 files changed, 68 insertions(+) create mode 100644 coin/provisioning/common/helpers.ps1 create mode 100644 coin/provisioning/common/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/jom.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 new file mode 100644 index 00000000..f517e94d --- /dev/null +++ b/coin/provisioning/common/helpers.ps1 @@ -0,0 +1,31 @@ +function Verify-Checksum +{ + Param ( + [string]$File=$(throw("You must specify a filename to get the checksum of.")), + [string]$Expected=$(throw("Checksum required")), + [ValidateSet("sha1","md5")][string]$Algorithm="sha1" + ) + $fs = new-object System.IO.FileStream $File, "Open" + $algo = [type]"System.Security.Cryptography.$Algorithm" + $crypto = $algo::Create() + $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "") + $fs.Close() + if ($hash -ne $Expected) { + Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'" + } +} + +function Extract-Zip +{ + Param ( + [string]$Source, + [string]$Destination + ) + echo "Extracting '$Source' to '$Destination'..." + + New-Item -ItemType Directory -Force -Path $Destination + $shell = new-object -com shell.application + $zipfile = $shell.Namespace($Source) + $destinationFolder = $shell.Namespace($Destination) + $destinationFolder.CopyHere($zipfile.Items()) +} diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 new file mode 100644 index 00000000..c233ee6e --- /dev/null +++ b/coin/provisioning/common/jom.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\jom_1_1_0.zip" + +Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip +Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" +Extract-Zip $zip C:\Utils\Jom diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force From 3963056f63ecf76bf25e210dc170cdbe0dbc664c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 27 Apr 2016 15:21:34 +0200 Subject: [PATCH 5/5] Add script that install icu on RHEL 6.6 That is translation from coin-setup golang code to sh script Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e Reviewed-by: Frederik Gladhorn --- .../qtci-linux-RHEL-6.6-x86_64/install_icu.sh | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh new file mode 100644 index 00000000..02ddda3f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh @@ -0,0 +1,70 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# + +# This script installs the right ICU version + +set -e +icuVersion="56.1" +icuLocation="/usr/lib64" +sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" + +function Install7ZPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive" + rm $targetFile +} + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64" + +echo "Installing custom ICU devel packages on RHEL" + +sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" +develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +tempDir=`mktemp -d` || echo "Failed to create temporary directory" +trap "sudo rm -fr $tempDir" EXIT +Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir +sudo cp -a $tempDir/lib/* /usr/lib64 +sudo cp -a $tempDir/* /usr/ + +sudo /sbin/ldconfig