From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 10 Aug 2016 17:34:36 +0000 (+0100)
Subject: rpm: Map kernel 'riscv' to 'riscv64'.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;ds=sidebyside;h=2b6526d58057489c2f8c1d4f8bd84b27a56352e9;p=fedora-riscv.git

rpm: Map kernel 'riscv' to 'riscv64'.

Try to set %{_arch} correctly in rpmbuild.
---

diff --git a/0001-RISCV-64-bit-riscv64-support.patch b/0001-RISCV-64-bit-riscv64-support.patch
index 297843a..e421c79 100644
--- a/0001-RISCV-64-bit-riscv64-support.patch
+++ b/0001-RISCV-64-bit-riscv64-support.patch
@@ -1,4 +1,4 @@
-From 2b02641ebbfad717ef02f42c836b9b001a4269c9 Mon Sep 17 00:00:00 2001
+From ee9f3cca374ee9935cc0337cfbbd02f0d0e4e105 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Aug 2016 18:25:24 +0100
 Subject: [PATCH 1/3] RISCV 64-bit (riscv64) support.
@@ -8,8 +8,8 @@ Based on Mark Salter's aarch64 support patch (commit 8e1ca16c58).
 Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
 ---
  installplatform |  6 ++++++
- rpmrc.in        | 15 +++++++++++++++
- 2 files changed, 21 insertions(+)
+ rpmrc.in        | 16 ++++++++++++++++
+ 2 files changed, 22 insertions(+)
 
 diff --git a/installplatform b/installplatform
 index ebade42..12339fc 100755
@@ -29,7 +29,7 @@ index ebade42..12339fc 100755
  	CANONARCH=noarch
  	CANONCOLOR=0
 diff --git a/rpmrc.in b/rpmrc.in
-index e888b0f..5b9b71d 100644
+index e888b0f..abc08fc 100644
 --- a/rpmrc.in
 +++ b/rpmrc.in
 @@ -99,6 +99,8 @@ optflags: sh4a -O2 -g -mieee
@@ -50,16 +50,17 @@ index e888b0f..5b9b71d 100644
  #############################################################
  # Canonical arch names and numbers
  
-@@ -243,6 +247,8 @@ arch_canon:	mipsr6el: mipsr6el	20
+@@ -243,6 +247,9 @@ arch_canon:	mipsr6el: mipsr6el	20
  arch_canon:	mips64r6: mips64r6	21
  arch_canon:	mips64r6el: mips64r6el	21
  
++arch_canon:	riscv: riscv64	22
 +arch_canon:	riscv64: riscv64	22
 +
  #############################################################
  # Canonical OS names and numbers
  
-@@ -368,6 +374,9 @@ buildarchtranslate: sh4a: sh4
+@@ -368,6 +375,9 @@ buildarchtranslate: sh4a: sh4
  
  buildarchtranslate: aarch64: aarch64
  
@@ -69,7 +70,7 @@ index e888b0f..5b9b71d 100644
  #############################################################
  # Architecture compatibility
  
-@@ -473,6 +482,9 @@ arch_compat: sh4a: sh4
+@@ -473,6 +483,9 @@ arch_compat: sh4a: sh4
  
  arch_compat: aarch64: noarch
  
@@ -79,7 +80,7 @@ index e888b0f..5b9b71d 100644
  os_compat:   IRIX64: IRIX
  os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
  os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
-@@ -506,6 +518,9 @@ buildarch_compat: ia64: noarch
+@@ -506,6 +519,9 @@ buildarch_compat: ia64: noarch
  
  buildarch_compat: aarch64: noarch
  
diff --git a/0002-build-fgetc-returns-int-not-char.patch b/0002-build-fgetc-returns-int-not-char.patch
index 49887fe..2dd6e23 100644
--- a/0002-build-fgetc-returns-int-not-char.patch
+++ b/0002-build-fgetc-returns-int-not-char.patch
@@ -1,4 +1,4 @@
-From 85b9fa7d081f70bbc5ef6266fbdbd7480e7331dc Mon Sep 17 00:00:00 2001
+From 8217b4c4c44f666adf413ab3a0a21503a6f35a3e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 10 Aug 2016 15:01:31 +0100
 Subject: [PATCH 2/3] build: fgetc returns int, not char.
diff --git a/0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch b/0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
index 8fa7e2a..57a3f13 100644
--- a/0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
+++ b/0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
@@ -1,4 +1,4 @@
-From 006666a5c9132bf0e580357fcbc671254724935a Mon Sep 17 00:00:00 2001
+From daaa2fb07d725aa0e42c660776f88adebfa70945 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Aug 2016 18:21:57 +0100
 Subject: [PATCH 3/3] HACKS TO GET RPM TO CROSS-COMPILE