summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-20 16:52:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-20 16:52:45 -0800
commitb7000adef17a5cce85636e40fa2c2d9851a89e28 (patch)
tree35ba6eb35920624fbaf16e1c404f3012531c95a9 /Makefile
parenta6ddeee32dadec066e910c7dcd237be732535fc2 (diff)
downloadkernel-b7000adef17a5cce85636e40fa2c2d9851a89e28.tar.gz
Don't set the INITRD_COMPRESS environment variable automatically
Commit 1bf49dd4be0b ("./Makefile: export initial ramdisk compression config option") started setting the INITRD_COMPRESS environment variable depending on which decompression models the kernel had available. That is completely broken. For example, we by default have CONFIG_RD_LZ4 enabled, and are able to decompress such an initrd, but the user tools to *create* such an initrd may not be availble. So trying to tell dracut to generate an lz4-compressed image just because we can decode such an image is completely inappropriate. Cc: J P <ppandit@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jan Beulich <JBeulich@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 89cee8625651..82ea7dd9fc98 100644
--- a/Makefile
+++ b/Makefile
@@ -738,7 +738,9 @@ INITRD_COMPRESS-$(CONFIG_RD_LZMA) := lzma
INITRD_COMPRESS-$(CONFIG_RD_XZ) := xz
INITRD_COMPRESS-$(CONFIG_RD_LZO) := lzo
INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4
-export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
+# do not export INITRD_COMPRESS, since we didn't actually
+# choose a sane default compression above.
+# export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
ifdef CONFIG_MODULE_SIG_ALL
MODSECKEY = ./signing_key.priv