From 22e4664eb08dc5384c5afd0bd6c6a0725b242517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sat, 6 Jan 2018 20:24:01 +0200 Subject: Fix opcua provisioning by sourcing .profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When CMake is installed it exports its install path into .profile. However, freeopcua doesn't source it as builds do, so it couldn't find the cmake. Also, as Ubuntu is using .profile in our builds, this commit fixes so that the PATH is actually written into the right file. Task-number: QTBUG-65594 Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake_linux.sh | 6 +++++- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 35313d3c..3efe35a0 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile +else + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh index 4f4fd6ea..0410cf97 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -44,6 +44,7 @@ cd freeopcua git checkout ca75e05a8e63d88dbfc259e1251f405106411b66 mkdir build cd build +source ~/.profile cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. make sudo make install -- cgit v1.2.3