You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/12 07:52:04 UTC
[37/50] [abbrv] incubator-trafodion git commit: Added Notice, License,
Disclaimer to amabari install RPM package
Added Notice,License, Disclaimer to amabari install RPM package
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62216305
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62216305
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62216305
Branch: refs/heads/master
Commit: 62216305d986663ad084dc7191d97603d25c210d
Parents: a48a06d
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Mar 31 18:42:23 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Mar 31 18:42:23 2017 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
install/ambari-installer/Makefile | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62216305/NOTICE
----------------------------------------------------------------------
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/).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62216305/install/ambari-installer/Makefile
----------------------------------------------------------------------
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 @@ all: rpmbuild
# 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 @@ mpack-install/LICENSE: ../../licenses/LICENSE-install
../../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 @@ rpmbuild: $(SOURCEDIR)/ambari_rpm.tar.gz
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
+