Commit 53a94c7d authored by Linus Torvalds's avatar Linus Torvalds

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
parents 444699c8 9a17f400
...@@ -127,7 +127,8 @@ rm -r $(perf-tar); \ ...@@ -127,7 +127,8 @@ rm -r $(perf-tar); \
$(if $(findstring tar-src,$@),, \ $(if $(findstring tar-src,$@),, \
$(if $(findstring bz2,$@),bzip2, \ $(if $(findstring bz2,$@),bzip2, \
$(if $(findstring gz,$@),gzip, \ $(if $(findstring gz,$@),gzip, \
$(error unknown target $@))) \ $(if $(findstring xz,$@),xz, \
$(error unknown target $@)))) \
-f -9 $(perf-tar).tar) -f -9 $(perf-tar).tar)
perf-%pkg: FORCE perf-%pkg: FORCE
...@@ -142,7 +143,9 @@ help: FORCE ...@@ -142,7 +143,9 @@ help: FORCE
@echo ' tar-pkg - Build the kernel as an uncompressed tarball' @echo ' tar-pkg - Build the kernel as an uncompressed tarball'
@echo ' targz-pkg - Build the kernel as a gzip compressed tarball' @echo ' targz-pkg - Build the kernel as a gzip compressed tarball'
@echo ' tarbz2-pkg - Build the kernel as a bzip2 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-tar-src-pkg - Build $(perf-tar).tar source tarball'
@echo ' perf-targz-src-pkg - Build $(perf-tar).tar.gz 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-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
@echo ' perf-tarxz-src-pkg - Build $(perf-tar).tar.xz source tarball'
...@@ -35,6 +35,10 @@ case "${1}" in ...@@ -35,6 +35,10 @@ case "${1}" in
compress="bzip2 -c9" compress="bzip2 -c9"
file_ext=".bz2" file_ext=".bz2"
;; ;;
tarxz-pkg)
compress="xz -c9"
file_ext=".xz"
;;
*) *)
echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2 echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
exit 1 exit 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment