summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-20 18:12:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-20 18:12:42 -0700
commit53a94c7d55dceb73aab2876afce4c563bc9111fe (patch)
treea687a5e936c1674c20bb019ae383b1416d8c904d /scripts
parent444699c8503eaeb0cf15e24ad76f69b14df6097a (diff)
parent9a17f40048be305749f53278c857bf52939081f3 (diff)
downloadlinux-53a94c7d55dceb73aab2876afce4c563bc9111fe.tar.bz2
Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Add make tarxz-pkg build option
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package/Makefile5
-rw-r--r--scripts/package/buildtar4
2 files changed, 8 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d0b931b994fc..a834b935f536 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'
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 51b2aa0acb82..83c9c04102f2 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