diff --git a/0001-1-Add-riscv64-to-golang_arches.patch b/0001-1-Add-riscv64-to-golang_arches.patch new file mode 100644 index 0000000000000000000000000000000000000000..e52a168703263d9a8f5135d7ad331a4c55f13093 --- /dev/null +++ b/0001-1-Add-riscv64-to-golang_arches.patch @@ -0,0 +1,27 @@ +From c1b9fdaa93bfe0b2c70be4a851500d15f891d2f8 Mon Sep 17 00:00:00 2001 +From: whoisxxx +Date: Sat, 28 Nov 2020 11:02:21 +0800 +Subject: [PATCH] !1 Add "riscv64" to golang_arches The golang version 1.14 has + support riscv64, so add "riscv64" to golang_arches to enable rpmbuild for + golang. + +--- + macros.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/macros.go b/macros.go +index c1e6e75..cd493e7 100644 +--- a/macros.go ++++ b/macros.go +@@ -12,7 +12,7 @@ + # redhat-rpm-macros. + + # Define arches for PA and SA +-%golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x ++%golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x riscv64 + %gccgo_arches %{mips} + %go_arches %{golang_arches} %{gccgo_arches} + +-- +1.8.3.1 + diff --git a/generic-rpm-config.spec b/generic-rpm-config.spec index f3568578dfb3f495b0102546a8349d27f8565455..b13209214cf8547d4df72da58426abf0ddbf0efe 100644 --- a/generic-rpm-config.spec +++ b/generic-rpm-config.spec @@ -2,7 +2,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 15 +Release: 16 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -10,6 +10,7 @@ URL: https://gitee.com/openeuler/openEuler-rpm-config Source0: https://gitee.com/openeuler/openEuler-rpm-config/repository/archive/%{version}.tar.gz Patch0: fix-error-message-for-kmodtool.patch +Patch1: 0001-1-Add-riscv64-to-golang_arches.patch Provides: python-rpm-macros = %{version}-%{release} Provides: python2-rpm-macros = %{version}-%{release} @@ -103,6 +104,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Dec 1 2020 whoisxxx - 30-16 +- Add riscv64 in macros.go + * Wed Sep 30 2020 shenyangyang - 30-15 - Change the source code to tar