summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-01-24 06:41:11 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-01-24 06:41:11 +0000
commit832fc4a1330f3e29e4df0118652ffdd9d1993056 (patch)
tree2539cace1617f908f1559d27475c1779e9cab18f
parent26c3d87db090c2f64cbd19818bd4ec6275303ac5 (diff)
downloadmaster-31e0f0ae-832fc4a1330f3e29e4df0118652ffdd9d1993056.tar.gz
master-31e0f0ae-832fc4a1330f3e29e4df0118652ffdd9d1993056.tar.bz2
master-31e0f0ae-832fc4a1330f3e29e4df0118652ffdd9d1993056.zip
2.6.38 supports xz ramdisks, too
SVN-Revision: 25080
-rw-r--r--Config.in4
-rw-r--r--include/kernel-defaults.mk1
2 files changed, 5 insertions, 0 deletions
diff --git a/Config.in b/Config.in
index f3db905f24..a634328074 100644
--- a/Config.in
+++ b/Config.in
@@ -43,6 +43,10 @@ menu "Target Images"
config TARGET_INITRAMFS_COMPRESSION_LZO
bool "lzo"
+
+ config TARGET_INITRAMFS_COMPRESSION_XZ
+ bool "xz"
+ depends LINUX_2_6_38
endchoice
comment "Root filesystem archives"
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 312664ab7a..210e279131 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -67,6 +67,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config
echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),CONFIG_INITRAMFS_COMPRESSION_LZMA=y\nCONFIG_RD_LZMA=y,# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set\n# CONFIG_RD_LZMA is not set)" >> $(LINUX_DIR)/.config
echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),CONFIG_INITRAMFS_COMPRESSION_LZO=y\nCONFIG_RD_LZO=y,# CONFIG_INITRAMFS_COMPRESSION_LZO is not set\n# CONFIG_RD_LZO is not set)" >> $(LINUX_DIR)/.config
+ echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),CONFIG_INITRAMFS_COMPRESSION_XZ=y\nCONFIG_RD_XZ=y,# CONFIG_INITRAMFS_COMPRESSION_XZ is not set\n# CONFIG_RD_XZ is not set)" >> $(LINUX_DIR)/.config
endef
else
define Kernel/SetInitramfs