diff options
author | P J P | 2013-11-12 17:10:22 -0600 |
---|---|---|
committer | Linus Torvalds | 2013-11-12 21:09:26 -0600 |
commit | 9ba4bcb645898d562498ea66a0df958ef0e7a68c (patch) | |
tree | 20befe80438adaec351eff0eb1f225d0b3df0963 /usr | |
parent | ba24762bd53faaf39cc8b991175636954b7ef4be (diff) | |
download | linux-phy-9ba4bcb645898d562498ea66a0df958ef0e7a68c.tar.gz linux-phy-9ba4bcb645898d562498ea66a0df958ef0e7a68c.tar.xz linux-phy-9ba4bcb645898d562498ea66a0df958ef0e7a68c.zip |
initramfs: read CONFIG_RD_ variables for initramfs compression
When expert configuration option(CONFIG_EXPERT) is enabled, menuconfig
offers a choice of compression algorithm to compress initial ramfs image;
This choice is stored into CONFIG_RD_* variables. But usr/Makefile uses
earlier INITRAMFS_COMPRESSION_* macros to build initial ramfs file. Since
none of them is defined, resulting 'initramfs_data.cpio' file remains
un-compressed.
This patch updates the Makefile to use CONFIG_RD_* variables and adds
support for LZ4 compression algorithm. Also updates the
'gen_initramfs_list.sh' script to check whether a selected compression
command is accessible or not. And fall-back to default gzip(1)
compression when it is not.
Signed-off-by: P J P <prasad@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'usr')
-rw-r--r-- | usr/Makefile | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/usr/Makefile b/usr/Makefile index 029ffe6cd0d8..e767f019accf 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
@@ -6,20 +6,23 @@ klibcdirs:; | |||
6 | PHONY += klibcdirs | 6 | PHONY += klibcdirs |
7 | 7 | ||
8 | 8 | ||
9 | # Gzip | ||
10 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz | ||
11 | |||
12 | # Bzip2 | 9 | # Bzip2 |
13 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) = .bz2 | 10 | suffix_$(CONFIG_RD_BZIP2) = .bz2 |
14 | 11 | ||
15 | # Lzma | 12 | # Lzma |
16 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma | 13 | suffix_$(CONFIG_RD_LZMA) = .lzma |
17 | 14 | ||
18 | # XZ | 15 | # XZ |
19 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_XZ) = .xz | 16 | suffix_$(CONFIG_RD_XZ) = .xz |
20 | 17 | ||
21 | # Lzo | 18 | # Lzo |
22 | suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO) = .lzo | 19 | suffix_$(CONFIG_RD_LZO) = .lzo |
20 | |||
21 | # Lz4 | ||
22 | suffix_$(CONFIG_RD_LZ4) = .lz4 | ||
23 | |||
24 | # Gzip | ||
25 | suffix_$(CONFIG_RD_GZIP) = .gz | ||
23 | 26 | ||
24 | AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)" | 27 | AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)" |
25 | 28 | ||
@@ -53,7 +56,10 @@ endif | |||
53 | quiet_cmd_initfs = GEN $@ | 56 | quiet_cmd_initfs = GEN $@ |
54 | cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) | 57 | cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) |
55 | 58 | ||
56 | targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio | 59 | targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 \ |
60 | initramfs_data.cpio.lzma initramfs_data.cpio.xz \ | ||
61 | initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \ | ||
62 | initramfs_data.cpio | ||
57 | # do not try to update files included in initramfs | 63 | # do not try to update files included in initramfs |
58 | $(deps_initramfs): ; | 64 | $(deps_initramfs): ; |
59 | 65 | ||
@@ -66,4 +72,3 @@ $(deps_initramfs): klibcdirs | |||
66 | $(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs | 72 | $(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs |
67 | $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d | 73 | $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d |
68 | $(call if_changed,initfs) | 74 | $(call if_changed,initfs) |
69 | |||