rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

rsb: Update RISC-V's Spike revision

Browse Source 
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.
This commit is contained in:
Hesham Almatary 2018-11-09 10:21:08 +00:00
parent 9e71002175
commit cd67edb7ca
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bare/config/devel/spike-1.1.0.cfg
View File

@ -8,20 +8,9 @@
%include %{_configdir}/base.cfg
%define spike_version 01252686902fa30665fbecfc1476d169ad1333d1
%define fesvr_version 8d108a0a647901550d95925549337c2c3aec9ac8
%hash sha512 spike-%{spike_version}.tar.gz \
j/Ur/eSIyT6EdpZxS1/vXSqX7HhYLErS2YAM/kdy+suhC2hc3G1R++7vR7TXgWeChf+2kdLsguqPvQnwwkTSxQ==
# RISC-V's front-end server (fesvr)
%hash sha512 fesvr-%{fesvr_version}.tar.gz \
WUyzopiWMpuEmo9Ox5qTuXAVOmb4dJobs4NoIASU1U2Qg2CatXzcY+Prs7CY3PQ3rTKM7zImVf/HUIy6OCjHjA==
%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 \
YpeSJ/xn48A6FN4q0pUjrd0DIzOXml/pdlqqzQJl096S40U2fGN7HJBzeLboTlITYZIr+4eDBlnSR29QDy8/8Q==
%define spike_version fb27391bf65ed867b62ef40b726a21ac839fa37a
%hash sha512 spike-%{spike_version}.tar.gz ccd011fc267f499e78c840c71e03407b7796a8d4d2b0c9e39adb477412b4d4f900a65914ab377e465d7bb5850e8f21b79122bbcf046184629f057bd80d1c0729
#
# The spike build instructions. We use 1.x.x Release 1.
#

22
source-builder/config/spike-1-1.cfg
View File

@ -18,7 +18,6 @@ URL: https://github.com/riscv/riscv-isa-sim/
# Source
#
%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,33 +25,16 @@ URL: https://github.com/riscv/riscv-isa-sim/
%prep
build_top=$(pwd)
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)
%{build_directory}
%{host_build_flags}
cd ${source_dir_fesvr}
./configure \
--prefix=%{_prefix}
%{__make} %{?_smp_mflags} all$
%{__make} install
cd ../${source_dir_spike}
cd ${source_dir_spike}
./configure \
--prefix=%{_prefix} \
@ -67,7 +49,7 @@ URL: https://github.com/riscv/riscv-isa-sim/
rm -rf $SB_BUILD_ROOT
cd riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
cd ${source_dir_spike}
%{__make} DESTDIR=$SB_BUILD_ROOT PREFIX=%{_prefix} install
cd ${build_top}