Jaunty config changes: Build in ext[234]

[Andy Whitcroft]

On Sat, Dec 20, 2008 at 07:27:24PM -0700, Tim Gardner wrote:
> From 12b8c82eff1f085c4b4ac72d65b65ac83c68a364 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner at canonical.com>
> Date: Sat, 20 Dec 2008 10:45:40 -0700
> Subject: [PATCH] UBUNTU: Build in ext{234}
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>

That looks right compared to my machine here.

-apw

> ---
>  debian/config/amd64/config         |   14 +++++++-------
>  debian/config/i386/config          |   14 +++++++-------
>  debian/d-i/modules/fs-core-modules |    2 --
>  debian/d-i/package-list            |    4 ++--
>  4 files changed, 16 insertions(+), 18 deletions(-)
> 
> diff --git a/debian/config/amd64/config b/debian/config/amd64/config
> index e7a13b7..395200f 100644
> --- a/debian/config/amd64/config
> +++ b/debian/config/amd64/config
> @@ -446,7 +446,7 @@ CONFIG_CPU_SUP_CENTAUR_64=y
>  CONFIG_CPU_SUP_INTEL=y
>  CONFIG_CRAMFS=y
>  CONFIG_CRASH_DUMP=y
> -CONFIG_CRC16=m
> +CONFIG_CRC16=y
>  CONFIG_CRC32=y
>  CONFIG_CRC7=m
>  CONFIG_CRC_CCITT=m
> @@ -774,17 +774,17 @@ CONFIG_EUROTECH_WDT=m
>  CONFIG_EVENTFD=y
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_EXPORTFS=m
> -CONFIG_EXT2_FS=m
> +CONFIG_EXT2_FS=y
>  CONFIG_EXT2_FS_POSIX_ACL=y
>  CONFIG_EXT2_FS_SECURITY=y
>  CONFIG_EXT2_FS_XATTR=y
>  # CONFIG_EXT2_FS_XIP is not set
> -CONFIG_EXT3_FS=m
> +CONFIG_EXT3_FS=y
>  CONFIG_EXT3_FS_POSIX_ACL=y
>  CONFIG_EXT3_FS_SECURITY=y
>  CONFIG_EXT3_FS_XATTR=y
>  # CONFIG_EXT4DEV_COMPAT is not set
> -CONFIG_EXT4_FS=m
> +CONFIG_EXT4_FS=y
>  CONFIG_EXT4_FS_POSIX_ACL=y
>  CONFIG_EXT4_FS_SECURITY=y
>  CONFIG_EXT4_FS_XATTR=y
> @@ -913,7 +913,7 @@ CONFIG_FRAME_POINTER=y
>  CONFIG_FRAME_WARN=1024
>  CONFIG_FREEZER=y
>  CONFIG_FSAM7400=m
> -CONFIG_FS_MBCACHE=m
> +CONFIG_FS_MBCACHE=y
>  CONFIG_FS_POSIX_ACL=y
>  CONFIG_FS_UNIONFS=m
>  CONFIG_FTL=m
> @@ -1486,8 +1486,8 @@ CONFIG_IWLWIFI_RFKILL=y
>  CONFIG_IXGB=m
>  CONFIG_IXGBE=m
>  CONFIG_IXGBE_DCA=y
> -CONFIG_JBD=m
> -CONFIG_JBD2=m
> +CONFIG_JBD=y
> +CONFIG_JBD2=y
>  # CONFIG_JBD2_DEBUG is not set
>  # CONFIG_JBD_DEBUG is not set
>  CONFIG_JFFS2_CMODE_FAVOURLZO=y
> diff --git a/debian/config/i386/config b/debian/config/i386/config
> index 34a7589..c5c909f 100644
> --- a/debian/config/i386/config
> +++ b/debian/config/i386/config
> @@ -470,7 +470,7 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
>  CONFIG_CPU_SUP_UMC_32=y
>  CONFIG_CRAMFS=y
>  CONFIG_CRASH_DUMP=y
> -CONFIG_CRC16=m
> +CONFIG_CRC16=y
>  CONFIG_CRC32=y
>  CONFIG_CRC7=m
>  CONFIG_CRC_CCITT=m
> @@ -826,17 +826,17 @@ CONFIG_EVENTFD=y
>  CONFIG_EWRK3=m
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_EXPORTFS=m
> -CONFIG_EXT2_FS=m
> +CONFIG_EXT2_FS=y
>  CONFIG_EXT2_FS_POSIX_ACL=y
>  CONFIG_EXT2_FS_SECURITY=y
>  CONFIG_EXT2_FS_XATTR=y
>  # CONFIG_EXT2_FS_XIP is not set
> -CONFIG_EXT3_FS=m
> +CONFIG_EXT3_FS=y
>  CONFIG_EXT3_FS_POSIX_ACL=y
>  CONFIG_EXT3_FS_SECURITY=y
>  CONFIG_EXT3_FS_XATTR=y
>  # CONFIG_EXT4DEV_COMPAT is not set
> -CONFIG_EXT4_FS=m
> +CONFIG_EXT4_FS=y
>  CONFIG_EXT4_FS_POSIX_ACL=y
>  CONFIG_EXT4_FS_SECURITY=y
>  CONFIG_EXT4_FS_XATTR=y
> @@ -970,7 +970,7 @@ CONFIG_FRAME_POINTER=y
>  CONFIG_FRAME_WARN=1024
>  CONFIG_FREEZER=y
>  CONFIG_FSAM7400=m
> -CONFIG_FS_MBCACHE=m
> +CONFIG_FS_MBCACHE=y
>  CONFIG_FS_POSIX_ACL=y
>  CONFIG_FS_UNIONFS=m
>  CONFIG_FTL=m
> @@ -1566,8 +1566,8 @@ CONFIG_IWLWIFI_LEDS=y
>  CONFIG_IWLWIFI_RFKILL=y
>  CONFIG_IXGB=m
>  CONFIG_IXGBE=m
> -CONFIG_JBD=m
> -CONFIG_JBD2=m
> +CONFIG_JBD=y
> +CONFIG_JBD2=y
>  # CONFIG_JBD2_DEBUG is not set
>  # CONFIG_JBD_DEBUG is not set
>  CONFIG_JFFS2_CMODE_FAVOURLZO=y
> diff --git a/debian/d-i/modules/fs-core-modules b/debian/d-i/modules/fs-core-modules
> index 3e24960..1f245c4 100644
> --- a/debian/d-i/modules/fs-core-modules
> +++ b/debian/d-i/modules/fs-core-modules
> @@ -1,5 +1,3 @@
> -ext2
> -ext3
>  jfs
>  reiserfs
>  xfs
> diff --git a/debian/d-i/package-list b/debian/d-i/package-list
> index ecd5ad1..9ffe459 100644
> --- a/debian/d-i/package-list
> +++ b/debian/d-i/package-list
> @@ -31,10 +31,10 @@ Description: Floppy driver support
>  Package: fs-core-modules
>  Depends: kernel-image
>  Priority: standard
> -Provides: ext2-modules, ext3-modules, jfs-modules, reiserfs-modules, xfs-modules
> +Provides: jfs-modules, reiserfs-modules, xfs-modules
>  Provides_armel: jfs-modules, reiserfs-modules, xfs-modules
>  Description: Base filesystem modules
> - This includes ext2, ext3, jfs, reiserfs and xfs.
> + This includes jfs, reiserfs and xfs.
>  
>  Package: fs-secondary-modules
>  Depends: kernel-image, fat-modules

-apw