diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
| commit | ae3e4628287de0ab90545c14076657aeee38506b (patch) | |
| tree | a846e66dc3fd31e093f2f0a3965534e2d299013f /scripts/package | |
| parent | 5f76945a9c978b8b8bf8eb7fe3b17b9981240a97 (diff) | |
| parent | 415c2c525fab214ab75413aadbc67b4ee9cf212e (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
"The main part of kbuild for v3.7 contains:
- Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
in the build directory path
- Two warning fixes (modpost and main Makefile)
- __compiletime_error works also with gcc 4.3
- make tar{gz,bz2,xz}-pkg uses default compression settings instead
of saving as many bytes as possible (this should actually be in the
misc branch, I don't know why I applied it here)."
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
compiler-gcc4.h: correct verion check for __compiletime_error
modpost: Permit .GCC.command.line sections
Kbuild: use normal compression settings for tar*-pkg
scripts/Makefile.modpost: error in finding modules from .mod files.
kbuild: Remove useless warning while appending KCFLAGS
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/buildtar | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index d0d748e72915..62d8234f8787 100644 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar | |||
| @@ -28,15 +28,15 @@ case "${1}" in | |||
| 28 | file_ext="" | 28 | file_ext="" |
| 29 | ;; | 29 | ;; |
| 30 | targz-pkg) | 30 | targz-pkg) |
| 31 | compress="gzip -c9" | 31 | compress="gzip" |
| 32 | file_ext=".gz" | 32 | file_ext=".gz" |
| 33 | ;; | 33 | ;; |
| 34 | tarbz2-pkg) | 34 | tarbz2-pkg) |
| 35 | compress="bzip2 -c9" | 35 | compress="bzip2" |
| 36 | file_ext=".bz2" | 36 | file_ext=".bz2" |
| 37 | ;; | 37 | ;; |
| 38 | tarxz-pkg) | 38 | tarxz-pkg) |
| 39 | compress="xz -c9" | 39 | compress="xz" |
| 40 | file_ext=".xz" | 40 | file_ext=".xz" |
| 41 | ;; | 41 | ;; |
| 42 | *) | 42 | *) |
