You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/05/27 19:05:23 UTC
bigtop git commit: BIGTOP-2729: AMBARI-20686: Add ID to allow
compilation with recent maven
Repository: bigtop
Updated Branches:
refs/heads/master eb7370a9e -> b7f8b9d0a
BIGTOP-2729: AMBARI-20686: Add ID to allow compilation with recent maven
Signed-off-by: Evans Ye <ev...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b7f8b9d0
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b7f8b9d0
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b7f8b9d0
Branch: refs/heads/master
Commit: b7f8b9d0aadbd2f839b2b55efcde912709e0553a
Parents: eb7370a
Author: Arnaud Launay <as...@launay.org>
Authored: Fri May 26 22:52:05 2017 +0200
Committer: Evans Ye <ev...@apache.org>
Committed: Sun May 28 03:05:12 2017 +0800
----------------------------------------------------------------------
bigtop-packages/src/common/ambari/patch0-AMBARI.diff | 13 +++++++++++++
bigtop-packages/src/rpm/ambari/SPECS/ambari.spec | 3 +++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b7f8b9d0/bigtop-packages/src/common/ambari/patch0-AMBARI.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/patch0-AMBARI.diff b/bigtop-packages/src/common/ambari/patch0-AMBARI.diff
new file mode 100644
index 0000000..8be6d7d
--- /dev/null
+++ b/bigtop-packages/src/common/ambari/patch0-AMBARI.diff
@@ -0,0 +1,13 @@
+diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
+index 5dd3db4..f7bd433 100644
+--- a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
++++ b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
+@@ -17,7 +17,7 @@
+ limitations under the License.
+ -->
+ <assembly>
+- <id></id>
++ <id>odpi-ambari-mpack</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b7f8b9d0/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
index b51f9a1..e32f84b 100644
--- a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
+++ b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
@@ -41,6 +41,7 @@ Source0: apache-%{ambari_name}-%{ambari_version}-src.tar.gz
Source1: do-component-build
Source2: install_%{ambari_name}.sh
Source3: bigtop.bom
+#BIGTOP_PATCH_FILES
# FIXME
AutoProv: no
AutoReqProv: no
@@ -51,6 +52,8 @@ Ambari
%prep
%setup -n apache-%{ambari_name}-%{ambari_base_version}-src
+#BIGTOP_PATCH_COMMANDS
+
%build
bash $RPM_SOURCE_DIR/do-component-build