[PATCH] Fixes to build-system (make src-tarball-release)

[PATCH] Fixes to build-system (make src-tarball-release)

[Konrad Rzeszutek Wilk]

Hey!

Attached are two fixes to the tarball building that I found while
I was trying to make an RPM for Fedora Core 25 - in which I wanted
to build TianoCore in.

Sadly it seems that when we build the source tarball we are missing
a couple of directories:
 - SeaBIOS
 - TianoCore

I am not sure if that is an oversight or if this is intentional?

Thanks!

Konrad Rzeszutek Wilk (2):
      build system: Include SeaBIOS and TianoCore directory
      build system: Also include the TianoCore custom Makefile

 tools/misc/mktarball | 6 ++++++
 1 file changed, 6 insertions(+)

Thanks!

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 1/2] build system: Include SeaBIOS and TianoCore directory

[Konrad Rzeszutek Wilk]

The release source did not include those two directories.

Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/misc/mktarball b/tools/misc/mktarball
index 73282b5..7942846 100755
--- a/tools/misc/mktarball
+++ b/tools/misc/mktarball
@@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
 
 git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
 
+git_archive_into $xen_root/tools/firmware/seabios-dir-remote $tdir/xen-$desc/tools/firmware/seabios-dir
+
+if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
+    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
+fi
 GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
 
 echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
-- 
2.9.3


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 1/2] build system: Include SeaBIOS and TianoCore directory

[Wei Liu]

On Sun, Nov 20, 2016 at 10:27:21PM -0500, Konrad Rzeszutek Wilk wrote:
> The release source did not include those two directories.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
> ---
>  tools/misc/mktarball | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/tools/misc/mktarball b/tools/misc/mktarball
> index 73282b5..7942846 100755
> --- a/tools/misc/mktarball
> +++ b/tools/misc/mktarball
> @@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
>  
>  git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
>  
> +git_archive_into $xen_root/tools/firmware/seabios-dir-remote $tdir/xen-$desc/tools/firmware/seabios-dir
> +
> +if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then

Is this test really needed? I think subtree-force-update-all will clone
ovmf anyway.

> +    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
> +fi
>  GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
>  
>  echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
> -- 
> 2.9.3
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 1/2] build system: Include SeaBIOS and TianoCore directory

[Konrad Rzeszutek Wilk]

On Wed, Nov 23, 2016 at 02:39:35AM +0000, Wei Liu wrote:
> On Sun, Nov 20, 2016 at 10:27:21PM -0500, Konrad Rzeszutek Wilk wrote:
> > The release source did not include those two directories.
> > 
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
> > ---
> >  tools/misc/mktarball | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/tools/misc/mktarball b/tools/misc/mktarball
> > index 73282b5..7942846 100755
> > --- a/tools/misc/mktarball
> > +++ b/tools/misc/mktarball
> > @@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
> >  
> >  git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
> >  
> > +git_archive_into $xen_root/tools/firmware/seabios-dir-remote $tdir/xen-$desc/tools/firmware/seabios-dir
> > +
> > +if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
> 
> Is this test really needed? I think subtree-force-update-all will clone
> ovmf anyway.

I think it only does that if CONFIG_OVMF is in your local .config -
which is only the case if you run ./configure --enable-ovmf


> 
> > +    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
> > +fi
> >  GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
> >  
> >  echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
> > -- 
> > 2.9.3
> > 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 1/2] build system: Include SeaBIOS and TianoCore directory

[Wei Liu]

On Tue, Nov 22, 2016 at 11:02:04PM -0500, Konrad Rzeszutek Wilk wrote:
> On Wed, Nov 23, 2016 at 02:39:35AM +0000, Wei Liu wrote:
> > On Sun, Nov 20, 2016 at 10:27:21PM -0500, Konrad Rzeszutek Wilk wrote:
> > > The release source did not include those two directories.
> > > 
> > > Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
> > > ---
> > >  tools/misc/mktarball | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > > 
> > > diff --git a/tools/misc/mktarball b/tools/misc/mktarball
> > > index 73282b5..7942846 100755
> > > --- a/tools/misc/mktarball
> > > +++ b/tools/misc/mktarball
> > > @@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
> > >  
> > >  git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
> > >  
> > > +git_archive_into $xen_root/tools/firmware/seabios-dir-remote $tdir/xen-$desc/tools/firmware/seabios-dir
> > > +
> > > +if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
> > 
> > Is this test really needed? I think subtree-force-update-all will clone
> > ovmf anyway.
> 
> I think it only does that if CONFIG_OVMF is in your local .config -
> which is only the case if you run ./configure --enable-ovmf
> 

In that case, shouldn't seabios and rombios be treated the same way?

> 
> > 
> > > +    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
> > > +fi
> > >  GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
> > >  
> > >  echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
> > > -- 
> > > 2.9.3
> > > 
> > 
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xen.org
> > https://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 1/2] build system: Include SeaBIOS and TianoCore directory

[Konrad Rzeszutek Wilk]

