Repository: bigtop Updated Branches: refs/heads/master 9e78a0365 -> badd85ebf
BIGTOP-2973: Hama packaging is broken with Hadoop 2.8+ Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/badd85eb Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/badd85eb Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/badd85eb Branch: refs/heads/master Commit: badd85ebf366a0c2a7b3c9537915cf655d06660c Parents: 9e78a03 Author: Youngwoo Kim <yw...@apache.org> Authored: Wed Dec 27 11:44:51 2017 +0900 Committer: Youngwoo Kim <yw...@apache.org> Committed: Wed Dec 27 11:44:51 2017 +0900 ---------------------------------------------------------------------- .../src/common/hama/patch0-HAMA-1002.diff | 15 +++++++++++++++ bigtop-packages/src/rpm/hama/SPECS/hama.spec | 3 +++ 2 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/badd85eb/bigtop-packages/src/common/hama/patch0-HAMA-1002.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hama/patch0-HAMA-1002.diff b/bigtop-packages/src/common/hama/patch0-HAMA-1002.diff new file mode 100644 index 0000000..bba4924 --- /dev/null +++ b/bigtop-packages/src/common/hama/patch0-HAMA-1002.diff @@ -0,0 +1,15 @@ +diff --git a/commons/pom.xml b/commons/pom.xml +index 327733630..4166523ca 100644 +--- a/commons/pom.xml ++++ b/commons/pom.xml +@@ -36,6 +36,10 @@ + <artifactId>guava</artifactId> + <version>13.0.1</version> + </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ </dependency> + </dependencies> + + <build> http://git-wip-us.apache.org/repos/asf/bigtop/blob/badd85eb/bigtop-packages/src/rpm/hama/SPECS/hama.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hama/SPECS/hama.spec b/bigtop-packages/src/rpm/hama/SPECS/hama.spec index fc24d90..3b9bb10 100644 --- a/bigtop-packages/src/rpm/hama/SPECS/hama.spec +++ b/bigtop-packages/src/rpm/hama/SPECS/hama.spec @@ -50,6 +50,7 @@ Source3: %{name}-bspmaster.init Source4: %{name}-groom.init Source5: %{name}.default Source6: bigtop.bom +#BIGTOP_PATCH_FILES Requires: hadoop, bigtop-utils, zookeeper # Disable automatic Requires generation @@ -161,6 +162,8 @@ Documentation for Apache Hama %prep %setup -n %{name}-%{hama_base_version} +#BIGTOP_PATCH_COMMANDS + %build bash $RPM_SOURCE_DIR/do-component-build
