Fixes to build-system (make src-tarball-release)

PATCH In review Konrad Rzeszutek Wilk 3 participants 9 messages Nov 21, 2016 – Nov 23, 2016

lore

Share & tools

lore

Konrad Rzeszutek Wilk

author

2016-11-21 03:27 UTC #0 lore raw

PATCH 1/1 Fixes to build-system (make src-tarball-release)

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
[email protected]
https://lists.xen.org/xen-devel

Konrad Rzeszutek Wilk

author

2016-11-21 03:27 UTC #1 lore raw

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

The release source did not include those two directories.

Signed-off-by Konrad Rzeszutek Wilk <[email protected]>

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

tools/misc/mktarball +5 -0

index 73282b5..7942846 100755
@@ -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"

Signature · 7 lines

2.9.3


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Wei Liu

2016-11-23 02:39 UTC #2 lore raw

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

Quoted 12 lines · Konrad Rzeszutek Wilk

The release source did not include those two directories.
Signed-off-by Konrad Rzeszutek Wilk <[email protected]>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)
tools/misc/mktarball +0 -0
index 73282b5..7942846 100755

tools/misc/mktarball git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc · line 40

Quoted 6 lines

tools/misc/mktarball +3 -0

@@ -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.

Quoted 8 lines

tools/misc/mktarball +2 -0

+    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"

Signature · 1 line

2.9.3

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Konrad Rzeszutek Wilk

2016-11-23 04:02 UTC #3 lore raw

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

Quoted 14 lines · Wei Liu

Quoted 13 lines · Konrad Rzeszutek Wilk
The release source did not include those two directories.
Signed-off-by Konrad Rzeszutek Wilk <[email protected]>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)
tools/misc/mktarball +0 -0
index 73282b5..7942846 100755
@@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
 

Quoted 8 lines

tools/misc/mktarball git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc · line 40
Quoted 5 lines
tools/misc/mktarball +3 -0
 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

Quoted 10 lines

Quoted 9 lines

tools/misc/mktarball +2 -0

+    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"

Signature · 1 line

2.9.3

Quoted 4 lines

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Wei Liu

2016-11-23 10:14 UTC #4 lore raw

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

Quoted 24 lines · Konrad Rzeszutek Wilk

Quoted 14 lines · Wei Liu
Quoted 13 lines · Konrad Rzeszutek Wilk
The release source did not include those two directories.
Signed-off-by Konrad Rzeszutek Wilk <[email protected]>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)
tools/misc/mktarball +0 -0
index 73282b5..7942846 100755
@@ -35,6 +35,11 @@ git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
 
Quoted 8 lines
tools/misc/mktarball git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc · line 40
Quoted 5 lines
tools/misc/mktarball +3 -0
 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.

Quoted 3 lines

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?

Quoted 11 lines

Quoted 10 lines

tools/misc/mktarball +2 -0

+    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"

Signature · 1 line

2.9.3

Quoted 4 lines

Quoted 4 lines
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Konrad Rzeszutek Wilk

2016-11-23 12:26 UTC #5 lore raw

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

Quoted 27 lines · Wei Liu

Quoted 2 lines · Konrad Rzeszutek Wilk
Quoted 1 line · Wei Liu
On Sun, Nov 20, 2016 at 10:27:21PM -0500, Konrad Rzeszutek Wilk
Quoted 7 lines · wrote:
Quoted 7 lines
Quoted 7 lines
The release source did not include those two directories.
Signed-off-by Konrad Rzeszutek Wilk <[email protected]>
---
 tools/misc/mktarball | 5 +++++
 1 file changed, 5 insertions(+)
Quoted 5 lines
Quoted 5 lines
tools/misc/mktarball git_archive_into
Quoted 5 lines
tools/misc/mktarball +0 -0
index 73282b5..7942846 100755
@@ -35,6 +35,11 @@ git_archive_into
$xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc
Quoted 2 lines
Quoted 2 lines
tools/misc/mktarball git_archive_into · line 35
Quoted 2 lines
tools/misc/mktarball +0 -0
 git_archive_into $xen_root/extras/mini-os-remote
$tdir/xen-$desc/extras/mini-os
Quoted 2 lines
Quoted 2 lines
tools/misc/mktarball git_archive_into · line 36
Quoted 2 lines
tools/misc/mktarball +1 -0
+git_archive_into $xen_root/tools/firmware/seabios-dir-remote
$tdir/xen-$desc/tools/firmware/seabios-dir
Quoted 4 lines
Quoted 4 lines
tools/misc/mktarball git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc · line 40
Quoted 2 lines
tools/misc/mktarball +2 -0
+
+if [ -d $xen_root/tools/firmware/ovmf-dir-remote ]; then
Is this test really needed? I think subtree-force-update-all will

Quoted 9 lines

clone
Quoted 5 lines
Quoted 1 line
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.

Quoted 17 lines

Quoted 3 lines
Quoted 3 lines
tools/misc/mktarball git_archive_into · line 39
Quoted 3 lines
tools/misc/mktarball +1 -0
+    git_archive_into $xen_root/tools/firmware/ovmf-dir-remote
$tdir/xen-$desc/tools/firmware/ovmf-dir
Quoted 2 lines
Quoted 2 lines
tools/misc/mktarball git_archive_into · line 41
Quoted 2 lines
tools/misc/mktarball +1 -0
+fi
 GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir
xen-$desc
Quoted 10 lines
Quoted 10 lines
Quoted 5 lines
tools/misc/mktarball +0 -0
 echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
Signature · 1 line
2.9.3
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Thanks!

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Konrad Rzeszutek Wilk

author

2016-11-21 03:27 UTC #6 lore raw

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

In reply to Konrad Rzeszutek Wilk

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

Signed-off-by Konrad Rzeszutek Wilk <[email protected]>

---
 tools/misc/mktarball | 1 +
 1 file changed, 1 insertion(+)

tools/misc/mktarball +1 -0

index 7942846..356def3 100755
@@ -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

Signature · 7 lines

2.9.3


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Konrad Rzeszutek Wilk

author

2016-11-21 14:43 UTC #7 lore raw

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

In reply to Konrad Rzeszutek Wilk

As that is also part of the release.

Signed-off-by Konrad Rzeszutek Wilk <[email protected]>

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

tools/misc/mktarball +5 -0

index 356def3..72cae34 100755
@@ -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"

Signature · 7 lines

2.9.3


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Wei Liu

2016-11-22 10:29 UTC #8 lore raw

In reply to Konrad Rzeszutek Wilk

Quoted 6 lines · 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.

Quoted 7 lines

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.

Quoted 10 lines

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
[email protected]
https://lists.xen.org/xen-devel