path: root/usr/Makefile
diff options
authorAlain Knaff <alain@knaff.lu>2009-02-19 13:43:51 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2009-02-19 13:43:51 -0800
commitab76f3d771590d5c89faa3219559c5d3fc0ce0c2 (patch)
tree4433427c29c34e8fc1ab7ba50bb381f8f5b2051d /usr/Makefile
parentab59d3b70f7a47987f80e153d828363faec643fe (diff)
bzip2/lzma: make internal initramfs compression configurable
Impact: Avoids silent environment dependency Make builtin initramfs compression an explicit configurable. The previous version would pick a compression based on the binaries which were installed on the system, which could lead to unexpected results. It is now explicitly configured, and not having the appropriate binaries installed on the build host is simply an error. Signed-off-by: Alain Knaff <alain@knaff.lu> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'usr/Makefile')
1 files changed, 6 insertions, 12 deletions
diff --git a/usr/Makefile b/usr/Makefile
index 451cdff7dff9..b84894b3929d 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -5,24 +5,18 @@
PHONY += klibcdirs
-# Find out "preferred" ramdisk compressor. Order of preference is
-# 1. bzip2 efficient, and likely to be present
-# 2. gzip former default
-# 3. lzma
-# 4. none
-# None of the above
-suffix_y =
-# Lzma, but no gzip nor bzip2
-suffix_$(CONFIG_RD_LZMA) = .lzma
+# No compression
# Gzip, but no bzip2
-suffix_$(CONFIG_RD_GZIP) = .gz
# Bzip2
-suffix_$(CONFIG_RD_BZIP2) = .bz2
+# Lzma
# Generate builtin.o based on initramfs_data.o
obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o