On November 23, 2016 5:14:00 AM EST, Wei Liu <wei.liu2@citrix.com> wrote:
>On Tue, Nov 22, 2016 at 11:02:04PM -0500, Konrad Rzeszutek Wilk wrote:
>> On Wed, Nov 23, 2016 at 02:39:35AM +0000, Wei Liu wrote:
>> > On Sun, Nov 20, 2016 at 10:27:21PM -0500, Konrad Rzeszutek Wilk
>wrote:
>> > > The release source did not include those two directories.
>> > > 
>> > > Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
>> > > ---
>> > >  tools/misc/mktarball | 5 +++++
>> > >  1 file changed, 5 insertions(+)
>> > > 
>> > > diff --git a/tools/misc/mktarball b/tools/misc/mktarball
>> > > index 73282b5..7942846 100755
>> > > --- a/tools/misc/mktarball
>> > > +++ b/tools/misc/mktarball
>> > > @@ -35,6 +35,11 @@ git_archive_into
>$xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
>> > >  
>> > >  git_archive_into $xen_root/extras/mini-os-remote
>$tdir/xen-$desc/extras/mini-os
>> > >  
>> > > +git_archive_into $xen_root/tools/firmware/seabios-dir-remote
>$tdir/xen-$desc/tools/firmware/seabios-dir
>> > > +
>> > > +if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
>> > 
>> > Is this test really needed? I think subtree-force-update-all will
>clone
>> > ovmf anyway.
>> 
>> I think it only does that if CONFIG_OVMF is in your local .config -
>> which is only the case if you run ./configure --enable-ovmf
>> 
>
>In that case, shouldn't seabios and rombios be treated the same way?
>

Yes. 

And I did have an follow up patch for that but I figured I would wait until Ian would chime in with : 'Yeah, no clue why we forgot that', or 'No, because ...'.

I can resend the patches with the last one for completion later tonight.

>> 
>> > 
>> > > +    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote
>$tdir/xen-$desc/tools/firmware/ovmf-dir
>> > > +fi
>> > >  GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir
>xen-$desc
>> > >  
>> > >  echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
>> > > -- 
>> > > 2.9.3
>> > > 
>> > 
>> > _______________________________________________
>> > Xen-devel mailing list
>> > Xen-devel@lists.xen.org
>> > https://lists.xen.org/xen-devel


Thanks!


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 2/2] build system: Also include the TianoCore custom Makefile

[Konrad Rzeszutek Wilk]

that we put in the ovmf-dir (see tools/firmware/Makefile).

Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---
 tools/misc/mktarball | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/misc/mktarball b/tools/misc/mktarball
index 7942846..356def3 100755
--- a/tools/misc/mktarball
+++ b/tools/misc/mktarball
@@ -39,6 +39,7 @@ git_archive_into $xen_root/tools/firmware/seabios-dir-remote $tdir/xen-$desc/too
 
 if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
     git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
+    cp $xen_root/tools/firmware/ovmf-makefile $tdir/xen-$desc/tools/firmware/ovmf-dir/Makefile
 fi
 GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
 
-- 
2.9.3


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 3/3] build system: Also copy ipxe.tar.gz

[Konrad Rzeszutek Wilk]

As that is also part of the release.

Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/misc/mktarball b/tools/misc/mktarball
index 356def3..72cae34 100755
--- a/tools/misc/mktarball
+++ b/tools/misc/mktarball
@@ -41,6 +41,11 @@ if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
     git_archive_into $xen_root/tools/firmware/ovmf-dir-remote $tdir/xen-$desc/tools/firmware/ovmf-dir
     cp $xen_root/tools/firmware/ovmf-makefile $tdir/xen-$desc/tools/firmware/ovmf-dir/Makefile
 fi
+
+if [ -e $xen_root/tools/firmware/etherboot/ipxe.tar.gz ]; then
+    cp $xen_root/tools/firmware/etherboot/ipxe.tar.gz $tdir/xen-$desc/tools/firmware/etherboot/
+fi
+
 GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
 
 echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
-- 
2.9.3


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] Fixes to build-system (make src-tarball-release)

[Wei Liu]

On Sun, Nov 20, 2016 at 10:27:20PM -0500, Konrad Rzeszutek Wilk wrote:
> Hey!
> 
> Attached are two fixes to the tarball building that I found while
> I was trying to make an RPM for Fedora Core 25 - in which I wanted
> to build TianoCore in.
> 
> Sadly it seems that when we build the source tarball we are missing
> a couple of directories:
>  - SeaBIOS
>  - TianoCore
> 
> I am not sure if that is an oversight or if this is intentional?
> 

I'm not sure either. I'm inclined to believe this is an oversight.

The patches themselves look sensible to me.

> Thanks!
> 
> Konrad Rzeszutek Wilk (2):
>       build system: Include SeaBIOS and TianoCore directory
>       build system: Also include the TianoCore custom Makefile
> 
>  tools/misc/mktarball | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> Thanks!

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel