开源软件构建与测试

Changes of Revision 6

_service:tar_scm:hadoop-frontend-maven-plugin.spec Deleted

@@ -1,65 +0,0 @@
-%global _debuginfo_template %{nil}
-%global _debugsource_template %{nil}
-
-Name:                hadoop-frontend-maven-plugin
-version:             1.11.2
-Release:             1
-Summary:             A Maven plugin that downloads/installs Node and NPM locally, runs NPM install, Grunt, Gulp and/or Karma.
-License:             ASL 2.0
-URL:                 https://github.com/eirslett/frontend-maven-plugin
-BuildArch:           noarch
-Source0:             https://github.com/eirslett/frontend-maven-plugin/archive/refs/tags/frontend-plugins-%{version}.tar.gz
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-static
-BuildRequires:  maven maven-local
-
-Patch0: 1003-Add-RISC-V-support-for-frontend-maven-plugin.patch
-
-ExclusiveArch: riscv64
-
-%description
-This Maven plugin lets you install Node/NPM locally
-for your project, install dependencies with NPM,
-run Grunt tasks, and/or run Karma tests.
-
-%prep
-%setup -n frontend-maven-plugin-frontend-plugins-%{version}
-%patch0 -p1
-
-%build
-mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
-
-%install
-install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-plugins
-install -m 0755 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-plugins/pom.xml
-echo %{_mavenpomdir}/%{name}-%{version}/frontend-plugins/pom.xml >> .mfiles
-
-## frontend-maven-plugin
-install -d -m 0755 %{buildroot}%{_javadir}/%{name}-%{version}/frontend-maven-plugin
-install -m 0755 frontend-maven-plugin/target/frontend-maven-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}/frontend-maven-plugin/frontend-maven-plugin-%{version}.jar
-echo %{_javadir}/%{name}-%{version}/frontend-maven-plugin/frontend-maven-plugin-%{version}.jar >> .mfiles
-
-install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-maven-plugin
-install -m 0755 frontend-maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-maven-plugin/pom.xml
-echo %{_mavenpomdir}/%{name}-%{version}/frontend-maven-plugin/pom.xml >> .mfiles
-
-## frontend-plugin-core
-install -d -m 0755 %{buildroot}%{_javadir}/%{name}-%{version}/frontend-plugin-core
-install -m 0755 frontend-plugin-core/target/frontend-plugin-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}/frontend-plugin-core/frontend-plugin-core-%{version}.jar
-echo %{_javadir}/%{name}-%{version}/frontend-plugin-core/frontend-plugin-core-%{version}.jar >> .mfiles
-
-install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-plugin-core
-install -m 0755 frontend-plugin-core/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}/frontend-plugin-core/pom.xml
-echo %{_mavenpomdir}/%{name}-%{version}/frontend-plugin-core/pom.xml >> .mfiles
-
-%files -f .mfiles
-
-%changelog
-* Tue Jun 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.11.2-1
-- init package

_service:tar_scm:hadoop-protoc-gen-grpc-java.spec Deleted

