| Message ID | 20161121032722.5168-2-konrad@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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
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
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!
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"
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(+)