Changeset cd67edb in rtems-source-builder


Ignore:
Timestamp:
Nov 9, 2018, 10:21:08 AM (13 months ago)
Author:
Hesham Almatary <Hesham.Almatary@…>
Branches:
master
Children:
0e41f9d
Parents:
9e71002
git-author:
Hesham Almatary <Hesham.Almatary@…> (11/09/18 10:21:08)
git-committer:
Hesham Almatary <Hesham.Almatary@…> (11/12/19 10:44:51)
Message:

rsb: Update RISC-V's Spike revision

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.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • bare/config/devel/spike-1.1.0.cfg

    r9e71002 rcd67edb  
    99%include %{_configdir}/base.cfg
    1010
    11 %define spike_version 01252686902fa30665fbecfc1476d169ad1333d1
    12 %define fesvr_version 8d108a0a647901550d95925549337c2c3aec9ac8
     11%define spike_version fb27391bf65ed867b62ef40b726a21ac839fa37a
    1312
    14 %hash sha512 spike-%{spike_version}.tar.gz \
    15        j/Ur/eSIyT6EdpZxS1/vXSqX7HhYLErS2YAM/kdy+suhC2hc3G1R++7vR7TXgWeChf+2kdLsguqPvQnwwkTSxQ==
    16 
    17 # RISC-V's front-end server (fesvr)
    18 %hash sha512 fesvr-%{fesvr_version}.tar.gz \
    19        WUyzopiWMpuEmo9Ox5qTuXAVOmb4dJobs4NoIASU1U2Qg2CatXzcY+Prs7CY3PQ3rTKM7zImVf/HUIy6OCjHjA==
    20 
    21 %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
    22 %hash sha512 spike-include-permissions.patch \
    23        YpeSJ/xn48A6FN4q0pUjrd0DIzOXml/pdlqqzQJl096S40U2fGN7HJBzeLboTlITYZIr+4eDBlnSR29QDy8/8Q==
    24 
     13%hash sha512 spike-%{spike_version}.tar.gz ccd011fc267f499e78c840c71e03407b7796a8d4d2b0c9e39adb477412b4d4f900a65914ab377e465d7bb5850e8f21b79122bbcf046184629f057bd80d1c0729
    2514#
    2615# The spike build instructions. We use 1.x.x Release 1.
  • source-builder/config/spike-1-1.cfg

    r9e71002 rcd67edb  
    1919#
    2020%source set spike --rsb-file=spike-%{spike_version}.tar.gz https://github.com/riscv/riscv-isa-sim/archive/%{spike_version}.tar.gz
    21 %source set fesvr --rsb-file=fesvr-%{fesvr_version}.tar.gz https://github.com/riscv/riscv-fesvr/archive/%{fesvr_version}.tar.gz
    2221
    2322#
     
    2726  build_top=$(pwd)
    2827
    29   source_dir_fesvr="riscv-fesvr-%{fesvr_version}"
    3028  source_dir_spike="riscv-isa-sim-%{spike_version}"
    3129
    32   %source setup fesvr -q -n riscv-fesvr-%{fesvr_version}
    3330  %source setup spike -q -n riscv-isa-sim-%{spike_version}
    34 
    35   %patch setup fesvr -p1
    36   %patch setup spike -p1
    3731
    3832  cd ${build_top}
     
    4135  build_top=$(pwd)
    4236
    43   %{build_directory}
    44 
    45   %{host_build_flags}
    46 
    47   cd ${source_dir_fesvr}
    48 
    49   ./configure \
    50     --prefix=%{_prefix}
    51 
    52   %{__make} %{?_smp_mflags} all$
    53   %{__make} install
    54 
    55   cd ../${source_dir_spike}
     37  cd ${source_dir_spike}
    5638
    5739  ./configure \
     
    6850  rm -rf $SB_BUILD_ROOT
    6951
    70   cd riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1
     52  cd ${source_dir_spike}
    7153  %{__make} DESTDIR=$SB_BUILD_ROOT PREFIX=%{_prefix} install
    7254
Note: See TracChangeset for help on using the changeset viewer.