diff options
| author | Arnaud Launay <asl-github@launay.org> | 2017-05-26 22:52:05 +0200 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2017-05-28 03:05:12 +0800 |
| commit | b7f8b9d0aadbd2f839b2b55efcde912709e0553a (patch) | |
| tree | a2249ef7d3c4c20b93afc80fa4267ba153eee9af /bigtop-packages | |
| parent | eb7370a9e7ce1d2b7a62860f50a3076136463655 (diff) | |
BIGTOP-2729: AMBARI-20686: Add ID to allow compilation with recent maven
Signed-off-by: Evans Ye <evansye@apache.org>
Diffstat (limited to 'bigtop-packages')
| -rw-r--r-- | bigtop-packages/src/common/ambari/patch0-AMBARI.diff | 13 | ||||
| -rw-r--r-- | bigtop-packages/src/rpm/ambari/SPECS/ambari.spec | 3 |
2 files changed, 16 insertions, 0 deletions
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 00000000..8be6d7da --- /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> diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec index b51f9a11..e32f84bc 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 |