Patchwork [1/2] UBUNTU: [Config] armel/versatile: Set CRAMFS=m

login
register
mail settings
Submitter Loïc Minier
Date March 22, 2010, 10:17 a.m.
Message ID <1269253058-8131-1-git-send-email-loic.minier@ubuntu.com>
Download mbox | patch
Permalink /patch/48277/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Loïc Minier - March 22, 2010, 10:17 a.m.
Revert CRAMFS=y from 553a4be9cb569e6e895c892709163b5c5aaf7463 as support
for initramfses with very large kernels has been fixed in qemu-kvm and
initrds didn't work any better than initramfses anyway.

BugLink: http://bugs.launchpad.net/bugs/524893

Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
---
 debian.master/config/amd64/config.common.amd64 |    1 -
 debian.master/config/armel/config.common.armel |    1 -
 debian.master/config/config.common.ubuntu      |    1 +
 debian.master/config/i386/config.common.i386   |    1 -
 debian.master/config/lpia/config.common.lpia   |    1 -
 5 files changed, 1 insertions(+), 4 deletions(-)
Amit Kucheria - March 23, 2010, 9:08 a.m.
On 10 Mar 22, Loïc Minier wrote:
> Revert CRAMFS=y from 553a4be9cb569e6e895c892709163b5c5aaf7463 as support
> for initramfses with very large kernels has been fixed in qemu-kvm and
> initrds didn't work any better than initramfses anyway.
> 
> BugLink: http://bugs.launchpad.net/bugs/524893

Acked-by: Amit Kucheria <amit.kucheria@canonical.com>

> Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
> ---
>  debian.master/config/amd64/config.common.amd64 |    1 -
>  debian.master/config/armel/config.common.armel |    1 -
>  debian.master/config/config.common.ubuntu      |    1 +
>  debian.master/config/i386/config.common.i386   |    1 -
>  debian.master/config/lpia/config.common.lpia   |    1 -
>  5 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 110f377..b57c89f 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -20,7 +20,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DRM_RADEON=m
>  CONFIG_FB_BOOT_VESA_SUPPORT=y
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index 3103939..b2732af 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -12,7 +12,6 @@
>  # CONFIG_BT is not set
>  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
>  # CONFIG_CDROM_PKTCDVD is not set
> -CONFIG_CRAMFS=y
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index c1ab99e..bc2185e 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -611,6 +611,7 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
>  CONFIG_CPU_SUP_UMC_32=y
>  CONFIG_CPU_TLB_V7=y
>  CONFIG_CPU_V7=y
> +CONFIG_CRAMFS=m
>  CONFIG_CRASH_DUMP=y
>  CONFIG_CRC16=y
>  CONFIG_CRC32=y
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index feed603..9f6db3b 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -18,7 +18,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DRM_RADEON=m
>  CONFIG_FB_BOOT_VESA_SUPPORT=y
> diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
> index ca7f6d1..d7370f2 100644
> --- a/debian.master/config/lpia/config.common.lpia
> +++ b/debian.master/config/lpia/config.common.lpia
> @@ -19,7 +19,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
> -- 
> 1.7.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Stefan Bader - March 23, 2010, 9:11 a.m.
Ok, this keep it =m for all others and just will make it =m for versatile as well.

Loïc Minier wrote:
> Revert CRAMFS=y from 553a4be9cb569e6e895c892709163b5c5aaf7463 as support
> for initramfses with very large kernels has been fixed in qemu-kvm and
> initrds didn't work any better than initramfses anyway.
> 
> BugLink: http://bugs.launchpad.net/bugs/524893
> 
> Signed-off-by: Loïc Minier <loic.minier@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 |    1 -
>  debian.master/config/armel/config.common.armel |    1 -
>  debian.master/config/config.common.ubuntu      |    1 +
>  debian.master/config/i386/config.common.i386   |    1 -
>  debian.master/config/lpia/config.common.lpia   |    1 -
>  5 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 110f377..b57c89f 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -20,7 +20,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DRM_RADEON=m
>  CONFIG_FB_BOOT_VESA_SUPPORT=y
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index 3103939..b2732af 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -12,7 +12,6 @@
>  # CONFIG_BT is not set
>  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
>  # CONFIG_CDROM_PKTCDVD is not set
> -CONFIG_CRAMFS=y
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index c1ab99e..bc2185e 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -611,6 +611,7 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
>  CONFIG_CPU_SUP_UMC_32=y
>  CONFIG_CPU_TLB_V7=y
>  CONFIG_CPU_V7=y
> +CONFIG_CRAMFS=m
>  CONFIG_CRASH_DUMP=y
>  CONFIG_CRC16=y
>  CONFIG_CRC32=y
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index feed603..9f6db3b 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -18,7 +18,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DRM_RADEON=m
>  CONFIG_FB_BOOT_VESA_SUPPORT=y
> diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
> index ca7f6d1..d7370f2 100644
> --- a/debian.master/config/lpia/config.common.lpia
> +++ b/debian.master/config/lpia/config.common.lpia
> @@ -19,7 +19,6 @@ CONFIG_B44=m
>  CONFIG_BT=m
>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>  CONFIG_CDROM_PKTCDVD=y
> -CONFIG_CRAMFS=m
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
Stefan Bader - March 23, 2010, 12:55 p.m.
Applied both patches to Lucid master

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 110f377..b57c89f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -20,7 +20,6 @@  CONFIG_B44=m
 CONFIG_BT=m
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_CDROM_PKTCDVD=y
-CONFIG_CRAMFS=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DRM_RADEON=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 3103939..b2732af 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -12,7 +12,6 @@ 
 # CONFIG_BT is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set
-CONFIG_CRAMFS=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c1ab99e..bc2185e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -611,6 +611,7 @@  CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
+CONFIG_CRAMFS=m
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC16=y
 CONFIG_CRC32=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index feed603..9f6db3b 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -18,7 +18,6 @@  CONFIG_B44=m
 CONFIG_BT=m
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_CDROM_PKTCDVD=y
-CONFIG_CRAMFS=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DRM_RADEON=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index ca7f6d1..d7370f2 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -19,7 +19,6 @@  CONFIG_B44=m
 CONFIG_BT=m
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_CDROM_PKTCDVD=y
-CONFIG_CRAMFS=m
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"