diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 21:14:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 21:14:05 -0400 |
| commit | a7697b945e6e5025f184d6762e7285f1c498411d (patch) | |
| tree | 3cf6ddd963c454cbadc581c8160e560894fdb2a1 /scripts/patch-kernel | |
| parent | 2b17b4382c4bcb1952e9c6953284044970a274f3 (diff) | |
| parent | 354fa22fce767ac137099c8009a411bd0499816c (diff) | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull non-critical part of kbuild from Michal Marek:
- New semantic patches, make coccicheck M= fix
- make gtags speedup
- make tags/TAGS always removes struct forward declarations
- make deb-pkg fixes (some patches are still pending, I know)
- scripts/patch-kernel fix from the last user of this script ;)
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/patch-kernel: digest kernel.org hosted .xz patches
scripts/coccinelle/api/ptr_ret.cocci: semantic patch for ptr_err
scripts: refactor remove structure forward declarations
kbuild: incremental tags update for GNU Global
coccinelle: semantic patch for bool issues
coccinelle: semantic patch to check for PTR_ERR after reassignment
coccinelle: semantic patch converting 0 test to null test
coccinelle: semantic patch for missing iounmap
coccinelle: semantic patch for missing clk_put
kbuild: Fix out-of-tree build for 'make deb-pkg'
kbuild: Only build linux-image package for UML
kbuild: Fix link to headers in 'make deb-pkg'
coccicheck: change handling of C={1,2} when M= is set
Diffstat (limited to 'scripts/patch-kernel')
| -rwxr-xr-x | scripts/patch-kernel | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/patch-kernel b/scripts/patch-kernel index 20fb25c23382..d000ea3a41fd 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel | |||
| @@ -116,6 +116,10 @@ findFile () { | |||
| 116 | ext=".bz2" | 116 | ext=".bz2" |
| 117 | name="bzip2" | 117 | name="bzip2" |
| 118 | uncomp="bunzip2 -dc" | 118 | uncomp="bunzip2 -dc" |
| 119 | elif [ -r ${filebase}.xz ]; then | ||
| 120 | ext=".xz" | ||
| 121 | name="xz" | ||
| 122 | uncomp="xz -dc" | ||
| 119 | elif [ -r ${filebase}.zip ]; then | 123 | elif [ -r ${filebase}.zip ]; then |
| 120 | ext=".zip" | 124 | ext=".zip" |
| 121 | name="zip" | 125 | name="zip" |
