Commit d4e9056d authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds

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

Since commit ddd09bcc ("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/160Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad801428
...@@ -102,6 +102,7 @@ config RD_LZ4 ...@@ -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
......
...@@ -8,7 +8,7 @@ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment