Commit 1fc90958 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: tar-pkg: use tar rules in scripts/Makefile.package 



Use %.tar, %.tar.gz, %.tar.bz2, %.tar.xz, %.tar.zst rules in
scripts/Makefile.package.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent e0ca1674

scripts/Makefile.package

+23 −6
Original line number Diff line number Diff line
@@ -145,13 +145,30 @@ snap-pkg: 
	cd $(objtree)/snap && \

	snapcraft --target-arch=$(UTS_MACHINE)



# tarball targets

# dir-pkg tar*-pkg - tarball targets

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

tar-pkgs := dir-pkg tar-pkg targz-pkg tarbz2-pkg tarxz-pkg tarzst-pkg

PHONY += $(tar-pkgs)

$(tar-pkgs):

	$(MAKE) -f $(srctree)/Makefile

	+$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@



tar-pkg-tarball = linux-$(KERNELRELEASE)-$(ARCH).$(1)

tar-pkg-phony = $(subst .,,$(1))-pkg



tar-install: FORCE

	$(Q)$(MAKE) -f $(srctree)/Makefile

	+$(Q)$(srctree)/scripts/package/buildtar $@



PHONY += dir-pkg

dir-pkg: tar-install

	@echo "Kernel tree successfully created in $<"



define tar-pkg-rule

PHONY += $(tar-pkg-phony)

$(tar-pkg-phony): $(tar-pkg-tarball)

	@:



$(tar-pkg-tarball): private tar-rootdir := tar-install

$(tar-pkg-tarball): tar-install

endef



$(foreach x, tar tar.gz tar.bz2 tar.xz tar.zst, $(eval $(call tar-pkg-rule,$(x))))



# perf-tar*-src-pkg - generate a source tarball with perf source

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

scripts/package/buildtar

+1 −51
Original line number Diff line number Diff line
@@ -16,39 +16,7 @@ set -e 
#

# Some variables and settings used throughout the script

#

tmpdir="${objtree}/tar-install"

tarball="${objtree}/linux-${KERNELRELEASE}-${ARCH}.tar"





#

# Figure out how to compress, if requested at all

#

case "${1}" in

	dir-pkg|tar-pkg)

		opts=

		;;

	targz-pkg)

		opts="-I ${KGZIP}"

		tarball=${tarball}.gz

		;;

	tarbz2-pkg)

		opts="-I ${KBZIP2}"

		tarball=${tarball}.bz2

		;;

	tarxz-pkg)

		opts="-I ${XZ}"

		tarball=${tarball}.xz

		;;

	tarzst-pkg)

		opts="-I ${ZSTD}"

		tarball=${tarball}.zst

		;;

	*)

		echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2

		exit 1

		;;

esac



tmpdir=$1



#

# Clean-up and re-create the temporary directory
@@ -148,21 +116,3 @@ case "${ARCH}" in 
		sleep 5

		;;

esac
 


if [ "${1}" = dir-pkg ]; then

	echo "Kernel tree successfully created in $tmpdir"

	exit 0

fi



#

# Create the tarball

#

if tar --owner=root --group=root --help >/dev/null 2>&1; then

	opts="$opts --owner=root --group=root"

fi



tar cf $tarball -C $tmpdir $opts $dirs



echo "Tarball successfully created in $tarball"



exit 0