| Message ID | 4B6349D1.3010204@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Bader |
| Headers | show |
On Fri, 2010-01-29 at 12:49 -0800, John Johansen wrote: > The following changes since commit 475a6aad6a68257e80c60fa8bbc0b47f02184c77: > Stefan Bader (1): > UBUNTU: Ubuntu-2.6.31-303.9 > > are available in the git repository at: > > git://kernel.ubuntu.com/jj/uec-karmic.git ec2 > > John Johansen (1): > UBUNTU: [Config] enable ext4 and block loop > > debian.ec2/config/amd64/config.flavour.ec2 | 4 ++++ > debian.ec2/config/config.common.ubuntu | 8 ++++---- > debian.ec2/config/i386/config.common.i386 | 4 ++++ > 3 files changed, 12 insertions(+), 4 deletions(-) Looks to only affect ec2. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Ok, won't have impact on the main tree and looks sane. Acked-by: Stefan Bader <stefan.bader@canonical.com> John Johansen wrote: > The following changes since commit 475a6aad6a68257e80c60fa8bbc0b47f02184c77: > Stefan Bader (1): > UBUNTU: Ubuntu-2.6.31-303.9 > > are available in the git repository at: > > git://kernel.ubuntu.com/jj/uec-karmic.git ec2 > > John Johansen (1): > UBUNTU: [Config] enable ext4 and block loop > > debian.ec2/config/amd64/config.flavour.ec2 | 4 ++++ > debian.ec2/config/config.common.ubuntu | 8 ++++---- > debian.ec2/config/i386/config.common.i386 | 4 ++++ > 3 files changed, 12 insertions(+), 4 deletions(-) >
That was applied and test build during the sprint. Is pushed too.
diff --git a/debian.ec2/config/amd64/config.flavour.ec2 b/debian.ec2/config/amd64/config.flavour.ec2 index e25820e..2206b9a 100644 --- a/debian.ec2/config/amd64/config.flavour.ec2 +++ b/debian.ec2/config/amd64/config.flavour.ec2 @@ -1,3 +1,7 @@ # # Config options for config.flavour.ec2 automatically generated by splitconfig.pl # +CONFIG_BLK_DEV_LOOP=y +CONFIG_CRC16=y +CONFIG_EXT4_FS=y +CONFIG_JBD2=y diff --git a/debian.ec2/config/config.common.ubuntu b/debian.ec2/config/config.common.ubuntu index 29b669b..e06732c 100644 --- a/debian.ec2/config/config.common.ubuntu +++ b/debian.ec2/config/config.common.ubuntu @@ -219,7 +219,6 @@ CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y @@ -371,7 +370,6 @@ CONFIG_CPU_SUP_CYRIX_32=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CRAMFS=y -CONFIG_CRC16=m CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_CRC_CCITT=m @@ -642,7 +640,10 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT4_FS is not set +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_FS_XATTR=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set CONFIG_FAIR_GROUP_SCHED=y @@ -1240,7 +1241,6 @@ CONFIG_ITCO_WDT=m CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_JBD=y -CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set # CONFIG_JBD_DEBUG is not set CONFIG_JFFS2_CMODE_FAVOURLZO=y diff --git a/debian.ec2/config/i386/config.common.i386 b/debian.ec2/config/i386/config.common.i386 index af745e7..a255418 100644 --- a/debian.ec2/config/i386/config.common.i386 +++ b/debian.ec2/config/i386/config.common.i386 @@ -6,11 +6,15 @@ CONFIG_ACPI_BLACKLIST_YEAR=2000 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_ASYNC_TX_DMA=y # CONFIG_AUDIT_ARCH is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_CRC16=y +CONFIG_EXT4_FS=y # CONFIG_GENERIC_CPU is not set # CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_HAVE_AOUT=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_JBD2=y CONFIG_KTIME_SCALAR=y CONFIG_M686=y CONFIG_OUTPUT_FORMAT="elf32-i386"
The following changes since commit 475a6aad6a68257e80c60fa8bbc0b47f02184c77: Stefan Bader (1): UBUNTU: Ubuntu-2.6.31-303.9 are available in the git repository at: git://kernel.ubuntu.com/jj/uec-karmic.git ec2 John Johansen (1): UBUNTU: [Config] enable ext4 and block loop debian.ec2/config/amd64/config.flavour.ec2 | 4 ++++ debian.ec2/config/config.common.ubuntu | 8 ++++---- debian.ec2/config/i386/config.common.i386 | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-)