开源软件构建与测试

Changes of Revision 10

_service:tar_scm:hadoop.spec Changed

@@ -270,9 +270,18 @@
 This package contains files needed to run Apache Hadoop YARN in secure mode.
 
 %prep
-export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 %ifarch riscv64
 mkdir -p ${HOME}/%{name}-prep_dir
+# 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
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 # protoc
 tar -mxf %{SOURCE17} -C ${HOME}/%{name}-prep_dir
 pushd ${HOME}/%{name}-prep_dir/protobuf-3.7.1
@@ -292,15 +301,6 @@
 ./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
 %setup -qn %{name}-%{version}-src
 %patch0 -p1
@@ -380,6 +380,7 @@
 %mvn_file :%{name}-common::tests: %{name}/%{name}-common
 
 %build
+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