[PATCH 2/4] UBUNTU: [Config] standardise CONFIG_RD_LZMA=y

Andy Whitcroft apw at canonical.com
Mon Jun 15 09:28:10 UTC 2009


Ensure we support LZMA format initramfs filesystems across all kernels.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian/config/amd64/config.common.amd64 |    2 --
 debian/config/armel/config.common.armel |    1 -
 debian/config/config.common.ubuntu      |    2 ++
 debian/config/i386/config.common.i386   |    2 --
 debian/config/lpia/config.common.lpia   |    1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/config/amd64/config.common.amd64 b/debian/config/amd64/config.common.amd64
index 047aece..03a36bb 100644
--- a/debian/config/amd64/config.common.amd64
+++ b/debian/config/amd64/config.common.amd64
@@ -539,7 +539,6 @@ CONFIG_DECNET=m
 CONFIG_DECNET_NF_GRABULATOR=m
 # CONFIG_DECNET_ROUTER is not set
 CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_BIC is not set
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_HTCP is not set
@@ -2266,7 +2265,6 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
 # CONFIG_REALTEK_PHY is not set
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
diff --git a/debian/config/armel/config.common.armel b/debian/config/armel/config.common.armel
index 75d53d7..e95427e 100644
--- a/debian/config/armel/config.common.armel
+++ b/debian/config/armel/config.common.armel
@@ -598,7 +598,6 @@ CONFIG_PROC_EVENTS=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
 CONFIG_REALTEK_PHY=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_BQ24022 is not set
diff --git a/debian/config/config.common.ubuntu b/debian/config/config.common.ubuntu
index 650c4f1..bec4393 100644
--- a/debian/config/config.common.ubuntu
+++ b/debian/config/config.common.ubuntu
@@ -49,6 +49,7 @@ CONFIG_CRYPTO_HW=y
 CONFIG_DAVICOM_PHY=m
 CONFIG_DCB=y
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -280,6 +281,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_QSEMI_PHY=m
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_RD_GZIP=y
+CONFIG_RD_LZMA=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_DS1511 is not set
diff --git a/debian/config/i386/config.common.i386 b/debian/config/i386/config.common.i386
index afb7fa4..8eaea8e 100644
--- a/debian/config/i386/config.common.i386
+++ b/debian/config/i386/config.common.i386
@@ -563,7 +563,6 @@ CONFIG_DECNET=m
 CONFIG_DECNET_NF_GRABULATOR=m
 # CONFIG_DECNET_ROUTER is not set
 CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_BIC is not set
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_HTCP is not set
@@ -2393,7 +2392,6 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
 # CONFIG_REALTEK_PHY is not set
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
diff --git a/debian/config/lpia/config.common.lpia b/debian/config/lpia/config.common.lpia
index c45c898..c84fe50 100644
--- a/debian/config/lpia/config.common.lpia
+++ b/debian/config/lpia/config.common.lpia
@@ -2159,7 +2159,6 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 # CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
 # CONFIG_REALTEK_PHY is not set
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
-- 
1.6.3.rc3.199.g24398





More information about the kernel-team mailing list