You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/27 16:41:04 UTC
[09/15] incubator-trafodion git commit: Changed installer tar file
name
Changed installer tar file name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b8df0e25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b8df0e25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b8df0e25
Branch: refs/heads/master
Commit: b8df0e25cf4b6d9ac29cb84c3798d09bb4b98aa9
Parents: 9fb1bdd
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 17:15:37 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 17:15:37 2016 +0000
----------------------------------------------------------------------
install/Makefile | 16 +++++-----------
install/installer/traf_package_setup | 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8df0e25/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 5499cea..cf14d65 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -14,22 +14,16 @@
# limitations under the License.
#
# @@@ END COPYRIGHT @@@
-
-# Default version number
-# daily, pre-release, & release builds are named based on build ID (tag or date)
-# Version identifier is two parts:
-# * Trafodion version supported
-# * Installer version number (starting from 1 for each Trafodion version)
-#
-# "v000" indicates an internal/development version of installer
RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
+RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /_/g')
+INSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_installer_${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE
- tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
+ tar czf ${INSTALLER_TARNAME} installer --exclude=tools
mkdir -p ../distribution
- mv installer-$(RELEASE_VER).tar.gz ../distribution
+ mv ${INSTALLER_TARNAME} ../distribution
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
@@ -44,4 +38,4 @@ version:
@echo "$(RELEASE_VER)"
clean:
- rm -f installer-$(RELEASE_VER).tar.gz
+ rm -f ${INSTALLER_TARNAME}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8df0e25/install/installer/traf_package_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_package_setup b/install/installer/traf_package_setup
index 4469e06..3afae38 100755
--- a/install/installer/traf_package_setup
+++ b/install/installer/traf_package_setup
@@ -151,7 +151,7 @@ if [[ $SUSE_LINUX == "false" ]]; then
# it doesn't hurt if it was already enabled and we try to enable it again
$TRAF_PDSH sudo yum-config-manager --enable RedHat-6-x86_64-Fedora-EPEL 2>> $YUM_LOG >> $YUM_LOG
- package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip unixODBC unixODBC-devel libiodbc libiodbc-devel"
+ package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip gcc-c++ unixODBC unixODBC-devel libiodbc libiodbc-devel"
if [[ $internetAccess == "true" ]]; then
for package in $package_list
do