Merge TRAFODION-2570/2572
diff --git a/NOTICE b/NOTICE
index bfb365e..edd4485 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Trafodion
-Copyright 2015-2016 The Apache Software Foundation
+Copyright 2015-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index da93e74..89a8437 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -491,12 +491,6 @@
function vanilla_apache_usage {
cat <<EOF
- If you haven't set HBASE_DISTRO, please set it before source current file
- export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
- export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
- export HBASE_DISTRO=CDH5.4 (cloudera 1.0.0-cdh5.4.4)
- export HBASE_DISTRO=CDH5.5 (cloudera 1.0.0-cdh5.5.1)
- export HBASE_DISTRO=HDP (hortonworks 2.3)
If you are ready to build Trafodion, perform one of the following options:
@@ -504,19 +498,15 @@
make package (Build Trafodion, DCS, REST, and Client drivers) OR
make package-all (Build Trafodion, DCS, REST, Client drivers, and Tests)
- If Trafodion has been built and you want test:
-
- Execute the install_local_hadoop script which performs a single node
- install using a popular Hadoop distribution
-
- cd $TRAF_HOME/sql/scripts
- install_local_hadoop [-p <port option>]
- install_traf_components
- configure Trafodion and start the processes
- HAVE FUN!
-
- You can also choose to install_local_hadoop before building Trafodion.
-
+ If Trafodion has been built and you want test:
+ Ensure Hadoop is installed :
+ Follow instructions for user environment :
+ http://trafodion.apache.org/docs/provisioning_guide/index.html
+ Follow instructions for dev environment at :
+ https://cwiki.apache.org/confluence/display/TRAFODION/Create+Test+Environment
+
+ You can also choose to install hadoop before building Trafodion.
+ HAVE FUN!
EOF
}
diff --git a/install/ambari-installer/Makefile b/install/ambari-installer/Makefile
index 4e3ebd9..9edb405 100644
--- a/install/ambari-installer/Makefile
+++ b/install/ambari-installer/Makefile
@@ -36,7 +36,7 @@
# select trafodion version for given HDP stack
REPO_LIST= $(TRAFODION_VER) # for now, list is current release only
-$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE repofiles traf-mpack/mpack.json
+$(SOURCEDIR)/ambari_rpm.tar.gz: mpack-install/LICENSE mpack-install/NOTICE mpack-install/DISCLAIMER repofiles traf-mpack/mpack.json
rm -rf $(RPMROOT)
mkdir -p $(SOURCEDIR)
tar czf $@ traf-mpack mpack-install
@@ -62,6 +62,12 @@
../../licenses/LICENSE-install:
cd $(@D) && $(MAKE) $(@F)
+mpack-install/NOTICE: ../../NOTICE
+ cp -f $? $@
+
+mpack-install/DISCLAIMER: ../../DISCLAIMER
+ cp -f $? $@
+
rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
mkdir -p $(RPMDIR)
mkdir -p $(BUILDDIR)
@@ -82,6 +88,9 @@
clean:
rm -rf $(RPMROOT)
rm -rf mpack-install/LICENSE
+ rm -rf mpack-install/NOTICE
+ rm -rf mpack-install/DISCLAIMER
rm -rf traf-mpack/custom-services/TRAFODION/*/repos
rm -f traf-mpack/custom-services/TRAFODION/*/metainfo.xml
rm -rf traf-mpack/mpack.json
+
