Commit f8d94c4e authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: do not create intermediate *.tar for source tarballs 



Since commit 05e96e96 ("kbuild: use git-archive for source package
creation"), a source tarball is created in two steps; create *.tar file
then compress it. I split the compression as a separate rule because I
just thought 'git archive' supported only gzip.

For other compression algorithms, I could pipe the two commands:

  $ git archive HEAD | xz > linux.tar.xz

I read git-archive(1) carefully, and I realized GIT had provided a
more elegant way:

  $ git -c tar.tar.xz.command=xz archive -o linux.tar.xz HEAD

This commit uses 'tar.tar.*.command' configuration to specify the
compression backend so we can compress a source tarball on-the-fly.

GIT commit 767cf4579f0e ("archive: implement configurable tar filters")
is more than a decade old, so it should be available on almost all build
environments.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
parent f6d82835

scripts/Makefile.package

+17 −7
Original line number Diff line number Diff line
@@ -57,16 +57,23 @@ 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)"



quiet_cmd_archive = ARCHIVE $@

      cmd_archive = git -C $(srctree) archive \

      cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \

                    --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args)



# Linux source tarball

# ---------------------------------------------------------------------------



targets += linux.tar

linux.tar: archive-args = $$(cat $<)

linux.tar: .tmp_HEAD FORCE

linux-tarballs := $(addprefix linux, .tar.gz)



targets += $(linux-tarballs)

$(linux-tarballs): archive-args = $$(cat $<)

$(linux-tarballs): .tmp_HEAD FORCE

	$(call if_changed,archive)



# rpm-pkg
@@ -186,9 +193,12 @@ perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \ 
	--add-file=$$(realpath $(word 3, $^)) \

	$$(cat $(word 2, $^))^{tree} $$(cat $<)



targets += perf-$(KERNELVERSION).tar

perf-$(KERNELVERSION).tar: archive-args = $(perf-archive-args)

perf-$(KERNELVERSION).tar: tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE



perf-tarballs := $(addprefix perf-$(KERNELVERSION), .tar .tar.gz .tar.bz2 .tar.xz .tar.zst)



targets += $(perf-tarballs)

$(perf-tarballs): archive-args = $(perf-archive-args)

$(perf-tarballs): tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE

	$(call if_changed,archive)



PHONY += perf-tar-src-pkg