Re: [PATCH v2] [rsb] Update Spike build

[Joel Sherrill]

>From my perspective, yes. If it breaks something else, we can fix that.

On Wed, Oct 30, 2019 at 9:47 AM Hesham Almatary <
hesham.almat...@cl.cam.ac.uk> wrote:

> OK to push?
>
> On Tue, 29 Oct 2019 at 09:25, Hesham Almatary
>  wrote:
> >
> > On Mon, 28 Oct 2019 at 23:15, Joel Sherrill  wrote:
> > >
> > >
> > >
> > > On Mon, Oct 28, 2019 at 5:20 AM Hesham Almatary <
> hesham.almat...@cl.cam.ac.uk> wrote:
> > >>
> > >> On Mon, 28 Oct 2019 at 04:01, Chris Johns  wrote:
> > >> >
> > >> >
> > >> >
> > >> > On 28/10/19 9:21 am, Hesham Almatary wrote:
> > >> > >
> > >> > >
> > >> > > On Sun, 27 Oct 2019 at 20:54, Chris Johns  > >> > > > wrote:
> > >> > >
> > >> > > On 27/10/19 9:37 pm, Hesham Almatary wrote:
> > >> > > > Yeah fesvr is now part of Spike in-tree. I didn't like it
> had to be
> > >> > > > built separately either [1].
> > >> > > >
> > >> > > > Joel, AFAIR, dtc was always needed.
> > >> > >
> > >> > > Please have the package build FDT if it is needed. Do no rely
> on it being
> > >> > > installed as some hosts do not have a package to install.
> > >> > >
> > >> > > I think Joel has already added it
> > >> > >
> https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
> > >> > >
> > >> >
> > >> > Thanks.
> > >> >
> > >> > The config file has some issues. I am fixing the %hash issues. Is
> the patch
> > >> > still needed if the version used has the fix?
> > >> >
> > >> The version that has the fix is a recent one, and it has fesvr in its
> > >> source tree, hence, there's no separate fesvr any more. The patch will
> > >> still be needed to get rid of the separate fesvr build for this recent
> > >> Spike revision.
> > >
> > >
> > > If you are bumping to a version which doesn't need my patch, great!
> > >
> > Yes, that's the point of the patch along with removing fesvr build.
> >
> > > Is this all pushed now?
> > >
> > Not yet, waiting for approval.
> >
> > >>
> > >> > Chris
> > >> > ___
> > >> > devel mailing list
> > >> > devel@rtems.org
> > >> > http://lists.rtems.org/mailman/listinfo/devel
> > >> ___
> > >> devel mailing list
> > >> devel@rtems.org
> > >> http://lists.rtems.org/mailman/listinfo/devel
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

OK to push?

On Tue, 29 Oct 2019 at 09:25, Hesham Almatary
 wrote:
>
> On Mon, 28 Oct 2019 at 23:15, Joel Sherrill  wrote:
> >
> >
> >
> > On Mon, Oct 28, 2019 at 5:20 AM Hesham Almatary 
> >  wrote:
> >>
> >> On Mon, 28 Oct 2019 at 04:01, Chris Johns  wrote:
> >> >
> >> >
> >> >
> >> > On 28/10/19 9:21 am, Hesham Almatary wrote:
> >> > >
> >> > >
> >> > > On Sun, 27 Oct 2019 at 20:54, Chris Johns  >> > > > wrote:
> >> > >
> >> > > On 27/10/19 9:37 pm, Hesham Almatary wrote:
> >> > > > Yeah fesvr is now part of Spike in-tree. I didn't like it had to 
> >> > > be
> >> > > > built separately either [1].
> >> > > >
> >> > > > Joel, AFAIR, dtc was always needed.
> >> > >
> >> > > Please have the package build FDT if it is needed. Do no rely on 
> >> > > it being
> >> > > installed as some hosts do not have a package to install.
> >> > >
> >> > > I think Joel has already added it
> >> > > https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
> >> > >
> >> >
> >> > Thanks.
> >> >
> >> > The config file has some issues. I am fixing the %hash issues. Is the 
> >> > patch
> >> > still needed if the version used has the fix?
> >> >
> >> The version that has the fix is a recent one, and it has fesvr in its
> >> source tree, hence, there's no separate fesvr any more. The patch will
> >> still be needed to get rid of the separate fesvr build for this recent
> >> Spike revision.
> >
> >
> > If you are bumping to a version which doesn't need my patch, great!
> >
> Yes, that's the point of the patch along with removing fesvr build.
>
> > Is this all pushed now?
> >
> Not yet, waiting for approval.
>
> >>
> >> > Chris
> >> > ___
> >> > devel mailing list
> >> > devel@rtems.org
> >> > http://lists.rtems.org/mailman/listinfo/devel
> >> ___
> >> devel mailing list
> >> devel@rtems.org
> >> http://lists.rtems.org/mailman/listinfo/devel
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