@@ -1,74 +0,0 @@
-%global _debuginfo_template %{nil}
-%global _debugsource_template %{nil}
-%global protobuf_version 3.11.0
-%global gradle_version 5.6.2
-
-Name:     hadoop-protoc-gen-grpc-java
-Version:  1.26.0
-Release:  1
-Summary:  Protobuf gRPC compiler for Java
-License:  MIT
-URL:      https://github.com/grpc/grpc-java
-Source0:  https://github.com/grpc/grpc-java/archive/refs/tags/v%{version}.tar.gz
-Source1:  https://services.gradle.org/distributions/gradle-%{gradle_version}-bin.zip
-Source2:  https://github.com/google/protobuf/releases/download/v%{protobuf_version}/protobuf-all-%{protobuf_version}.tar.gz
-Source3:  https://github.com/protocolbuffers/protobuf/archive/refs/tags/v%{protobuf_version}.tar.gz
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-static
-BuildRequires:  java-1.8.0-openjdk-devel maven maven-local
-
-Patch0: 1001-Added-support-for-building-the-riscv64-protoc-gen-gr.patch
-Patch1: 1002-Added-support-for-building-the-riscv64-protoc-binari.patch
-
-ExclusiveArch: riscv64
-
-%description
-Protobuf gRPC compiler for Java.
-
-%prep
-%setup -q -n grpc-java-%{version}
-%patch0 -p1
-
-sed -i "s,@HOME@,${HOME},g" build.gradle
-sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties
-
-# prepare gradle and protobuf for build
-mkdir -p %{_tmppath}/source
-cp %{SOURCE1} %{_tmppath}/source
-tar xzf %{SOURCE2} -C %{_tmppath}/source
-mkdir -p %{_tmppath}/source/protoc-gen-tmp
-tar xzf %{SOURCE3} -C %{_tmppath}/source/protoc-gen-tmp
-
-# prepare protoc.exe for build
-pushd %{_tmppath}/source/protoc-gen-tmp/protobuf-%{protobuf_version}
-%patch1 -p1
-./autogen.sh
-%ifarch riscv64
-./protoc-artifacts/build-protoc.sh linux riscv64 protoc
-mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=%{protobuf_version} -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=./protoc-artifacts/target/linux/riscv64/protoc.exe
-%endif
-popd
-
-%build
-%ifarch riscv64
-SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh
-%endif
-
-%install
-install -d -m 0755 %{buildroot}%{_bindir}/%{name}-%{version}
-%ifarch riscv64
-install -m 0755 mvn-artifacts/io/grpc/protoc-gen-grpc-java/%{version}/protoc-gen-grpc-java-%{version}-linux-riscv64.exe %{buildroot}%{_bindir}/%{name}-%{version}/protoc-gen-grpc-java-%{version}-linux-riscv64.exe
-echo %{_bindir}/%{name}-%{version}/protoc-gen-grpc-java-%{version}-linux-riscv64.exe >> .mfiles
-%endif
-
-%files -f .mfiles
-
-%changelog
-* Thu May 30 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1.26.0-1
-- init package
\ No newline at end of file

_service:tar_scm:hadoop-protoc.spec Deleted

@@ -1,60 +0,0 @@
-%global _debuginfo_template %{nil}
-%global _debugsource_template %{nil}
-
-Summary:        Protocol Buffers - Google's data interchange format
-Name:           hadoop-protoc
-Version:        3.7.1
-Release:        1%{?dist}
-License:        BSD
-URL:            https://github.com/protocolbuffers/protobuf
-Source:         https://github.com/protocolbuffers/protobuf/archive/refs/tags/v%{version}%{?rcver}.tar.gz
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-static
-
-Patch0: 1000-Added-support-for-building-the-riscv64-protoc-binari.patch
-
-ExclusiveArch: riscv64
-
-%description
-Protocol Buffers are a way of encoding structured data in an efficient
-yet extensible format. Google uses Protocol Buffers for almost all of
-its internal RPC protocols and file formats.
-
-Protocol buffers are a flexible, efficient, automated mechanism for
-serializing structured data – think XML, but smaller, faster, and
-simpler. You define how you want your data to be structured once, then
-you can use special generated source code to easily write and read
-your structured data to and from a variety of data streams and using a
-variety of languages. You can even update your data structure without
-breaking deployed programs that are compiled against the "old" format.
-
-%prep
-%setup -q -n protobuf-%{version}%{?rcver}
-%patch0 -p1
-
-%build
-./autogen.sh
-pushd protoc-artifacts
-%ifarch riscv64
-./build-protoc.sh linux riscv64 protoc
-%endif
-popd
-
-%install
-install -d -m 0755 %{buildroot}%{_bindir}/%{name}-%{version}%{?rcver}
-%ifarch riscv64
-install -m 0755 protoc-artifacts/target/linux/riscv64/protoc.exe %{buildroot}%{_bindir}/%{name}-%{version}%{?rcver}/protoc.exe
-%endif
-echo %{_bindir}/%{name}-%{version}%{?rcver}/protoc.exe >> .mfiles
-
-%files -f .mfiles
-
-%changelog
-* Thu May 30 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.7.1-1
-- init package
\ No newline at end of file

