diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 18:13:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 18:13:09 -0700 |
| commit | b87a2d3e3147bd140da2eae584772c353d11421b (patch) | |
| tree | b07334f4a0b6bef83be8f061e76694c267d5fa34 /scripts/extract-ikconfig | |
| parent | 53a94c7d55dceb73aab2876afce4c563bc9111fe (diff) | |
| parent | ab94e4666d5cee0e393367671eeab4111105bffb (diff) | |
| download | linux-stable-b87a2d3e3147bd140da2eae584772c353d11421b.tar.gz linux-stable-b87a2d3e3147bd140da2eae584772c353d11421b.tar.bz2 linux-stable-b87a2d3e3147bd140da2eae584772c353d11421b.zip | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
scripts/extract-ikconfig: add xz compression support
kbuild: add GNU GLOBAL tags generation
setlocalversion: update mercurial tag parsing
Diffstat (limited to 'scripts/extract-ikconfig')
| -rwxr-xr-x | scripts/extract-ikconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig index 1512c0a755ac..e1862429ccda 100755 --- a/scripts/extract-ikconfig +++ b/scripts/extract-ikconfig @@ -56,10 +56,11 @@ trap "rm -f $tmp1 $tmp2" 0 dump_config "$img" # That didn't work, so retry after decompression. -try_decompress '\037\213\010' xy gunzip -try_decompress 'BZh' xy bunzip2 -try_decompress '\135\0\0\0' xxx unlzma -try_decompress '\211\114\132' xy 'lzop -d' +try_decompress '\037\213\010' xy gunzip +try_decompress '\3757zXZ\000' abcde unxz +try_decompress 'BZh' xy bunzip2 +try_decompress '\135\0\0\0' xxx unlzma +try_decompress '\211\114\132' xy 'lzop -d' # Bail out: echo "$me: Cannot find kernel config." >&2 |