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

+8 -1
+4 -1
scripts/package/Makefile
··· 127 127 $(if $(findstring tar-src,$@),, \ 128 128 $(if $(findstring bz2,$@),bzip2, \ 129 129 $(if $(findstring gz,$@),gzip, \ 130 - $(error unknown target $@))) \ 130 + $(if $(findstring xz,$@),xz, \ 131 + $(error unknown target $@)))) \ 131 132 -f -9 $(perf-tar).tar) 132 133 133 134 perf-%pkg: FORCE ··· 143 142 @echo ' tar-pkg - Build the kernel as an uncompressed tarball' 144 143 @echo ' targz-pkg - Build the kernel as a gzip compressed tarball' 145 144 @echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball' 145 + @echo ' tarxz-pkg - Build the kernel as a xz compressed tarball' 146 146 @echo ' perf-tar-src-pkg - Build $(perf-tar).tar source tarball' 147 147 @echo ' perf-targz-src-pkg - Build $(perf-tar).tar.gz source tarball' 148 148 @echo ' perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball' 149 + @echo ' perf-tarxz-src-pkg - Build $(perf-tar).tar.xz source tarball' 149 150
+4
scripts/package/buildtar
··· 35 35 compress="bzip2 -c9" 36 36 file_ext=".bz2" 37 37 ;; 38 + tarxz-pkg) 39 + compress="xz -c9" 40 + file_ext=".xz" 41 + ;; 38 42 *) 39 43 echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2 40 44 exit 1