From 70c6729951335e630901c187b77f380f8a829645 Mon Sep 17 00:00:00 2001 From: Huang Shi Lin Date: Wed, 31 May 2023 23:08:42 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=96=E6=B6=88hard=20coding,=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8MAVEN=5FHOME=E7=9B=AE=E5=BD=95=E4=BF=9D?= =?UTF-8?q?=E5=AD=98jar=E3=80=81pom=E7=AD=89=E6=96=87=E4=BB=B6=20Fix=20iss?= =?UTF-8?q?ue=20I6B1U4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ambari.spec | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/ambari.spec b/ambari.spec index 1d6004e..b85db19 100644 --- a/ambari.spec +++ b/ambari.spec @@ -1,5 +1,5 @@ %define __jar_repack %{nil} - +%define _disable_source_fetch 0 %global debug_package %{nil} %global compile_for_local 0 @@ -59,43 +59,33 @@ tar -zxvf %{SOURCE19} %build cp %{SOURCE1} ./settings.xml -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/node/4.5.0/ -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/node/8.6.0/ mkdir -p /tmp/npm_config_tmp/phantomjs/ -mkdir -p /home/abuild/rpmbuild/BUILD/apache-ambari-2.7.6/ambari-infra/ambari-infra-solr-client/target/migrate/ -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/yarn/0.23.2/yarn-0.23.2./ -mkdir -p /home/abuild/.m2/repository/org/apache/storm/storm-core/0.10.0.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/org/apache/storm/storm/0.10.0.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/org/apache/hadoop/hadoop-auth/2.7.1.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/org/apache/hadoop/hadoop-project/2.7.1.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/org/apache/hadoop/hadoop-main/2.7.1.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/org/apache/zookeeper/zookeeper/3.4.6.2.3.0.0-2557/ -mkdir -p /home/abuild/.m2/repository/com/github/eirslett/yarn/1.1.0/ +mkdir -p ~/rpmbuild/BUILD/apache-ambari-2.7.6/ambari-infra/ambari-infra-solr-client/target/migrate/ mkdir -p /tmp/logsearch_npm_config_tmp/phantomjs/ -cp %{SOURCE2} /home/abuild/.m2/repository/com/github/eirslett/node/4.5.0/node-4.5.0-linux-arm64.tar.gz -cp %{SOURCE3} /home/abuild/.m2/repository/com/github/eirslett/node/4.5.0/node-4.5.0-linux-x64.tar.gz -cp %{SOURCE4} /home/abuild/.m2/repository/com/github/eirslett/yarn/0.23.2/yarn-0.23.2./yarn-v0.23.2.tar.gz +mvn install:install-file -Dfile=%{SOURCE2} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0-linux-arm64 -Dpackaging=tar.gz +mvn install:install-file -Dfile=%{SOURCE3} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0-linux-x64 -Dpackaging=tar.gz +mvn install:install-file -Dfile=%{SOURCE4} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=yarn -Dversion=0.23.2 -Dpackaging=tar.gz cp %{SOURCE5} /tmp/npm_config_tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 cp %{SOURCE5} /tmp/logsearch_npm_config_tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 cp %{SOURCE6} /tmp/npm_config_tmp/phantomjs/phantomjs-1.9.8-linux-x86_64.tar.bz2 -cp %{SOURCE7} /home/abuild/.m2/repository/org/apache/storm/storm-core/0.10.0.2.3.0.0-2557/storm-core-0.10.0.2.3.0.0-2557.jar -cp %{SOURCE8} /home/abuild/.m2/repository/org/apache/storm/storm-core/0.10.0.2.3.0.0-2557/storm-core-0.10.0.2.3.0.0-2557.pom -cp %{SOURCE9} /home/abuild/.m2/repository/org/apache/storm/storm/0.10.0.2.3.0.0-2557/storm-0.10.0.2.3.0.0-2557.pom -cp %{SOURCE10} /home/abuild/.m2/repository/org/apache/hadoop/hadoop-auth/2.7.1.2.3.0.0-2557/hadoop-auth-2.7.1.2.3.0.0-2557.jar -cp %{SOURCE11} /home/abuild/.m2/repository/org/apache/hadoop/hadoop-auth/2.7.1.2.3.0.0-2557/hadoop-auth-2.7.1.2.3.0.0-2557.pom -cp %{SOURCE12} /home/abuild/.m2/repository/org/apache/hadoop/hadoop-project/2.7.1.2.3.0.0-2557/hadoop-project-2.7.1.2.3.0.0-2557.pom -cp %{SOURCE13} /home/abuild/.m2/repository/org/apache/hadoop/hadoop-main/2.7.1.2.3.0.0-2557/hadoop-main-2.7.1.2.3.0.0-2557.pom -cp %{SOURCE14} /home/abuild/.m2/repository/org/apache/zookeeper/zookeeper/3.4.6.2.3.0.0-2557/zookeeper-3.4.6.2.3.0.0-2557.pom -cp %{SOURCE15} /home/abuild/.m2/repository/org/apache/zookeeper/zookeeper/3.4.6.2.3.0.0-2557/zookeeper-3.4.6.2.3.0.0-2557.jar -cp %{SOURCE16} /home/abuild/.m2/repository/com/github/eirslett/node/8.6.0/node-8.6.0-linux-x64.tar.gz -cp %{SOURCE17} /home/abuild/.m2/repository/com/github/eirslett/yarn/1.1.0/yarn-1.1.0.tar.gz +mvn install:install-file -Dfile=%{SOURCE8} -s settings.xml -DgroupId=org.apache.storm -DartifactId=storm-core -Dversion=0.10.0.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE7} -s settings.xml -DgroupId=org.apache.storm -DartifactId=storm-core -Dversion=0.10.0.2.3.0.0-2557 -Dpackaging=jar +mvn install:install-file -Dfile=%{SOURCE9} -s settings.xml -DgroupId=org.apache.storm -DartifactId=storm -Dversion=0.10.0.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE11} -s settings.xml -DgroupId=org.apache.hadoop -DartifactId=hadoop-auth -Dversion=2.7.1.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE10} -s settings.xml -DgroupId=org.apache.hadoop -DartifactId=hadoop-auth -Dversion=2.7.1.2.3.0.0-2557 -Dpackaging=jar +mvn install:install-file -Dfile=%{SOURCE12} -s settings.xml -DgroupId=org.apache.hadoop -DartifactId=hadoop-project -Dversion=2.7.1.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE13} -s settings.xml -DgroupId=org.apache.hadoop -DartifactId=hadoop-main -Dversion=2.7.1.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE14} -s settings.xml -DgroupId=org.apache.zookeeper -DartifactId=zookeeper -Dversion=3.4.6.2.3.0.0-2557 -Dpackaging=pom +mvn install:install-file -Dfile=%{SOURCE15} -s settings.xml -DgroupId=org.apache.zookeeper -DartifactId=zookeeper -Dversion=3.4.6.2.3.0.0-2557 -Dpackaging=jar +mvn install:install-file -Dfile=%{SOURCE16} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0-linux-x64 -Dpackaging=tar.gz +mvn install:install-file -Dfile=%{SOURCE17} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=yarn -Dversion=1.1.0 -Dpackaging=tar.gz %install mkdir -p %{buildroot}/opt/ambari sysVer="aarch64" if [ "$(uname -m)" = ${sysVer} ]; then - cp %{SOURCE18} /home/abuild/.m2/repository/com/github/eirslett/node/8.6.0/node-8.6.0-linux-arm64.tar.gz + mvn install:install-file -Dfile=%{SOURCE18} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0-linux-arm64 -Dpackaging=tar.gz fi mvn -B clean install package rpm:rpm -s settings.xml -DskipTests -Dmaven.test.skip=true -Drat.skip=true cp -rf ./ambari-server/target/rpm/ambari-server/RPMS/x86_64 %{buildroot}/opt/ambari/ambari-server @@ -105,5 +95,9 @@ cp -rf ./ambari-agent/target/rpm/ambari-agent/RPMS/x86_64 %{buildroot}/opt/ambar /opt %changelog +* Thu Jun 01 2023 iamphenix +- Enable fetch source code before building +- Use maven home directory keep java POM and jar files + * Wed Jul 13 2022 jhu <2416510131@qq.com> - 2.7.6-1 -- Init package \ No newline at end of file +- Init package -- Gitee From 87eb591a5b26d79ed6aeb6807d25c799b75d3f2f Mon Sep 17 00:00:00 2001 From: Huang Shi Lin Date: Thu, 1 Jun 2023 20:57:21 +0800 Subject: [PATCH 2/5] fix build error --- ambari.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ambari.spec b/ambari.spec index b85db19..260a64c 100644 --- a/ambari.spec +++ b/ambari.spec @@ -62,8 +62,6 @@ cp %{SOURCE1} ./settings.xml mkdir -p /tmp/npm_config_tmp/phantomjs/ mkdir -p ~/rpmbuild/BUILD/apache-ambari-2.7.6/ambari-infra/ambari-infra-solr-client/target/migrate/ mkdir -p /tmp/logsearch_npm_config_tmp/phantomjs/ -mvn install:install-file -Dfile=%{SOURCE2} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0-linux-arm64 -Dpackaging=tar.gz -mvn install:install-file -Dfile=%{SOURCE3} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0-linux-x64 -Dpackaging=tar.gz mvn install:install-file -Dfile=%{SOURCE4} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=yarn -Dversion=0.23.2 -Dpackaging=tar.gz cp %{SOURCE5} /tmp/npm_config_tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 cp %{SOURCE5} /tmp/logsearch_npm_config_tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 @@ -77,7 +75,6 @@ mvn install:install-file -Dfile=%{SOURCE12} -s settings.xml -DgroupId=org.apache mvn install:install-file -Dfile=%{SOURCE13} -s settings.xml -DgroupId=org.apache.hadoop -DartifactId=hadoop-main -Dversion=2.7.1.2.3.0.0-2557 -Dpackaging=pom mvn install:install-file -Dfile=%{SOURCE14} -s settings.xml -DgroupId=org.apache.zookeeper -DartifactId=zookeeper -Dversion=3.4.6.2.3.0.0-2557 -Dpackaging=pom mvn install:install-file -Dfile=%{SOURCE15} -s settings.xml -DgroupId=org.apache.zookeeper -DartifactId=zookeeper -Dversion=3.4.6.2.3.0.0-2557 -Dpackaging=jar -mvn install:install-file -Dfile=%{SOURCE16} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0-linux-x64 -Dpackaging=tar.gz mvn install:install-file -Dfile=%{SOURCE17} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=yarn -Dversion=1.1.0 -Dpackaging=tar.gz %install @@ -85,7 +82,11 @@ mkdir -p %{buildroot}/opt/ambari sysVer="aarch64" if [ "$(uname -m)" = ${sysVer} ]; then - mvn install:install-file -Dfile=%{SOURCE18} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0-linux-arm64 -Dpackaging=tar.gz + mvn install:install-file -Dfile=%{SOURCE18} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz + mvn install:install-file -Dfile=%{SOURCE2} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz +else + mvn install:install-file -Dfile=%{SOURCE3} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz + mvn install:install-file -Dfile=%{SOURCE16} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz fi mvn -B clean install package rpm:rpm -s settings.xml -DskipTests -Dmaven.test.skip=true -Drat.skip=true cp -rf ./ambari-server/target/rpm/ambari-server/RPMS/x86_64 %{buildroot}/opt/ambari/ambari-server -- Gitee From 8d84f5f731690a4ea03a0aa4a0fb1a05a7e4538c Mon Sep 17 00:00:00 2001 From: Huang Shi Lin Date: Thu, 1 Jun 2023 23:22:25 +0800 Subject: [PATCH 3/5] fix changelog error --- ambari.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari.spec b/ambari.spec index 260a64c..3fa1179 100644 --- a/ambari.spec +++ b/ambari.spec @@ -96,7 +96,7 @@ cp -rf ./ambari-agent/target/rpm/ambari-agent/RPMS/x86_64 %{buildroot}/opt/ambar /opt %changelog -* Thu Jun 01 2023 iamphenix +* Thu Jun 01 2023 Huang Shi Lin - Enable fetch source code before building - Use maven home directory keep java POM and jar files -- Gitee From e82db912098f4f19035aa24f9b0c44362f9084e3 Mon Sep 17 00:00:00 2001 From: Huang Shi Lin Date: Thu, 1 Jun 2023 23:31:52 +0800 Subject: [PATCH 4/5] fix build number --- ambari.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ambari.spec b/ambari.spec index 3fa1179..8236d8b 100644 --- a/ambari.spec +++ b/ambari.spec @@ -1,5 +1,4 @@ %define __jar_repack %{nil} -%define _disable_source_fetch 0 %global debug_package %{nil} %global compile_for_local 0 @@ -10,7 +9,7 @@ Name: ambari Version: 2.7.6 -Release: 1 +Release: 2 Summary: Ambari Main License: Apache 2.0 Vendor: Apache Software Foundation @@ -96,8 +95,7 @@ cp -rf ./ambari-agent/target/rpm/ambari-agent/RPMS/x86_64 %{buildroot}/opt/ambar /opt %changelog -* Thu Jun 01 2023 Huang Shi Lin -- Enable fetch source code before building +* Thu Jun 01 2023 Huang Shi Lin 2.7.6-2 - Use maven home directory keep java POM and jar files * Wed Jul 13 2022 jhu <2416510131@qq.com> - 2.7.6-1 -- Gitee From a5cb4cef64a2b78388f17f038651635aa8e86b05 Mon Sep 17 00:00:00 2001 From: Huang Shi Lin Date: Fri, 2 Jun 2023 00:01:27 +0800 Subject: [PATCH 5/5] fix build error --- ambari.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ambari.spec b/ambari.spec index 8236d8b..35a7adc 100644 --- a/ambari.spec +++ b/ambari.spec @@ -81,11 +81,11 @@ mkdir -p %{buildroot}/opt/ambari sysVer="aarch64" if [ "$(uname -m)" = ${sysVer} ]; then - mvn install:install-file -Dfile=%{SOURCE18} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz - mvn install:install-file -Dfile=%{SOURCE2} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz + mvn install:install-file -Dfile=%{SOURCE18} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz -Dclassifier=linux-arm64 + mvn install:install-file -Dfile=%{SOURCE2} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz -Dclassifier=linux-arm64 else - mvn install:install-file -Dfile=%{SOURCE3} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz - mvn install:install-file -Dfile=%{SOURCE16} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz + mvn install:install-file -Dfile=%{SOURCE3} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=4.5.0 -Dpackaging=tar.gz -Dclassifier=linux-x64 + mvn install:install-file -Dfile=%{SOURCE16} -s settings.xml -DgroupId=com.github.eirslett -DartifactId=node -Dversion=8.6.0 -Dpackaging=tar.gz -Dclassifier=linux-x64 fi mvn -B clean install package rpm:rpm -s settings.xml -DskipTests -Dmaven.test.skip=true -Drat.skip=true cp -rf ./ambari-server/target/rpm/ambari-server/RPMS/x86_64 %{buildroot}/opt/ambari/ambari-server -- Gitee