!32 Add riscvv64 in macros.go

From: @whoisxxx
Reviewed-by: @liqingqing_1229,@xiezhipeng1
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2020-12-10 20:47:57 +08:00 committed by Gitee
commit 664def5108
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From c1b9fdaa93bfe0b2c70be4a851500d15f891d2f8 Mon Sep 17 00:00:00 2001
From: whoisxxx <whoisxxx@126.com>
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

View File

@ -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 <zhangxuzhou4@huawei.com> - 30-16
- Add riscv64 in macros.go
* Wed Sep 30 2020 shenyangyang <shenyangyang4@huawei.com> - 30-15
- Change the source code to tar