Repository: bigtop Updated Branches: refs/heads/master c85fc51d1 -> b8ea3e0de
BIGTOP-1677. Tez packaging is still failing Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b8ea3e0d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b8ea3e0d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b8ea3e0d Branch: refs/heads/master Commit: b8ea3e0de1d29b132a634ff29b593d29c717aef8 Parents: c85fc51 Author: Evans Ye <[email protected]> Authored: Tue Feb 17 18:32:00 2015 +0000 Committer: Olaf Flebbe <[email protected]> Committed: Wed Feb 18 19:19:29 2015 +0100 ---------------------------------------------------------------------- bigtop-packages/src/common/tez/install_tez.sh | 7 ------- bigtop-packages/src/rpm/tez/SPECS/tez.spec | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b8ea3e0d/bigtop-packages/src/common/tez/install_tez.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/tez/install_tez.sh b/bigtop-packages/src/common/tez/install_tez.sh index c533dcd..db1bfa4 100644 --- a/bigtop-packages/src/common/tez/install_tez.sh +++ b/bigtop-packages/src/common/tez/install_tez.sh @@ -99,7 +99,6 @@ MAN_DIR=${MAN_DIR:-/usr/share/man/man1} DOC_DIR=${DOC_DIR:-/usr/share/doc/tez} LIB_DIR=${LIB_DIR:-/usr/lib/tez} CONF_DIR=${CONF_DIR:-/etc/tez/conf} -LIBEXEC_DIR=${LIBEXEC_DIR:-${LIB_DIR}/tez} install -d -m 0755 $PREFIX/$MAN_DIR gzip -c tez.1 > $PREFIX/$MAN_DIR/tez.1.gz @@ -109,14 +108,8 @@ install -d -m 0755 $PREFIX/$LIB_DIR/lib install -d -m 0755 $PREFIX/$DOC_DIR install -d -m 0755 $PREFIX/$CONF_DIR install -d -m 0755 $PREFIX/$MAN_DIR -install -d -m 0755 $PREFIX/$LIBEXEC_DIR cp tez-site.xml $PREFIX/$CONF_DIR tar -C $PREFIX/$LIB_DIR -xzf $BUILD_DIR/tez-dist/target/tez*-minimal.tar.gz -#test ! -d $BUILD_DIR/lib || cp -ra $BUILD_DIR/lib/* ${PREFIX}/${LIB_DIR}/lib/ -#test ! -d $BUILD_DIR || cp $BUILD_DIR/tez*.jar $PREFIX/$LIB_DIR -#test ! -d $BUILD_DIR/docs || cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR -#test ! -d $BUILD_DIR/libexec || cp -a $BUILD_DIR/libexec/* $PREFIX/$LIBEXEC_DIR - http://git-wip-us.apache.org/repos/asf/bigtop/blob/b8ea3e0d/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 0082056..8d8fe9f 100644 --- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec +++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec @@ -62,6 +62,8 @@ Source1: do-component-build Source2: install_tez.sh Source3: tez.1 Source4: tez-site.xml +Source5: bigtop.bom +Source6: init.d.tmpl BuildArch: noarch Requires: hadoop hadoop-hdfs hadoop-yarn hadoop-mapreduce @@ -78,7 +80,7 @@ which allows for a complex directed-acyclic-graph of tasks for processing data. It is currently built atop Apache Hadoop YARN %prep -%setup -q -n %{name}-%{tez_base_version} +%setup -q -n apache-%{name}-%{tez_base_version}-src %build env TEZ_VERSION=%{version} bash %{SOURCE1} @@ -107,4 +109,4 @@ sh %{SOURCE2} \ %{tez_home} %doc %{doc_tez} %{man_dir}/man1/tez.1.* -%{tez_home}/tez-*.jar +/etc/tez/conf/tez-site.xml
