[PATCH] [rsb] Update Spike build

[Joel Sherrill]

Did you see my previous patch where Chris had helped simplify things.

Also does this hash include the fix for the permissions issue I reported?

On Tue, Oct 22, 2019, 9:56 AM Hesham Almatary <Hesham.Almatary at cl.cam.ac.uk>
wrote:

> Latest Spike integrated fesvr in its source directory, so there
> is no separate fesvr anymore.
>
> Also use a revision of Spike that fixes the file permissions
> when getting installed.
> ---
>  bare/config/devel/spike-1.1.0.cfg   |  5 +----
>  source-builder/config/spike-1-1.cfg | 19 +++++--------------
>  2 files changed, 6 insertions(+), 18 deletions(-)
>
> diff --git a/bare/config/devel/spike-1.1.0.cfg
> b/bare/config/devel/spike-1.1.0.cfg
> index 4e94189..10701c6 100644
> --- a/bare/config/devel/spike-1.1.0.cfg
> +++ b/bare/config/devel/spike-1.1.0.cfg
> @@ -10,10 +10,7 @@
>
>  %define spike_version 1.1.0
>
> -%hash sha512 01252686902fa30665fbecfc1476d169ad1333d1.zip
> 7970f8dfc65ec5a5beab9effc755375d6c90eacc30a89261d9ab8cb4f1cf65c67cfb850e8c1a53302a860aae821e2869dcddd8c098da918bf944a3335edc71d5
> -
> -# RISC-V's front-end server (fesvr)
> -%hash sha512 8d108a0a647901550d95925549337c2c3aec9ac8.zip
> 9b5ec44723fd96a961d93d369e50e6aeb327341b2dc42c17ed340d1bc0425511deb23fcf1e7c5926486c2a10bfc3cc6d6f4ceb0cda63590d46468db0ee2b1d3b
> +%hash sha512 bbe881f3c5435d02eeb7c28515bfb301470f2875.zip
> 9b97689cdb80ad4f1440361b7d7737c90740f12d44c04a5d11e5b24e67924ec0c5407fc67a924d981eaa06a8da5c9f05589075c4f765c70529c9a45b95b3a6e5
>
>  #
>  # The spike build instructions. We use 1.x.x Release 1.
> diff --git a/source-builder/config/spike-1-1.cfg
> b/source-builder/config/spike-1-1.cfg
> index 17b4e2f..270cf7b 100644
> --- a/source-builder/config/spike-1-1.cfg
> +++ b/source-builder/config/spike-1-1.cfg
> @@ -17,8 +17,7 @@ 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
> https://github.com/riscv/riscv-isa-sim/archive/fb27391bf65ed867b62ef40b726a21ac839fa37a.zip
>
>  #
>  # Prepare the source code.
> @@ -26,25 +25,17 @@ 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 setup spike -q -n
> riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a
>
>    cd ${build_top}
>
>  %build
>    build_top=$(pwd)
>
> -  cd riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8
>
> -  ../riscv-fesvr-8d108a0a647901550d95925549337c2c3aec9ac8/configure \
> -  --prefix=%{_prefix}
> -  %{__make} %{?_smp_mflags} all$
> -  %{__make} install
> -
> -
> -  cd ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
> +  cd riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a
>
> -  ../riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1/configure \
> +  ../riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a/configure \
>    --prefix=%{_prefix} \
>    --with-fesvr=%{_prefix}
>
> @@ -57,7 +48,7 @@ URL:     https://github.com/riscv/riscv-isa-sim/
>
>    rm -rf $SB_BUILD_ROOT
>
> -  cd riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
> +  cd riscv-isa-sim-fb27391bf65ed867b62ef40b726a21ac839fa37a
>    %{__make} DESTDIR=$SB_BUILD_ROOT PREFIX=%{_prefix} install
>
>    cd ${build_top}
> --
> 2.17.1
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20191022/b906bd3c/attachment.html>