summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-02-04 01:47:08 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-03 17:31:43 +0000
commitd4e9056daedca3891414fe3c91de3449a5dad0f2 (patch)
treef1231c630ab175d67f0c7ef10a995812f7638614
parentad801428366ebbd541a5b8a1bf4d8b57ee7a8200 (diff)
downloadlinux-d4e9056daedca3891414fe3c91de3449a5dad0f2.tar.gz
linux-d4e9056daedca3891414fe3c91de3449a5dad0f2.tar.bz2
linux-d4e9056daedca3891414fe3c91de3449a5dad0f2.zip
initramfs: do not show compression mode choice if INITRAMFS_SOURCE is empty
Since commit ddd09bcc899f ("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>
-rw-r--r--usr/Kconfig1
-rw-r--r--usr/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/Kconfig b/usr/Kconfig
index 529caab1a328..bdf5bbd40727 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -102,6 +102,7 @@ config RD_LZ4
choice
prompt "Built-in initramfs compression mode"
+ depends on INITRAMFS_SOURCE != ""
help
This option allows you to decide by which algorithm the builtin
initramfs will be compressed. Several compression algorithms are
diff --git a/usr/Makefile b/usr/Makefile
index 244862bfb765..b6081bb2cc72 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -8,7 +8,7 @@
# with unpack_to_rootfs(). Make size_append no-op.
override size_append := :
-compress-$(CONFIG_INITRAMFS_COMPRESSION_NONE) := shipped
+compress-y := shipped
compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip
compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2
compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma