geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [geode-native] branch develop updated: GEODE-3288: Update RHEL6 to Developer Toolset 4.
Date Sat, 02 Dec 2017 02:08:09 GMT
This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 419715c  GEODE-3288: Update RHEL6 to Developer Toolset 4.
419715c is described below

commit 419715c634cfbea803c40a903aaf499c07b43b7f
Author: Jacob Barrett <jbarrett@pivotal.io>
AuthorDate: Fri Dec 1 18:06:03 2017 -0800

    GEODE-3288: Update RHEL6 to Developer Toolset 4.
---
 packer/build-linux.json                                        |  4 ++--
 .../{install-scl-devtoolset-3.sh => install-scl-devtoolset.sh} | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packer/build-linux.json b/packer/build-linux.json
index 9f2cbda..abc7594 100644
--- a/packer/build-linux.json
+++ b/packer/build-linux.json
@@ -72,7 +72,7 @@
         "rhel/install-repos.sh",
         "rhel/install-jdk-1.8.sh",
         "rhel/install-build-rpms.sh",
-        "rhel/install-scl-devtoolset-3.sh",
+        "rhel/install-scl-devtoolset.sh",
         "rhel/install-cmake.sh"
       ]
     },
@@ -97,4 +97,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packer/rhel/install-scl-devtoolset-3.sh b/packer/rhel/install-scl-devtoolset.sh
similarity index 78%
rename from packer/rhel/install-scl-devtoolset-3.sh
rename to packer/rhel/install-scl-devtoolset.sh
index 904f461..f165e44 100644
--- a/packer/rhel/install-scl-devtoolset-3.sh
+++ b/packer/rhel/install-scl-devtoolset.sh
@@ -6,9 +6,9 @@
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 
 set -x -e -o pipefail
 
-curl -o /etc/yum.repos.d/slc6-scl.repo http://linuxsoft.cern.ch/cern/scl/slc6-scl.repo
-yum -y --nogpgcheck install devtoolset-3-gcc devtoolset-3-gcc-c++
+yum-config-manager --enable rhui-REGION-rhel-server-rhscl
+yum -y install devtoolset-4-gcc-c++
 
-echo "source scl_source enable devtoolset-3" >> ~build/.bashrc
+echo "source scl_source enable devtoolset-4" >> ~build/.bashrc

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message