Re: [PATCH] mktarball: For qemu upstream, use their scripts/archive-source.sh

[Anthony PERARD <anthony.perard@citrix.com>]

On Tue, Apr 17, 2018 at 06:04:37PM +0100, Ian Jackson wrote:
> diff --git a/tools/misc/mktarball b/tools/misc/mktarball
> index 73282b5..42d5430 100755
> --- a/tools/misc/mktarball
> +++ b/tools/misc/mktarball
> @@ -29,7 +29,21 @@ mkdir -p $tdir
>  
>  git_archive_into $xen_root $tdir/xen-$desc
>  
> -git_archive_into $xen_root/tools/qemu-xen-dir-remote $tdir/xen-$desc/tools/qemu-xen
> +# We can't use git_archive_into with qemu upstream because it uses
> +# git-submodules.  git-submodules are an inherently broken git feature
> +# which should never be used in any circumstance.  Unfortunately, qemu

I don't think xen.git is the right place to bash the use of git
submodule. Especially when there is no way, in xen.git, to find out
ahead of time which git trees the xen build system is going to want to
download.

> +# upstream uses them.  Relevantly for us, git archive does not work
> +# properly when there are submodules.
> +(
> +    cd $xen_root/tools/qemu-xen-dir-remote
> +    # if it's not clean, the qemu script will call `git stash' !

It's actually `git stash create`. The script doesn't modify the source
worktree. The script seems to be intended to make a tarball of the
worktree (so also things not commited yet), and we use it make a tarball
of a commit.

There is scripts/make-release that is simpler (called via `make dist`),
but it probably stuff the tarball with more than we need (roms).

> +    git --no-pager diff --stat HEAD
> +    scripts/archive-source.sh $tdir/xen-$desc/tools/qemu-xen.tar
> +    cd $tdir/xen-$desc/tools
> +    mkdir qemu-xen
> +    tar <qemu-xen.tar Cxf qemu-xen -
> +    rm qemu-xen.tar
> +)

-- 
Anthony PERARD

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