On Thu, Apr 20, 2023 at 5:34 AM Nicolas Schier <nicolas@xxxxxxxxx> wrote: > > On Mon 17 Apr 2023 23:25:48 GMT, Masahiro Yamada wrote: > > Add KDEB_SOURCE_COMPRESS to specify the compression for the orig and > > debian tarballs. (The existing KDEB_COMPRESS is used to specify the > > compression for binary packages.) > > Sounds to me, that it would make sense to sum-up some documentation for > kbuild Debian package configuration. > > > Supported algorithms are gzip, bzip2, lzma, and xz, all of which are > > supported by dpkg-source. > > > > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> > > --- > > > > scripts/Makefile.package | 31 +++++++++++++++++++++++-------- > > 1 file changed, 23 insertions(+), 8 deletions(-) > > > > diff --git a/scripts/Makefile.package b/scripts/Makefile.package > > index d8a36304b26e..ce3d8b4e9cb0 100644 > > --- a/scripts/Makefile.package > > +++ b/scripts/Makefile.package > > @@ -41,19 +41,25 @@ check-git: > > false; \ > > fi > > > > -git-config-tar.gz = -c tar.tar.gz.command="$(KGZIP)" > > -git-config-tar.bz2 = -c tar.tar.bz2.command="$(KBZIP2)" > > -git-config-tar.xz = -c tar.tar.xz.command="$(XZ)" > > -git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)" > > +git-config-tar.gz = -c tar.tar.gz.command="$(KGZIP)" > > +git-config-tar.bz2 = -c tar.tar.bz2.command="$(KBZIP2)" > > +git-config-tar.lzma = -c tar.tar.lzma.command="$(LZMA)" > > +git-config-tar.xz = -c tar.tar.xz.command="$(XZ)" > > +git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)" > > > > quiet_cmd_archive = ARCHIVE $@ > > cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \ > > --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) > > > > +suffix-gzip := .gz > > +suffix-bzip2 := .bz2 > > +suffix-lzma := .lzma > > +suffix-xz := .xz > > + > > # Linux source tarball > > # --------------------------------------------------------------------------- > > > > -linux-tarballs := $(addprefix linux, .tar.gz) > > +linux-tarballs := $(addprefix linux, .tar.gz .tar.bz2 .tar.lzma .tar.xz) > > > > targets += $(linux-tarballs) > > $(linux-tarballs): archive-args = $$(cat $<) > > @@ -88,6 +94,15 @@ binrpm-pkg: > > # deb-pkg srcdeb-pkg bindeb-pkg > > # --------------------------------------------------------------------------- > > > > +KDEB_SOURCE_COMPRESS ?= gzip > > According to dpkg-source(1), xz is the default compression for deb > source format >= 2. Shouldn't we use xz here by default as well? Yes. xz is the default because we switched to format 3.0 (quilt). But, we used gzip for a long time, so I did not change it in this commit. I do not have a strong opinion. Ben (debian kernel maintainer) is in the CC list, perhaps he has some preference. -- Best Regards Masahiro Yamada
