From 68870df775b4763bebf94995a019d8e4c50e465e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Thu, 17 Oct 2019 10:12:58 -0500
Subject: Update Spike RSB recipe and correct installed permissions

Updates #3802.
---
 bare/config/devel/spike-1.1.0.cfg   | 10 +++++++---
 bare/config/devel/spike.bset        |  1 +
 source-builder/config/spike-1-1.cfg | 34 ++++++++++++++++++++++------------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/bare/config/devel/spike-1.1.0.cfg b/bare/config/devel/spike-1.1.0.cfg
index 4e94189..a83edf7 100644
--- a/bare/config/devel/spike-1.1.0.cfg
+++ b/bare/config/devel/spike-1.1.0.cfg
@@ -8,12 +8,16 @@
 
 %include %{_configdir}/base.cfg
 
-%define spike_version 1.1.0
+%define spike_version 01252686902fa30665fbecfc1476d169ad1333d1
+%define fesvr_version 8d108a0a647901550d95925549337c2c3aec9ac8
 
-%hash sha512 01252686902fa30665fbecfc1476d169ad1333d1.zip 7970f8dfc65ec5a5beab9effc755375d6c90eacc30a89261d9ab8cb4f1cf65c67cfb850e8c1a53302a860aae821e2869dcddd8c098da918bf944a3335edc71d5
+%hash sha512 %{spike_version}.tar.gz 8ff52bfde488c93e847696714b5fef5d2a97ec78582c4ad2d9800cfe4772facba10b685cdc6d51fbeeef47b4d781678285ffb691d2ec82ea8fbd09f0c244d2c5
 
 # RISC-V's front-end server (fesvr)
-%hash sha512 8d108a0a647901550d95925549337c2c3aec9ac8.zip 9b5ec44723fd96a961d93d369e50e6aeb327341b2dc42c17ed340d1bc0425511deb23fcf1e7c5926486c2a10bfc3cc6d6f4ceb0cda63590d46468db0ee2b1d3b
+%hash sha512 %{fesvr_version}.tar.gz 62979227fc67e3c03a14de2ad29523addd032333979a5fe9765aaacd0265d3de92e345367c637b1c907378b6e84e521361922bfb87830659d2476f500f2f3ff1
+
+%patch add spike --rsb-file=spike-include-permissions.patch https://devel.rtems.org/raw-attachment/ticket/3802/0001-Correct-Permission-on-Installed-Headers-and-Binaries.patch
+%hash sha512 spike-include-permissions.patch 62979227fc67e3c03a14de2ad29523addd032333979a5fe9765aaacd0265d3de92e345367c637b1c907378b6e84e521361922bfb87830659d2476f500f2f3ff1
 
 #
 # The spike build instructions. We use 1.x.x Release 1.
diff --git a/bare/config/devel/spike.bset b/bare/config/devel/spike.bset
index c7a6340..76392f7 100644
--- a/bare/config/devel/spike.bset
+++ b/bare/config/devel/spike.bset
@@ -4,4 +4,5 @@
 
 %define release 1
 
+devel/dtc-1.4.1-1
 devel/spike-1.1.0
diff --git a/source-builder/config/spike-1-1.cfg b/source-builder/config/spike-1-1.cfg
index 17b4e2f..7eb0080 100644
--- a/source-builder/config/spike-1-1.cfg
+++ b/source-builder/config/spike-1-1.cfg
@@ -17,8 +17,8 @@ URL: 	   https://github.com/riscv/riscv-isa-sim/
 #
 # Source
 #
-%source set spike https://github.com/riscv/riscv-isa-sim/archive/01252686902fa30665fbecfc1476d169ad1333d1.zip
-%source set fesvr https://github.com/riscv/riscv-fesvr/archive/8d108a0a647901550d95925549337c2c3aec9ac8.zip
+%source set spike --rsb-file=spike-%{spike_version}.tar.gz https://github.com/riscv/riscv-isa-sim/archive/%{spike_version}.tar.gz
+%source set fesvr --rsb-file=fesvr-%{fesvr_version}.tar.gz https://github.com/riscv/riscv-fesvr/archive/%{fesvr_version}.tar.gz
 
 #
 # Prepare the source code.
@@ -26,27 +26,37 @@ URL: 	   https://github.com/riscv/riscv-isa-sim/
 %prep
   build_top=$(pwd)
 
-  %source setup fesvr -q -n riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8
-  %source setup spike -q -n riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
+  source_dir_fesvr="riscv-fesvr-%{fesvr_version}"
+  source_dir_spike="riscv-isa-sim-%{spike_version}"
+
+  %source setup fesvr -q -n riscv-fesvr-%{fesvr_version}
+  %source setup spike -q -n riscv-isa-sim-%{spike_version}
+
+  %patch setup fesvr -p1
+  %patch setup spike -p1
 
   cd ${build_top}
 
 %build
   build_top=$(pwd)
 
-  cd riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8
+  %{build_directory}
+
+  %{host_build_flags}
+
+  cd ${source_dir_fesvr}
+
+  ./configure \
+    --prefix=%{_prefix}
 
-  ../riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8/configure \
-  --prefix=%{_prefix}
   %{__make} %{?_smp_mflags} all$
   %{__make} install
 
+  cd ../${source_dir_spike}
 
-  cd ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
-
-  ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1/configure \
-  --prefix=%{_prefix} \
-  --with-fesvr=%{_prefix}
+  ./configure \
+    --prefix=%{_prefix} \
+    --with-fesvr=%{_prefix}
 
   %{__make} %{?_smp_mflags} all$
 
-- 
cgit v1.2.3