On Mon, 28 Oct 2019 at 23:15, Joel Sherrill  wrote:
>
>
>
> On Mon, Oct 28, 2019 at 5:20 AM Hesham Almatary 
>  wrote:
>>
>> On Mon, 28 Oct 2019 at 04:01, Chris Johns  wrote:
>> >
>> >
>> >
>> > On 28/10/19 9:21 am, Hesham Almatary wrote:
>> > >
>> > >
>> > > On Sun, 27 Oct 2019 at 20:54, Chris Johns > > > > wrote:
>> > >
>> > > On 27/10/19 9:37 pm, Hesham Almatary wrote:
>> > > > Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
>> > > > built separately either [1].
>> > > >
>> > > > Joel, AFAIR, dtc was always needed.
>> > >
>> > > Please have the package build FDT if it is needed. Do no rely on it 
>> > > being
>> > > installed as some hosts do not have a package to install.
>> > >
>> > > I think Joel has already added it
>> > > https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
>> > >
>> >
>> > Thanks.
>> >
>> > The config file has some issues. I am fixing the %hash issues. Is the patch
>> > still needed if the version used has the fix?
>> >
>> The version that has the fix is a recent one, and it has fesvr in its
>> source tree, hence, there's no separate fesvr any more. The patch will
>> still be needed to get rid of the separate fesvr build for this recent
>> Spike revision.
>
>
> If you are bumping to a version which doesn't need my patch, great!
>
Yes, that's the point of the patch along with removing fesvr build.

> Is this all pushed now?
>
Not yet, waiting for approval.

>>
>> > Chris
>> > ___
>> > devel mailing list
>> > devel@rtems.org
>> > http://lists.rtems.org/mailman/listinfo/devel
>> ___
>> devel mailing list
>> devel@rtems.org
>> http://lists.rtems.org/mailman/listinfo/devel
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Joel Sherrill]

On Mon, Oct 28, 2019 at 5:20 AM Hesham Almatary <
hesham.almat...@cl.cam.ac.uk> wrote:

> On Mon, 28 Oct 2019 at 04:01, Chris Johns  wrote:
> >
> >
> >
> > On 28/10/19 9:21 am, Hesham Almatary wrote:
> > >
> > >
> > > On Sun, 27 Oct 2019 at 20:54, Chris Johns  > > > wrote:
> > >
> > > On 27/10/19 9:37 pm, Hesham Almatary wrote:
> > > > Yeah fesvr is now part of Spike in-tree. I didn't like it had to
> be
> > > > built separately either [1].
> > > >
> > > > Joel, AFAIR, dtc was always needed.
> > >
> > > Please have the package build FDT if it is needed. Do no rely on
> it being
> > > installed as some hosts do not have a package to install.
> > >
> > > I think Joel has already added it
> > >
> https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
> > >
> >
> > Thanks.
> >
> > The config file has some issues. I am fixing the %hash issues. Is the
> patch
> > still needed if the version used has the fix?
> >
> The version that has the fix is a recent one, and it has fesvr in its
> source tree, hence, there's no separate fesvr any more. The patch will
> still be needed to get rid of the separate fesvr build for this recent
> Spike revision.
>

If you are bumping to a version which doesn't need my patch, great!

Is this all pushed now?


> > Chris
> > ___
> > devel mailing list
> > devel@rtems.org
> > http://lists.rtems.org/mailman/listinfo/devel
> ___
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

On Mon, 28 Oct 2019 at 04:01, Chris Johns  wrote:
>
>
>
> On 28/10/19 9:21 am, Hesham Almatary wrote:
> >
> >
> > On Sun, 27 Oct 2019 at 20:54, Chris Johns  > > wrote:
> >
> > On 27/10/19 9:37 pm, Hesham Almatary wrote:
> > > Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
> > > built separately either [1].
> > >
> > > Joel, AFAIR, dtc was always needed.
> >
> > Please have the package build FDT if it is needed. Do no rely on it 
> > being
> > installed as some hosts do not have a package to install.
> >
> > I think Joel has already added it
> > https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
> >
>
> Thanks.
>
> The config file has some issues. I am fixing the %hash issues. Is the patch
> still needed if the version used has the fix?
>
The version that has the fix is a recent one, and it has fesvr in its
source tree, hence, there's no separate fesvr any more. The patch will
still be needed to get rid of the separate fesvr build for this recent
Spike revision.

> Chris
> ___
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Chris Johns]