_service:tar_scm:hadoop.spec Changed

@@ -34,24 +34,34 @@
 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: https://unofficial-builds.nodejs.org/download/release/v18.0.0/node-v18.0.0-linux-riscv64.tar.gz
+Source17: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.7.1.tar.gz
+Source18: https://github.com/grpc/grpc-java/archive/refs/tags/v1.26.0.tar.gz
+Source19: https://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+Source20: https://github.com/google/protobuf/releases/download/v3.11.0/protobuf-all-3.11.0.tar.gz
+Source21: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.11.0.tar.gz
 
 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
 
+%ifarch riscv64
+Patch1000: 1000-Added-support-for-building-the-riscv64-protoc-binari.patch
+Patch1001: 1001-Added-support-for-building-the-riscv64-protoc-gen-gr.patch
+Patch1002: 1002-Added-support-for-building-the-riscv64-protoc-binari.patch
+%endif
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 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
 %ifarch riscv64
-BuildRequires: hadoop-protoc hadoop-protoc-gen-grpc-java hadoop-frontend-maven-plugin
+BuildRequires: autoconf automake libtool pkgconfig zlib-devel libstdc++-static
 %endif
 
 Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper
-BuildRequires: java-11-openjdk-devel
-Requires: java-11-openjdk
+BuildRequires:       java-11-openjdk-devel
+Requires:            java-11-openjdk
 
 %description
 Apache Hadoop is a framework that allows for the distributed processing of
@@ -262,17 +272,44 @@
 This package contains files needed to run Apache Hadoop YARN in secure mode.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}-src
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 %ifarch riscv64
+mkdir -p ${HOME}/%{name}-prep_dir
+# protoc
+tar -mxf %{SOURCE17} -C ${HOME}/%{name}-prep_dir
+pushd ${HOME}/%{name}-prep_dir/protobuf-3.7.1
+%patch1000 -p1
+./autogen.sh
+./protoc-artifacts/build-protoc.sh linux riscv64 protoc
+mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.7.1 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe
+popd
+# prepare gradle and protobuf for build protoc-gen-grpc-java
+mkdir -p %{_tmppath}/source
+cp %{SOURCE19} %{_tmppath}/source
+tar xzf %{SOURCE20} -C %{_tmppath}/source
+tar -mxf %{SOURCE21} -C ${HOME}/%{name}-prep_dir
+pushd ${HOME}/%{name}-prep_dir/protobuf-3.11.0
+%patch1002 -p1
+./autogen.sh
+./protoc-artifacts/build-protoc.sh linux riscv64 protoc
+mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.11.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe
+popd
+# protoc-gen-grpc-java
+tar -mxf %{SOURCE18} -C ${HOME}/%{name}-prep_dir
+pushd ${HOME}/%{name}-prep_dir/grpc-java-1.26.0
+%patch1001 -p1
+sed -i "s,@HOME@,${HOME},g" build.gradle
+sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties
+SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh
+mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dversion=1.26.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=mvn-artifacts/io/grpc/protoc-gen-grpc-java/1.26.0/protoc-gen-grpc-java-1.26.0-linux-riscv64.exe
+popd
 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=/usr/bin/%{name}-protoc-3.7.1/protoc.exe
-mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dversion=1.26.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/%{name}-protoc-gen-grpc-java-1.26.0/protoc-gen-grpc-java-1.26.0-linux-riscv64.exe
-# frontend-plugin-core
-mkdir -p ${HOME}/.m2/repository/com/github/eirslett/frontend-plugins/1.11.2
-cp /usr/share/maven-poms/%{name}-frontend-maven-plugin-1.11.2/frontend-plugins/pom.xml ${HOME}/.m2/repository/com/github/eirslett/frontend-plugins/1.11.2
-mv ${HOME}/.m2/repository/com/github/eirslett/frontend-plugins/1.11.2/pom.xml ${HOME}/.m2/repository/com/github/eirslett/frontend-plugins/1.11.2/frontend-plugins-1.11.2.pom
-mvn install:install-file -DpomFile=/usr/share/maven-poms/%{name}-frontend-maven-plugin-1.11.2/frontend-maven-plugin/pom.xml -Dfile=/usr/share/java/%{name}-frontend-maven-plugin-1.11.2/frontend-maven-plugin/frontend-maven-plugin-1.11.2.jar
-mvn install:install-file -DpomFile=/usr/share/maven-poms/%{name}-frontend-maven-plugin-1.11.2/frontend-plugin-core/pom.xml -Dfile=/usr/share/java/%{name}-frontend-maven-plugin-1.11.2/frontend-plugin-core/frontend-plugin-core-1.11.2.jar
+%setup -qn %{name}-%{version}-src
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%else
+%autosetup -p1 -n %{name}-%{version}-src
 %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
