!71 修复 spec 中 abuild 硬编码问题,及 hadoop-yarn 应区分架构

From: @jiachao2130 
Reviewed-by: @wenwj0 
Signed-off-by: @wenwj0
This commit is contained in:
jiachao2130 2023-08-31 08:31:07 +00:00 committed by openeuler-ci-bot
parent b8b7d2456c
commit 4ce13bc506
2 changed files with 16 additions and 12 deletions

View File

@ -11,7 +11,7 @@
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
Name: hadoop Name: hadoop
Version: 3.3.4 Version: 3.3.4
Release: 3 Release: 4
Summary: A software platform for processing vast amounts of data Summary: A software platform for processing vast amounts of data
# The BSD license file is missing # The BSD license file is missing
# https://issues.apache.org/jira/browse/HADOOP-9849 # https://issues.apache.org/jira/browse/HADOOP-9849
@ -209,7 +209,6 @@ offering local computation and storage.
This package contains test related resources for Apache Hadoop. This package contains test related resources for Apache Hadoop.
%package yarn %package yarn
BuildArch: noarch
Summary: Apache Hadoop YARN Summary: Apache Hadoop YARN
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-mapreduce = %{version}-%{release} Requires: %{name}-mapreduce = %{version}-%{release}
@ -245,6 +244,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
%prep %prep
%autosetup -p1 -n %{name}-%{version}-src %autosetup -p1 -n %{name}-%{version}-src
cp %{SOURCE17} ./ cp %{SOURCE17} ./
sed -i "s,@HOME@,${HOME},g" settings.xml
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml
@ -252,17 +252,17 @@ mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchma
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml
mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml
mkdir -p /home/abuild/repository/com/github/eirslett/node/12.22.1/ mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/
cp %{SOURCE15} /home/abuild/repository/com/github/eirslett/node/12.22.1/ cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/
cp %{SOURCE16} /home/abuild/repository/com/github/eirslett/node/12.22.1/ cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/
mv /home/abuild/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz /home/abuild/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz mv ${HOME}/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz
mkdir -p /home/abuild/repository/com/github/eirslett/yarn/1.22.5/ mkdir -p ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
cp %{SOURCE14} /home/abuild/repository/com/github/eirslett/yarn/1.22.5/ cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
mv /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz mv ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
tar -xzvf /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C /home/abuild/repository/com/github/eirslett/yarn/1.22.5/ tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
npm config set registry https://repo.huaweicloud.com/repository/npm/ npm config set registry https://repo.huaweicloud.com/repository/npm/
npm cache clean -f npm cache clean -f
/home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy
@ -1132,6 +1132,10 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
%changelog %changelog
* Wed Aug 16 2023 Jia Chao <jiac13@chinaunicom.cn> - 3.3.4-4
- fix: use $HOME rather than /home/abuild, suit for all buildtools.
- fix: yarn have ELF bin, not noarch at all.
* Thu Jul 13 2023 sunyanan <sunyanan@xfusion.com> - 3.3.4-3 * Thu Jul 13 2023 sunyanan <sunyanan@xfusion.com> - 3.3.4-3
- lock triple-beam version to 1.3.0 - lock triple-beam version to 1.3.0

View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<localRepository>/home/abuild/repository/</localRepository> <localRepository>@HOME@/repository/</localRepository>
<pluginGroups> <pluginGroups>
</pluginGroups> </pluginGroups>
<proxies> <proxies>