diff --git a/02-Upgrade-os-maven-plugin-to-1.7.1.patch b/02-Upgrade-os-maven-plugin-to-1.7.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..e22f6f072263182ef248da40d343a3e75255f20d --- /dev/null +++ b/02-Upgrade-os-maven-plugin-to-1.7.1.patch @@ -0,0 +1,14 @@ +diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml +index 0b2f6f17..c402535f 100644 +--- a/hadoop-project/pom.xml ++++ b/hadoop-project/pom.xml +@@ -151,7 +151,7 @@ + + 3.5.1 + 1.10.0 +- 1.7.0 ++ 1.7.1 + + + 1.8 + diff --git a/03-Fix-build-on-riscv.patch b/03-Fix-build-on-riscv.patch new file mode 100644 index 0000000000000000000000000000000000000000..b908e0d273793862d356920b216995d01711f2f3 --- /dev/null +++ b/03-Fix-build-on-riscv.patch @@ -0,0 +1,23 @@ +diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h +index 000c4b91..70e94487 100644 +--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h ++++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h +@@ -99,7 +99,7 @@ inline void simple_memcpy(void * dest, const void * src, size_t len) { + inline uint32_t bswap(uint32_t val) { + #ifdef __aarch64__ + __asm__("rev %w[dst], %w[src]" : [dst]"=r"(val) : [src]"r"(val)); +-#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__) ++#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)||(__riscv) + return __builtin_bswap32(val); + #else + __asm__("bswap %0" : "=r" (val) : "0" (val)); +@@ -110,7 +110,7 @@ inline uint32_t bswap(uint32_t val) { + inline uint64_t bswap64(uint64_t val) { + #ifdef __aarch64__ + __asm__("rev %[dst], %[src]" : [dst]"=r"(val) : [src]"r"(val)); +-#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__) ++#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)||(__riscv) + return __builtin_bswap64(val); + #else + #ifdef __X64 + diff --git a/hadoop.spec b/hadoop.spec index 72a0ac67c971f888a4c5a8611d99a204b728e411..10499c99abf1c19559dee486f82ce76ddbd7d8a5 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.6 -Release: 2 +Release: 3 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -34,12 +34,15 @@ Source13: %{name}-yarn-site.xml Source14: yarn-v1.22.5.tar.gz Source15: node-12.22.1-linux-x64.tar.gz Source16: node-v12.22.1-linux-arm64.tar.gz -Source17: settings.xml +Source17: protoc-3.7.1-linux-riscv64.exe +Source18: protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe -Patch0: 01-lock-triple-beam-version-to-1.3.0.patch +Patch0: 01-lock-triple-beam-version-to-1.3.0.patch +Patch1: 02-Upgrade-os-maven-plugin-to-1.7.1.patch +Patch2: 03-Fix-build-on-riscv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel +BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2 BuildRequires: leveldbjni leveldb-java hawtjni-runtime gcc-c++ BuildRequires: npm chrpath @@ -255,27 +258,30 @@ 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 -mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.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 - -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/ +%ifarch riscv64 +mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/protoc +mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.7.1 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=%{SOURCE17} +mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dversion=1.26.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=%{SOURCE18} +%endif +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar +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 +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar +mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar + +mkdir -p ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE15} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE16} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +mv ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz +mkdir -p ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ +cp %{SOURCE14} ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ +mv ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz +tar -xzvf ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ npm config set registry https://repo.huaweicloud.com/repository/npm/ npm cache clean -f -${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 -${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true +${HOME}/.m2/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}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true %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 @@ -289,6 +295,9 @@ ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config %pom_disable_module hadoop-azure hadoop-tools %pom_disable_module hadoop-yarn-server-timelineservice-hbase-tests hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml +%ifarch riscv64 +%pom_disable_module hadoop-yarn-applications-catalog-webapp hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml +%endif # War files we don't want %mvn_package :%{name}-auth-examples __noinstall @@ -325,7 +334,12 @@ ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config %mvn_file :%{name}-common::tests: %{name}/%{name}-common %build -mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package -s settings.xml +%ifarch riscv64 +export MAVEN_OPTS="-Xms2048M -Xmx8000M" +function keepalive() { while true; do date; sleep 3600; done } +keepalive & +%endif +mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package %install # Copy all jar files except those generated by the build @@ -1145,6 +1159,11 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Sun May 12 2024 Dingli Zhang - 3.3.6-3 +- Fix build on riscv64 +- Upgrade os-maven-plugin to 1.7.1 +- Remove settings.xml and use ${HOME}/.m2/repository as maven repo + * Fri Dec 15 2023 xiexing - 3.3.6-2 - add conflicts to hadoop spec diff --git a/protoc-3.7.1-linux-riscv64.exe b/protoc-3.7.1-linux-riscv64.exe new file mode 100644 index 0000000000000000000000000000000000000000..1df6bd51c1dfc28a20b2db34b51fa464f3476336 Binary files /dev/null and b/protoc-3.7.1-linux-riscv64.exe differ diff --git a/protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe b/protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe new file mode 100644 index 0000000000000000000000000000000000000000..e162d4128a1d09c19bcee67fc4ac078265c16413 Binary files /dev/null and b/protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe differ diff --git a/settings.xml b/settings.xml deleted file mode 100644 index a41ffcd5d8b6b65eb24879aaa295a39f12ad8ab2..0000000000000000000000000000000000000000 --- a/settings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - @HOME@/repository/ - - - - - - - - - huaweicloud - * - https://repo.huaweicloud.com/repository/maven/ - - - - -