diff --git a/hadoop.spec b/hadoop.spec index 536f0ec012d81512f2adcb113f7b93cb01c3cc32..11df1ec31728d1064db19475a700c1e5219987ab 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.4 -Release: 3 +Release: 4 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # 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. %package yarn -BuildArch: noarch Summary: Apache Hadoop YARN Requires: %{name}-common = %{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 %autosetup -p1 -n %{name}-%{version}-src 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 -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 @@ -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=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/ -cp %{SOURCE15} /home/abuild/repository/com/github/eirslett/node/12.22.1/ -cp %{SOURCE16} /home/abuild/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 -mkdir -p /home/abuild/repository/com/github/eirslett/yarn/1.22.5/ -cp %{SOURCE14} /home/abuild/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 -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/ +mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/ +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}/repository/com/github/eirslett/yarn/1.22.5/ +cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ +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}/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 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-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy @@ -1132,6 +1132,10 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Wed Aug 16 2023 Jia Chao - 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 - 3.3.4-3 - lock triple-beam version to 1.3.0 diff --git a/settings.xml b/settings.xml index 76054c86c6e097ad831f9e5635f698f7d97b82dc..a41ffcd5d8b6b65eb24879aaa295a39f12ad8ab2 100644 --- a/settings.xml +++ b/settings.xml @@ -3,7 +3,7 @@ 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"> - /home/abuild/repository/ + @HOME@/repository/