开源软件构建与测试

Changes of Revision 3

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

@@ -0,0 +1,65 @@
+%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 Added

@@ -0,0 +1,74 @@
+%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 Added

@@ -0,0 +1,60 @@
+%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

@@ -11,7 +11,7 @@
 %define _binaries_in_noarch_packages_terminate_build 0
 Name:   hadoop
 Version: 3.3.6
-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
@@ -34,8 +34,7 @@
 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: protoc-3.7.1-linux-riscv64.exe
-Source18: protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe
+Source17: https://unofficial-builds.nodejs.org/download/release/v18.0.0/node-v18.0.0-linux-riscv64.tar.gz
 
 Patch0: 01-lock-triple-beam-version-to-1.3.0.patch
 Patch1: 02-Upgrade-os-maven-plugin-to-1.7.1.patch
@@ -46,7 +45,13 @@
 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
+%endif
+
 Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper
+BuildRequires: java-11-openjdk-devel
+Requires: java-11-openjdk
 
 %description
 Apache Hadoop is a framework that allows for the distributed processing of
@@ -260,8 +265,14 @@
 %autosetup -p1 -n %{name}-%{version}-src
 %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}
+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
 %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
@@ -274,6 +285,15 @@
 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 18.0.0 hadoop-project
+mkdir -p ${HOME}/.m2/repository/com/github/eirslett/node/18.0.0/
+cp %{SOURCE19} ${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
@@ -295,10 +315,6 @@
 %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
@@ -334,11 +350,7 @@
 %mvn_file :%{name}-common::tests: %{name}/%{name}-common
 
 %build
-%ifarch riscv64
-export MAVEN_OPTS="-Xms2048M -Xmx8000M"
-function keepalive() { while true; do date; sleep 3600; done }
-keepalive &
-%endif
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 mvn clean  -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package
 
 %install
@@ -1159,6 +1171,13 @@
 %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
+
 * Sun May 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-3
 - Fix build on riscv64
 - Upgrade os-maven-plugin to 1.7.1

_service:tar_scm:1000-Added-support-for-building-the-riscv64-protoc-binari.patch Added

@@ -0,0 +1,56 @@
+From d2e38e91ad8577126c180ca9d7587c90464f5062 Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Mon, 29 Apr 2024 13:42:13 +0800
+Subject: PATCH Added support for building the riscv64 protoc binaries with
+ Kokoro
+
+
+diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh
+index f0cde494f..c92941c47 100755
+--- a/kokoro/release/protoc/linux/build.sh
++++ b/kokoro/release/protoc/linux/build.sh
+@@ -21,6 +21,9 @@ protoc-artifacts/build-protoc.sh linux aarch_64 protoc
+ sudo apt install -y g++-powerpc64le-linux-gnu
+ protoc-artifacts/build-protoc.sh linux ppcle_64 protoc
+ 
++sudo apt install -y g++-riscv64-linux-gnu
++protoc-artifacts/build-protoc.sh linux riscv64 protoc
++
+ # Use docker image to build linux artifacts.
+ DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ")
+ docker pull $DOCKER_IMAGE_NAME
+diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh
+index 54b75a6d8..cb024d6bd 100755
+--- a/protoc-artifacts/build-protoc.sh
++++ b/protoc-artifacts/build-protoc.sh
+@@ -93,6 +93,8 @@ checkArch ()
+         assertEq $format "elf64-x86-64" $LINENO
+       elif  "$ARCH" == aarch_64 ; then
+         assertEq $format "elf64-little" $LINENO
++      elif  "$ARCH" == riscv64 ; then
++        assertEq $format "elf64-littleriscv" $LINENO
+       elif  "$ARCH" == ppcle_64 ; then
+ 	if  $host_machine == ppc64le ;then
+ 	  assertEq $format "elf64-powerpcle" $LINENO
+@@ -151,6 +153,9 @@ checkDependencies ()
+     elif  "$ARCH" == aarch_64 ; then
+       dump_cmd='objdump -p '"$1"' | grep NEEDED'
+       white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
++    elif  "$ARCH" == riscv64 ; then
++      dump_cmd='objdump -p '"$1"' | grep NEEDED'
++      white_list="libz\.so\.1\|libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1"
+     fi
+   elif  "$OS" == osx ; then
+     dump_cmd='otool -L '"$1"' | fgrep dylib'
+@@ -215,6 +220,8 @@ elif  "$(uname)" == Linux* ; then
+     elif  "$ARCH" == ppcle_64 ; then
+       CXXFLAGS="$CXXFLAGS -m64"
+       CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu"
++    elif  "$ARCH" == riscv64 ; then
++      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=riscv64-linux-gnu"
+     else
+       fail "Unsupported arch: $ARCH"
+     fi
+-- 
+2.41.0
+

_service:tar_scm:1001-Added-support-for-building-the-riscv64-protoc-gen-gr.patch Added

@@ -0,0 +1,175 @@
+From 78df1e23afdb5b4f53004a807f9ffa9ac13be2e1 Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Mon, 29 Apr 2024 16:52:34 +0800
+Subject: PATCH Added support for building the riscv64 protoc-gen-grpc-java
+ binaries with Kokoro
+
+
+diff --git a/build.gradle b/build.gradle
+index db7be15f4..7c796341f 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -20,6 +20,8 @@ subprojects {
+     version = "1.26.0" // CURRENT_GRPC_VERSION
+ 
+     repositories {
++        maven { url 'file://@HOME@/.m2/repository'}
++        maven { url "https://mirrors.huaweicloud.com/repository/maven/"}
+         maven { // The google mirror is less flaky than mavenCentral()
+             url "https://maven-central.storage-download.googleapis.com/repos/central/data/" }
+         mavenCentral()
+diff --git a/buildscripts/kokoro/linux_artifacts.sh b/buildscripts/kokoro/linux_artifacts.sh
+index cdf360762..b3c055e9e 100755
+--- a/buildscripts/kokoro/linux_artifacts.sh
++++ b/buildscripts/kokoro/linux_artifacts.sh
+@@ -37,3 +37,7 @@ cp -r "$LOCAL_MVN_TEMP"/* "$MVN_ARTIFACT_DIR"/
+ # for aarch64 platform
+ sudo apt-get install -y g++-aarch64-linux-gnu
+ SKIP_TESTS=true ARCH=aarch_64 "$GRPC_JAVA_DIR"/buildscripts/kokoro/unix.sh
++
++# for riscv64 platform
++sudo apt-get install -y g++-riscv64-linux-gnu
++SKIP_TESTS=true ARCH=riscv64 "$GRPC_JAVA_DIR"/buildscripts/kokoro/unix.sh
+diff --git a/buildscripts/kokoro/unix.sh b/buildscripts/kokoro/unix.sh
+index c64bc7e22..48e36ce22 100755
+--- a/buildscripts/kokoro/unix.sh
++++ b/buildscripts/kokoro/unix.sh
+@@ -9,6 +9,8 @@
+ #  ARCH=x86_32 ./buildscripts/kokoro/unix.sh
+ # For aarch64 arch:
+ #  ARCH=aarch_64 ./buildscripts/kokoro/unix.sh
++# For riscv64 arch:
++#  ARCH=riscv64 ./buildscripts/kokoro/unix.sh
+ 
+ # This script assumes `set -e`. Removing it may lead to undefined behavior.
+ set -exu -o pipefail
+@@ -36,7 +38,7 @@ GRADLE_FLAGS+=" -PtargetArch=$ARCH"
+ GRADLE_FLAGS+=" -Pcheckstyle.ignoreFailures=false"
+ GRADLE_FLAGS+=" -PfailOnWarnings=true"
+ GRADLE_FLAGS+=" -PerrorProne=true"
+-GRADLE_FLAGS+=" -Dorg.gradle.parallel=true"
++GRADLE_FLAGS+=" -Dorg.gradle.parallel=false"
+ export GRADLE_OPTS="-Xmx512m"
+ 
+ # Make protobuf discoverable by :grpc-compiler
+@@ -72,7 +74,7 @@ fi
+ LOCAL_MVN_TEMP=$(mktemp -d)
+ # Note that this disables parallel=true from GRADLE_FLAGS
+ if  -z "${ALL_ARTIFACTS:-}" ; then
+-  if  $ARCH == "aarch_64" ; then
++  if  $ARCH == "aarch_64" || $ARCH == "riscv64" ; then
+     GRADLE_FLAGS+=" -x grpc-compiler:generateTestProto -x grpc-compiler:generateTestLiteProto"
+     GRADLE_FLAGS+=" -x grpc-compiler:testGolden -x grpc-compiler:testLiteGolden"
+     GRADLE_FLAGS+=" -x grpc-compiler:testDeprecatedGolden -x grpc-compiler:testDeprecatedLiteGolden"
+diff --git a/buildscripts/kokoro/upload_artifacts.sh b/buildscripts/kokoro/upload_artifacts.sh
+index c3c97444d..215573e5e 100644
+--- a/buildscripts/kokoro/upload_artifacts.sh
++++ b/buildscripts/kokoro/upload_artifacts.sh
+@@ -30,6 +30,9 @@ LOCAL_MVN_ARTIFACTS="$KOKORO_GFILE_DIR"/github/grpc-java/mvn-artifacts/
+ # for linux aarch64 platform
+  "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-linux-aarch_64.exe' | wc -l)" != '0' 
+ 
++# for linux riscv64 platform
++ "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-linux-riscv64.exe' | wc -l)" != '0' 
++
+ # from macos job:
+  "$(find "$LOCAL_MVN_ARTIFACTS" -type f -iname 'protoc-gen-grpc-java-*-osx-x86_64.exe' | wc -l)" != '0' 
+ 
+diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh
+index 92ef9d7f7..9b5441d5b 100755
+--- a/buildscripts/make_dependencies.sh
++++ b/buildscripts/make_dependencies.sh
+@@ -7,8 +7,8 @@ PROTOBUF_VERSION=3.11.0
+ 
+ # ARCH is x86_64 bit unless otherwise specified.
+ ARCH="${ARCH:-x86_64}"
+-DOWNLOAD_DIR=/tmp/source
+-INSTALL_DIR="/tmp/protobuf-cache/$PROTOBUF_VERSION/$(uname -s)-$ARCH"
++DOWNLOAD_DIR=/var/tmp/source
++INSTALL_DIR="/var/tmp/protobuf-cache/$PROTOBUF_VERSION/$(uname -s)-$ARCH"
+ mkdir -p $DOWNLOAD_DIR
+ 
+ # Start with a sane default
+@@ -36,6 +36,8 @@ else
+       --prefix="$INSTALL_DIR"
+   elif  "$ARCH" == aarch* ; then
+     ./configure --disable-shared --host=aarch64-linux-gnu --prefix="$INSTALL_DIR"
++  elif  "$ARCH" == riscv* ; then
++    ./configure --disable-shared --host=riscv64-linux-gnu --prefix="$INSTALL_DIR"
+   fi
+   # the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first
+   make clean
+diff --git a/compiler/build.gradle b/compiler/build.gradle
+index 098f48c30..932252a01 100644
+--- a/compiler/build.gradle
++++ b/compiler/build.gradle
+@@ -55,6 +55,7 @@ model {
+                 cppCompiler.executable = 'aarch64-linux-gnu-g++'
+                 linker.executable = 'aarch64-linux-gnu-g++'
+             }
++            target("riscv64")
+             target("s390_64")
+         }
+         clang(Clang) {
+@@ -66,6 +67,7 @@ model {
+         x86_64 { architecture "x86_64" }
+         ppcle_64 { architecture "ppcle_64" }
+         aarch_64 { architecture "aarch_64" }
++        riscv64 { architecture "riscv64" }
+         s390_64 { architecture "s390_64" }
+     }
+ 
+@@ -76,6 +78,7 @@ model {
+                 'x86_64',
+                 'ppcle_64',
+                 'aarch_64',
++                'riscv64',
+                 's390_64'
+             ) {
+                 // If arch is not within the defined platforms, we do not specify the
+diff --git a/compiler/check-artifact.sh b/compiler/check-artifact.sh
+index 13ae89c74..e48ec227d 100755
+--- a/compiler/check-artifact.sh
++++ b/compiler/check-artifact.sh
+@@ -55,12 +55,15 @@ checkArch ()
+     format="$(objdump -f "$1" | grep -o "file format .*$" | grep -o "^ *$")"
+     echo Format=$format
+     if  "$OS" == linux ; then
++      host_machine="$(uname -m)";
+       if  "$ARCH" == x86_32 ; then
+         assertEq "$format" "elf32-i386" $LINENO
+       elif  "$ARCH" == x86_64 ; then
+         assertEq "$format" "elf64-x86-64" $LINENO
+       elif  "$ARCH" == aarch_64 ; then
+         assertEq "$format" "elf64-little" $LINENO
++      elif  "$ARCH" == riscv64 ; then
++        assertEq $format "elf64-littleriscv" $LINENO
+       else
+         fail "Unsupported arch: $ARCH"
+       fi
+@@ -108,6 +111,9 @@ checkDependencies ()
+     elif  "$ARCH" == aarch_64 ; then
+       dump_cmd='aarch64-linux-gnu-objdump -x '"$1"' |grep "NEEDED"'
+       white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
++    elif  "$ARCH" == riscv64 ; then
++      dump_cmd='objdump -p '"$1"' | grep NEEDED'
++      white_list="libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1"
+     fi
+   elif  "$OS" == osx ; then
+     dump_cmd='otool -L '"$1"' | fgrep dylib'
+diff --git a/settings.gradle b/settings.gradle
+index 3f9a7e6ef..9f1c058ae 100644
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -2,7 +2,7 @@ pluginManagement {
+     plugins {
+         id "com.github.johnrengelman.shadow" version "2.0.4"
+         id "com.github.kt3k.coveralls" version "2.0.1"
+-        id "com.google.osdetector" version "1.4.0"
++        id "com.google.osdetector" version "1.7.2"
+         id "com.google.protobuf" version "0.8.8"
+         id "me.champeau.gradle.japicmp" version "0.2.5"
+         id "me.champeau.gradle.jmh" version "0.4.5"
+-- 
+2.41.0
+

_service:tar_scm:1002-Added-support-for-building-the-riscv64-protoc-binari.patch Added

@@ -0,0 +1,56 @@
+From bf28c79d4fcf26a517bf35020162770ab28374b8 Mon Sep 17 00:00:00 2001
+From: Dingli Zhang <dingli@iscas.ac.cn>
+Date: Fri, 31 May 2024 02:09:02 +0000
+Subject: PATCH Added support for building the riscv64 protoc binaries with
+ Kokoro
+
+
+diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh
+index d165a896b..cd84a3cdb 100755
+--- a/kokoro/release/protoc/linux/build.sh
++++ b/kokoro/release/protoc/linux/build.sh
+@@ -22,6 +22,9 @@ protoc-artifacts/build-protoc.sh linux aarch_64 protoc
+ sudo apt install -y g++-powerpc64le-linux-gnu
+ protoc-artifacts/build-protoc.sh linux ppcle_64 protoc
+ 
++sudo apt install -y g++-riscv64-linux-gnu
++protoc-artifacts/build-protoc.sh linux riscv64 protoc
++
+ sudo apt install -y g++-s390x-linux-gnu
+ protoc-artifacts/build-protoc.sh linux s390x_64 protoc
+ 
+diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh
+index 6ad2ea1a1..a9df70f2d 100755
+--- a/protoc-artifacts/build-protoc.sh
++++ b/protoc-artifacts/build-protoc.sh
+@@ -93,6 +93,8 @@ checkArch ()
+         assertEq $format "elf64-x86-64" $LINENO
+       elif  "$ARCH" == aarch_64 ; then
+         assertEq $format "elf64-little" $LINENO
++      elif  "$ARCH" == riscv64 ; then
++        assertEq $format "elf64-littleriscv" $LINENO
+       elif  "$ARCH" == s390x_64 ; then
+ 	if  $host_machine == s390x ;then
+ 	  assertEq $format "elf64-s390" $LINENO
+@@ -162,6 +164,9 @@ checkDependencies ()
+     elif  "$ARCH" == aarch_64 ; then
+       dump_cmd='objdump -p '"$1"' | grep NEEDED'
+       white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
++    elif  "$ARCH" == riscv64 ; then
++      dump_cmd='objdump -p '"$1"' | grep NEEDED'
++      white_list="libz\.so\.1\|libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1"
+     fi
+   elif  "$OS" == osx ; then
+     dump_cmd='otool -L '"$1"' | fgrep dylib'
+@@ -226,6 +231,8 @@ elif  "$(uname)" == Linux* ; then
+     elif  "$ARCH" == ppcle_64 ; then
+       CXXFLAGS="$CXXFLAGS -m64"
+       CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu"
++    elif  "$ARCH" == riscv64 ; then
++      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=riscv64-linux-gnu"
+     elif  "$ARCH" == s390x_64 ; then
+       CXXFLAGS="$CXXFLAGS -m64"
+       CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu"
+-- 
+2.41.0
+

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

@@ -0,0 +1,31 @@
+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 Added

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

_service:tar_scm:gradle-5.6.2-bin.zip Added

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

_service:tar_scm:protobuf-all-3.11.0.tar.gz Added

_service:tar_scm:protoc-3.7.1-linux-riscv64.exe Deleted

_service:tar_scm:protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe Deleted

_service:tar_scm:v1.26.0.tar.gz Added

_service:tar_scm:v3.11.0.tar.gz Added

_service:tar_scm:v3.7.1.tar.gz Added