This is a partial backport of commit 63ebd0e9649e ("releases: use newer
compression methods for tarballs"), but keeping gz as the only compression
method.In addition to efficiency, this causes the tarball to use root/root ownership, rather than leak whomever produced the tarball. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> I've made 4.20.2 using this, and the results look to be correct, and match 4.20.1 other than the ownership adjustment. For 4.19 and earlier, I'm considering just passing --owner and --group to the final tar invocation. Thoughts? --- tools/misc/mktarball | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/misc/mktarball b/tools/misc/mktarball index 7f9b61da4368..2f574f9bf0ee 100755 --- a/tools/misc/mktarball +++ b/tools/misc/mktarball @@ -5,14 +5,6 @@ # Takes 2 arguments, the path to the dist directory and the version set -ex -function git_archive_into { - mkdir -p "$2" - - git --git-dir="$1"/.git \ - archive --format=tar HEAD | \ - tar Cxf "$2" - -} - if [[ -z "$1" || -z "$2" ]] ; then echo "usage: $0 path-to-XEN_ROOT xen-version" exit 1 @@ -21,14 +13,15 @@ fi xen_root="$1" desc="$2" -tdir="$xen_root/dist/tmp.src-tarball" +tdir="$xen_root/dist" -rm -rf $tdir +rm -f $tdir/xen-$desc.tar* mkdir -p $tdir -git_archive_into $xen_root $tdir/xen-$desc +git --git-dir="$xen_root/.git" archive --format=tar HEAD --prefix=xen-$desc/ \ + >"$tdir/xen-$desc.tar" -GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc +gzip -9k "$tdir/xen-$desc.tar" echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz" base-commit: 03299bb3ec817f47a608dc6080afc32453627fb4 -- 2.39.5