@@ -285,15 +322,6 @@
 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
-
-# Use nodejs-18 for riscv64
-%ifarch riscv64
-%pom_xpath_set pom:properties/pom:nodejs.version v18.0.0 hadoop-project
-mkdir -p ${HOME}/.m2/repository/com/github/eirslett/node/18.0.0/
-cp %{SOURCE17} ${HOME}/.m2/repository/com/github/eirslett/node/18.0.0/
-mv ${HOME}/.m2/repository/com/github/eirslett/node/18.0.0/node-v18.0.0-linux-riscv64.tar.gz ${HOME}/.m2/repository/com/github/eirslett/node/18.0.0/node-18.0.0-linux-riscv64.tar.gz
-%endif
-
 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
@@ -315,6 +343,10 @@
 %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
 %mvn_package :%{name}-hdfs-httpfs __noinstall
@@ -1171,12 +1203,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
 
 %changelog
-* Mon Jun 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-4
-- Remove protoc and protoc-gen-grpc-java riscv64 binary
-- Add hadoop-protoc spec for riscv64 because of no artifact on Maven Central Repository
-- Add hadoop-protoc-gen-grpc-java spec for riscv64 because of no artifact on Maven Central Repository
-- Add hadoop-frontend-maven-plugin spec for riscv64 because of no artifact on Maven Central Repository
-- Use nodejs-18 to enabe hadoop-yarn-applications-catalog-webapp for riscv64
+* Tue Jun 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-4
+- Remove riscv64 prebuilded files
+- Build protoc and protoc-gen-grpc-java in prep state for riscv64
 
 * Sun May 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-3
 - Fix build on riscv64

_service:tar_scm:1003-Add-RISC-V-support-for-frontend-maven-plugin.patch Deleted

@@ -1,31 +0,0 @@
-From c7bc24fddd1780b46cf00eb81c8910d060d5fea3 Mon Sep 17 00:00:00 2001
-From: Dingli Zhang <dingli@iscas.ac.cn>
-Date: Mon, 10 Jun 2024 23:00:28 +0800
-Subject: PATCH Add RISC-V support for frontend-maven-plugin
-
-
-diff --git a/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java b/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java
-index 68d38e4..178a809 100644
---- a/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java
-+++ b/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/Platform.java
-@@ -2,7 +2,7 @@ package com.github.eirslett.maven.plugins.frontend.lib;
- 
- import java.io.File;
- 
--enum Architecture { x86, x64, ppc64le, s390x, arm64, armv7l, ppc, ppc64;
-+enum Architecture { x86, x64, ppc64le, s390x, arm64, armv7l, ppc, ppc64, riscv64;
-     public static Architecture guess(){
-         String arch = System.getProperty("os.arch");
-         String version = System.getProperty("os.version");
-@@ -19,6 +19,8 @@ enum Architecture { x86, x64, ppc64le, s390x, arm64, armv7l, ppc, ppc64;
-             return ppc64;
-         } else if (arch.equals("ppc")) {
-             return ppc;
-+        } else if (arch.equals("riscv64")) {
-+                return riscv64;
-         } else {
-             return arch.contains("64") ? x64 : x86;
-         }
--- 
-2.41.0
-

_service Changed

_service:tar_scm:_multibuild Changed

_service:tar_scm:frontend-plugins-1.11.2.tar.gz Deleted

_service:tar_scm:node-v18.0.0-linux-riscv64.tar.gz Deleted