<div dir="auto"><div>Did you see my previous patch where Chris had helped simplify things. </div><div dir="auto"><br></div><div dir="auto">Also does this hash include the fix for the permissions issue I reported?<br><br><div class="gmail_quote" dir="auto"><div dir="ltr" class="gmail_attr">On Tue, Oct 22, 2019, 9:56 AM Hesham Almatary <<a href="mailto:Hesham.Almatary@cl.cam.ac.uk">Hesham.Almatary@cl.cam.ac.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Latest Spike integrated fesvr in its source directory, so there<br>
is no separate fesvr anymore.<br>
<br>
Also use a revision of Spike that fixes the file permissions<br>
when getting installed.<br>
---<br>
 bare/config/devel/spike-1.1.0.cfg   |  5 +----<br>
 source-builder/config/spike-1-1.cfg | 19 +++++--------------<br>
 2 files changed, 6 insertions(+), 18 deletions(-)<br>
<br>
diff --git a/bare/config/devel/spike-1.1.0.cfg b/bare/config/devel/spike-1.1.0.cfg<br>
index 4e94189..10701c6 100644<br>
--- a/bare/config/devel/spike-1.1.0.cfg<br>
+++ b/bare/config/devel/spike-1.1.0.cfg<br>
@@ -10,10 +10,7 @@<br>
<br>
 %define spike_version 1.1.0<br>
<br>
-%hash sha512 01252686902fa30665fbecfc1476d169ad1333d1.zip 7970f8dfc65ec5a5beab9effc755375d6c90eacc30a89261d9ab8cb4f1cf65c67cfb850e8c1a53302a860aae821e2869dcddd8c098da918bf944a3335edc71d5<br>
-<br>
-# RISC-V's front-end server (fesvr)<br>
-%hash sha512 8d108a0a647901550d95925549337c2c3aec9ac8.zip 9b5ec44723fd96a961d93d369e50e6aeb327341b2dc42c17ed340d1bc0425511deb23fcf1e7c5926486c2a10bfc3cc6d6f4ceb0cda63590d46468db0ee2b1d3b<br>
+%hash sha512 bbe881f3c5435d02eeb7c28515bfb301470f2875.zip 9b97689cdb80ad4f1440361b7d7737c90740f12d44c04a5d11e5b24e67924ec0c5407fc67a924d981eaa06a8da5c9f05589075c4f765c70529c9a45b95b3a6e5<br>
<br>
 #<br>
 # The spike build instructions. We use 1.x.x Release 1.<br>
diff --git a/source-builder/config/spike-1-1.cfg b/source-builder/config/spike-1-1.cfg<br>
index 17b4e2f..270cf7b 100644<br>
--- a/source-builder/config/spike-1-1.cfg<br>
+++ b/source-builder/config/spike-1-1.cfg<br>
@@ -17,8 +17,7 @@ URL:     <a href="https://github.com/riscv/riscv-isa-sim/" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-isa-sim/</a><br>
 #<br>
 # Source<br>
 #<br>
-%source set spike <a href="https://github.com/riscv/riscv-isa-sim/archive/01252686902fa30665fbecfc1476d169ad1333d1.zip" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-isa-sim/archive/01252686902fa30665fbecfc1476d169ad1333d1.zip</a><br>
-%source set fesvr <a href="https://github.com/riscv/riscv-fesvr/archive/8d108a0a647901550d95925549337c2c3aec9ac8.zip" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-fesvr/archive/8d108a0a647901550d95925549337c2c3aec9ac8.zip</a><br>
+%source set spike <a href="https://github.com/riscv/riscv-isa-sim/archive/fb27391bf65ed867b62ef40b726a21ac839fa37a.zip" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-isa-sim/archive/fb27391bf65ed867b62ef40b726a21ac839fa37a.zip</a><br>
<br>
 #<br>
 # Prepare the source code.<br>
@@ -26,25 +25,17 @@ URL:           <a href="https://github.com/riscv/riscv-isa-sim/" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-isa-sim/</a><br>
 %prep<br>
   build_top=$(pwd)<br>
<br>
-  %source setup fesvr -q -n riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8<br>
-  %source setup spike -q -n riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1<br>
+  %source setup spike -q -n riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a<br>
<br>
   cd ${build_top}<br>
<br>
 %build<br>
   build_top=$(pwd)<br>
<br>
-  cd riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8<br>
<br>
-  ../riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8/configure \<br>
-  --prefix=%{_prefix}<br>
-  %{__make} %{?_smp_mflags} all$<br>
-  %{__make} install<br>
-<br>
-<br>
-  cd ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1<br>
+  cd riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a<br>
<br>
-  ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1/configure \<br>
+  ../riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a/configure \<br>
   --prefix=%{_prefix} \<br>
   --with-fesvr=%{_prefix}<br>
<br>
@@ -57,7 +48,7 @@ URL:     <a href="https://github.com/riscv/riscv-isa-sim/" rel="noreferrer noreferrer" target="_blank">https://github.com/riscv/riscv-isa-sim/</a><br>
<br>
   rm -rf $SB_BUILD_ROOT<br>
<br>
-  cd riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1<br>
+  cd riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a<br>
   %{__make} DESTDIR=$SB_BUILD_ROOT PREFIX=%{_prefix} install<br>
<br>
   cd ${build_top}<br>
-- <br>
2.17.1<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div></div>