Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

initramfs: do not show compression mode choice if INITRAMFS_SOURCE is empty

Browse Source 
Since commit ddd09bcc89 ("initramfs: make compression options not
depend on INITRAMFS_SOURCE"), Kconfig asks the compression mode for
the built-in initramfs regardless of INITRAMFS_SOURCE.

It is technically simpler, but pointless from a UI perspective,
Linus says [1].

When INITRAMFS_SOURCE is empty, usr/Makefile creates a tiny default
cpio, which is so small that nobody cares about the compression.

This commit hides the Kconfig choice in that case. The default cpio
is embedded without compression, which was the original behavior.

[1]: https://lkml.org/lkml/2020/2/1/160

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Masahiro Yamada 2020-02-04 01:47:08 +09:00 committed by Linus Torvalds
parent ad80142836
commit d4e9056dae
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr/Kconfig
View File

@ -102,6 +102,7 @@ config RD_LZ4
choice choice
prompt "Built-in initramfs compression mode" prompt "Built-in initramfs compression mode"
depends on INITRAMFS_SOURCE != ""
help help
This option allows you to decide by which algorithm the builtin This option allows you to decide by which algorithm the builtin
initramfs will be compressed. Several compression algorithms are initramfs will be compressed. Several compression algorithms are

2
usr/Makefile
View File

@ -8,7 +8,7 @@
# with unpack_to_rootfs(). Make size_append no-op. # with unpack_to_rootfs(). Make size_append no-op.
override size_append := : override size_append := :
compress-$(CONFIG_INITRAMFS_COMPRESSION_NONE) := shipped compress-y := shipped
compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip
compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2 compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2
compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma