Sitelet https://github.com/optimistdk/linux/commit/1359096eacb1971be67eead8bf9b582864d92a30
Skip to content

Commit 1359096

Browse files
author
H. Peter Anvin
committed
bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
Impact: quiet Kconfig warning It appears that Kconfig simply has no way to provide defaults for entries that exist inside a conditionalized choice block. Fortunately, it turns out we don't actually ever use CONFIG_INITRAMFS_COMPRESSION_NONE, so we can just drop it for everything outside the choice block. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1 parent 15f7176 commit 1359096

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

‎usr/Kconfig‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ config RD_LZMA
7272
Support loading of a LZMA encoded initial ramdisk or cpio buffer
7373
If unsure, say N.
7474

75-
if INITRAMFS_SOURCE!=""
76-
7775
choice
78-
prompt "Built-in initramfs compression mode"
76+
prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
7977
help
8078
This option decides by which algorithm the builtin initramfs
8179
will be compressed. Several compression algorithms are
@@ -134,14 +132,3 @@ config INITRAMFS_COMPRESSION_LZMA
134132
smaller with LZMA in comparison to gzip.
135133

136134
endchoice
137-
138-
endif
139-
140-
if INITRAMFS_SOURCE=""
141-
# The builtin initramfs is so small so we don't want to bug the user...
142-
143-
config INITRAMFS_COMPRESSION_NONE
144-
bool
145-
default y
146-
147-
endif

‎usr/Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ klibcdirs:;
66
PHONY += klibcdirs
77

88

9-
# No compression
10-
suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) =
11-
129
# Gzip, but no bzip2
1310
suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz
1411

0 commit comments

Comments
 (0)