You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2017/11/25 18:43:02 UTC
[1/3] bigtop git commit: BIGTOP-2681: Add %config directive for
tez-site.xml
Repository: bigtop
Updated Branches:
refs/heads/master 406fa0892 -> 269be3f12
BIGTOP-2681: Add %config directive for tez-site.xml
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/269be3f1
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/269be3f1
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/269be3f1
Branch: refs/heads/master
Commit: 269be3f12ca514c39ba8a97a7df1b131286408b6
Parents: 1a44855
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 25 19:39:11 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Nov 25 19:41:47 2017 +0100
----------------------------------------------------------------------
bigtop-packages/src/rpm/tez/SPECS/tez.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/269be3f1/bigtop-packages/src/rpm/tez/SPECS/tez.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/tez/SPECS/tez.spec b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
index b2f6e05..eb0f46a 100644
--- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec
+++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
@@ -117,4 +117,4 @@ sh %{SOURCE2} \
%{tez_home}
%doc %{doc_tez}
%{man_dir}/man1/tez.1.*
-/etc/tez/conf/tez-site.xml
+%config(noreplace) /etc/tez/conf/tez-site.xml
[3/3] bigtop git commit: BIGTOP-2938: Hadoop can not be built under
Debian 9 due to wrong dependency on OpenSSL
Posted by of...@apache.org.
BIGTOP-2938: Hadoop can not be built under Debian 9 due to wrong dependency on OpenSSL
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/19475d68
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/19475d68
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/19475d68
Branch: refs/heads/master
Commit: 19475d687048445c34503aabe0a2f9c82701dc30
Parents: 406fa08
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 25 18:26:56 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Nov 25 19:41:47 2017 +0100
----------------------------------------------------------------------
bigtop_toolchain/manifests/packages.pp | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/19475d68/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index e58ea0c..1514827 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -178,7 +178,6 @@ class bigtop_toolchain::packages {
"build-essential",
"dh-make",
"libfuse2",
- "libssh-dev",
"libjansi-java",
"python2.7-dev",
"libxml2-dev",
[2/3] bigtop git commit: BIGTOP-2942:update tez to 0.9
Posted by of...@apache.org.
BIGTOP-2942:update tez to 0.9
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1a448555
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1a448555
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1a448555
Branch: refs/heads/master
Commit: 1a448555e517ca01bca58efe1996c9fa53baa0bf
Parents: 19475d6
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 25 19:34:37 2017 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Nov 25 19:41:47 2017 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/tez/do-component-build | 15 ---------------
.../src/common/tez/patch0-remove-phantomjs.diff | 12 ++++++++++++
bigtop-packages/src/rpm/tez/SPECS/tez.spec | 3 +++
bigtop.bom | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1a448555/bigtop-packages/src/common/tez/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/tez/do-component-build b/bigtop-packages/src/common/tez/do-component-build
index 9318cd0..c3d06c9 100644
--- a/bigtop-packages/src/common/tez/do-component-build
+++ b/bigtop-packages/src/common/tez/do-component-build
@@ -18,24 +18,9 @@ set -xe
. `dirname $0`/bigtop.bom
-if [ $HOSTTYPE = "powerpc64le" ] ; then
- git clone https://github.com/ibmsoe/phantomjs-1
- cd phantomjs-1
- export PHANTOMJS_CDNURL=https://github.com/ibmsoe/phantomjs/releases/download/2.1.1
- npm install -g
- cd ..
- rm -rf phantomjs-1
- sed -i "s|<nodeVersion>.*</nodeVersion>|<nodeVersion>v4.4.7</nodeVersion>|" tez-ui/pom.xml
- sed -i "s|<npmVersion>.*</npmVersion>|<npmVersion>2.15.3</npmVersion>|" tez-ui/pom.xml
- sed -i 's|"phantomjs": .*|"phantomjs": "^1.9.19"|' tez-ui/src/main/webapp/package.json
- sed -i "s|<frontend-maven-plugin.version>.*</frontend-maven-plugin.version>|<frontend-maven-plugin.version>1.1</frontend-maven-plugin.version>|" pom.xml
-fi
-
BUILD_TEZ_OPTS="clean package \
-Dtar -Dhadoop.version=${HADOOP_VERSION} \
-Phadoop26 \
-DskipTests"
-#mvn versions:set -DnewVersion=${TEZ_VERSION}
-
mvn ${BUILD_TEZ_OPTS} "$@"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1a448555/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff b/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
new file mode 100644
index 0000000..69396bb
--- /dev/null
+++ b/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
@@ -0,0 +1,12 @@
+--- apache-tez-0.9.0-src/tez-ui/src/main/webapp/package.json_ 2017-11-25 17:52:37.868021145 +0000
++++ apache-tez-0.9.0-src/tez-ui/src/main/webapp/package.json 2017-11-25 17:55:49.390774359 +0000
+@@ -57,8 +57,7 @@
+ "ember-truth-helpers": "1.3.0",
+ "bower-shrinkwrap-resolver-ext": "^0.1.0",
+ "loader.js": "4.2.3",
+- "testem": "0.9.11",
+- "phantomjs-prebuilt": "2.1.13"
++ "testem": "0.9.11"
+ },
+ "dependencies": {
+ "em-helpers": "0.8.0",
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1a448555/bigtop-packages/src/rpm/tez/SPECS/tez.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/tez/SPECS/tez.spec b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
index 2605e50..b2f6e05 100644
--- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec
+++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
@@ -62,6 +62,7 @@ Source3: tez.1
Source4: tez-site.xml
Source5: bigtop.bom
Source6: init.d.tmpl
+#BIGTOP_PATCH_FILES
BuildArch: noarch
Requires: hadoop hadoop-hdfs hadoop-yarn hadoop-mapreduce
@@ -80,6 +81,8 @@ processing data. It is currently built atop Apache Hadoop YARN
%prep
%setup -q -n apache-%{name}-%{tez_base_version}-src
+#BIGTOP_PATCH_COMMANDS
+
%build
env TEZ_VERSION=%{version} bash %{SOURCE1}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1a448555/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index 70f800f..846ea72 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -197,7 +197,7 @@ bigtop {
'tez' {
name = 'tez'
relNotes = 'Apache TEZ'
- version { base = '0.6.2'; pkg = base; release = 1 }
+ version { base = '0.9.0'; pkg = base; release = 1 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"