projects/linux·commit 53a94c7d

Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

53a94c7d · Linus Torvalds <[email protected]> · 2011-03-20 18:12:42 -07:00

* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: Add make tarxz-pkg build option
Commit
53a94c7d55dceb73aab2876afce4c563bc9111fe
Parents
444699c8 · 9a17f400

Merge commit. Changes below are compared with the first parent: 444699c8.

Changes

2 files changed · +8 −1

FileStatusAddDelContent
scripts/package/Makefilemodified+4−1View file
scripts/package/buildtarmodified+4−0View file

scripts/package/Makefile

View file
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d0b931b..a834b93 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -127,7 +127,8 @@ rm -r $(perf-tar); \
$(if $(findstring tar-src,$@),, \
$(if $(findstring bz2,$@),bzip2, \
$(if $(findstring gz,$@),gzip, \
-$(error unknown target $@))) \
+$(if $(findstring xz,$@),xz, \
+$(error unknown target $@)))) \
-f -9 $(perf-tar).tar)
perf-%pkg: FORCE
@@ -142,7 +143,9 @@ help: FORCE
@echo ' tar-pkg - Build the kernel as an uncompressed tarball'
@echo ' targz-pkg - Build the kernel as a gzip compressed tarball'
@echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball'
+ @echo ' tarxz-pkg - Build the kernel as a xz compressed tarball'
@echo ' perf-tar-src-pkg - Build $(perf-tar).tar source tarball'
@echo ' perf-targz-src-pkg - Build $(perf-tar).tar.gz source tarball'
@echo ' perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
+ @echo ' perf-tarxz-src-pkg - Build $(perf-tar).tar.xz source tarball'

scripts/package/buildtar

View file
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 51b2aa0..83c9c04 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -35,6 +35,10 @@ case "${1}" in
compress="bzip2 -c9"
file_ext=".bz2"
;;
+ tarxz-pkg)
+ compress="xz -c9"
+ file_ext=".xz"
+ ;;
*)
echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
exit 1