On 28/10/19 9:21 am, Hesham Almatary wrote:
> 
> 
> On Sun, 27 Oct 2019 at 20:54, Chris Johns  > wrote:
> 
> On 27/10/19 9:37 pm, Hesham Almatary wrote:
> > Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
> > built separately either [1].
> >
> > Joel, AFAIR, dtc was always needed.
> 
> Please have the package build FDT if it is needed. Do no rely on it being
> installed as some hosts do not have a package to install.
> 
> I think Joel has already added it 
> https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7
> 

Thanks.

The config file has some issues. I am fixing the %hash issues. Is the patch
still needed if the version used has the fix?

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

On Sun, 27 Oct 2019 at 20:54, Chris Johns  wrote:

> On 27/10/19 9:37 pm, Hesham Almatary wrote:
> > Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
> > built separately either [1].
> >
> > Joel, AFAIR, dtc was always needed.
>
> Please have the package build FDT if it is needed. Do no rely on it being
> installed as some hosts do not have a package to install.

I think Joel has already added it
https://github.com/RTEMS/rtems-source-builder/blob/master/bare/config/devel/spike.bset#L7

>
>
> Chris
> ___
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Chris Johns]

On 27/10/19 9:37 pm, Hesham Almatary wrote:
> Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
> built separately either [1].
> 
> Joel, AFAIR, dtc was always needed.

Please have the package build FDT if it is needed. Do no rely on it being
installed as some hosts do not have a package to install.

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

Yeah fesvr is now part of Spike in-tree. I didn't like it had to be
built separately either [1].

Joel, AFAIR, dtc was always needed.

[1] https://github.com/riscv/riscv-isa-sim/issues/254

On Fri, 25 Oct 2019 at 14:59, Joel Sherrill  wrote:
>
> Thanks for updating this.
>
> When building on a very clean machine, dtc needs to be referenced and in the 
> PATH.
>
> hecking for dtc... no
> configure: error: device-tree-compiler not found
>
> Is this working for you when dtc is not installed before building spike?
>
> On Thu, Oct 24, 2019 at 4:39 PM Chris Johns  wrote:
>>
>> On 24/10/19 7:57 pm, Hesham Almatary wrote:
>> > Latest Spike integrated fesvr in its source directory, so there
>> > is no separate fesvr anymore.
>>
>> Nice. Building and installing fesvr was a little unusual.
>>
>> Chris
>>
>> ___
>> devel mailing list
>> devel@rtems.org
>> http://lists.rtems.org/mailman/listinfo/devel
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Joel Sherrill]

Thanks for updating this.

When building on a very clean machine, dtc needs to be referenced and in
the PATH.

hecking for dtc... no
configure: error: device-tree-compiler not found

Is this working for you when dtc is not installed before building spike?

On Thu, Oct 24, 2019 at 4:39 PM Chris Johns  wrote:

> On 24/10/19 7:57 pm, Hesham Almatary wrote:
> > Latest Spike integrated fesvr in its source directory, so there
> > is no separate fesvr anymore.
>
> Nice. Building and installing fesvr was a little unusual.
>
> Chris
>
> ___
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] [rsb] Update Spike build

[Chris Johns]

On 24/10/19 7:57 pm, Hesham Almatary wrote:
> Latest Spike integrated fesvr in its source directory, so there
> is no separate fesvr anymore.

Nice. Building and installing fesvr was a little unusual.

Chris

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH v2] [rsb] Update Spike build

[Hesham Almatary]

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   | 12 ++--
 source-builder/config/spike-1-1.cfg | 22 ++
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/bare/config/devel/spike-1.1.0.cfg 
b/bare/config/devel/spike-1.1.0.cfg
index a83edf7..12022c4 100644
--- a/bare/config/devel/spike-1.1.0.cfg
+++ b/bare/config/devel/spike-1.1.0.cfg
@@ -8,17 +8,9 @@

 %include %{_configdir}/base.cfg

-%define spike_version 01252686902fa30665fbecfc1476d169ad1333d1
-%define fesvr_version 8d108a0a647901550d95925549337c2c3aec9ac8
-
-%hash sha512 %{spike_version}.tar.gz 
8ff52bfde488c93e847696714b5fef5d2a97ec78582c4ad2d9800cfe4772facba10b685cdc6d51fbeeef47b4d781678285ffb691d2ec82ea8fbd09f0c244d2c5
-
-# RISC-V's front-end server (fesvr)
-%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
+%define spike_version fb27391bf65ed867b62ef40b726a21ac839fa37a

+%hash sha512 %{spike_version}.tar.gz 
ccd011fc267f499e78c840c71e03407b7796a8d4d2b0c9e39adb477412b4d4f900a65914ab377e465d7bb5850e8f21b79122bbcf046184629f057bd80d1c0729
 #
 # 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 7eb0080..760e1cc 100644
--- a/source-builder/config/spike-1-1.cfg
+++ b/source-builder/config/spike-1-1.cfg
@@ -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}
--
2.17.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel