Patchwork [2/2] UBUNTU: [Config] Sync fs with master (AUFS, CODA, EXT2, LOGFS and NFS)

login
register
mail settings
Submitter Paolo Pisati
Date April 2, 2012, 2:29 p.m.
Message ID <1333376951-10504-3-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/150165/
State New
Headers show

Comments

Paolo Pisati - April 2, 2012, 2:29 p.m.
For more information and out of sync options, see here:
https://wiki.ubuntu.com/KernelTeam/Specs/PreciseKernelConfigReviewBeta2omap4

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.ti-omap4/config/config.common.ubuntu |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
Andy Whitcroft - April 2, 2012, 4:16 p.m.
On Mon, Apr 02, 2012 at 04:29:11PM +0200, Paolo Pisati wrote:
> For more information and out of sync options, see here:
> https://wiki.ubuntu.com/KernelTeam/Specs/PreciseKernelConfigReviewBeta2omap4
> 
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> ---
>  debian.ti-omap4/config/config.common.ubuntu |   20 +++++++++-----------
>  1 files changed, 9 insertions(+), 11 deletions(-)
> 
> -CONFIG_EXT2_FS=y
> +CONFIG_EXT2_FS=m

Can I just confirm we did not make this =y for arm deliberatly to cope
with someone replacing the kernel they are already running and that
kernel being stored on ext2 in the firmware flash partition?

-apw
Paolo Pisati - April 2, 2012, 6:46 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/02/2012 06:16 PM, Andy Whitcroft wrote:
>> 
>> -CONFIG_EXT2_FS=y +CONFIG_EXT2_FS=m
> 
> Can I just confirm we did not make this =y for arm deliberatly to
> cope with someone replacing the kernel they are already running and
> that kernel being stored on ext2 in the firmware flash partition?

nope, that's the vfat (+ iso codes) stuff, this one comes straight
from natty.

- -- 
bye,
p.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPefP0AAoJEJdscTmfuQbQWqkP+gKi411gyBxJXDZFZDm+ILL8
7rdc3wovTnh+C+NsHfzKrP+oocn9DHM+mHTk3RV8ZGx2IPJ35jpiyF8gQtsiCcb3
kkAqwrtPD9Jezcovo4PLPYZX6A/xGaWIt2K1iD9cVqHLyU/9EzLfqTtQyXE0UDzR
x/GC6uzLtxjsiLwLCGfP9fFvFg7g2zU5ukJGAUsuwp0+fGc8/45XfxF+JHLo4LAg
UVeUDkxqAGPfg6vMMY49bq+xX2se1JXN5LuvjFmvUKSsvm5aw3vFXtDozg3Jkn6P
fR6QdikPTaTwBa3wnyMWWwHg4ZQiPEGaCwxWSk5AIGRMeSdJB/moraAFbP7CvGoO
rU33CboWPhdlGytNv5i3+CpntXOsIKu65cCgFH+9yZAxYS8leEudJTH7PXzlQG65
NfWoCuy0qLex56wOZR9BBPxkT286GCeZM3v37KdUsh9H2oUPCvSxKly9Fk4ObOEk
UZMEK+nimQS/F6xQABr6F/Y2OY1X9F4z/Vg+TjY8KEiVBaudD3nZmgIIAlHoZ86f
GffTCZluvd0AqyfR5UShwbdsFYpnn/aNweG2o6k6P1UxmA3UFBlDFd+Eo6480wVO
OfLehEpLw0btw78BaJnpxbwQhPMhk3jgg20HlWZktEKbAIQqlrRDEIuZNOezGSrV
Nf+9vEzo/MgzTdItbP+2
=tFGV
-----END PGP SIGNATURE-----

Patch

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 44bd4df..4023d09 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -252,7 +252,7 @@  CONFIG_AUFS_BR_HFSPLUS=y
 CONFIG_AUFS_BR_RAMFS=y
 # CONFIG_AUFS_DEBUG is not set
 # CONFIG_AUFS_EXPORT is not set
-CONFIG_AUFS_FS=y
+CONFIG_AUFS_FS=m
 # CONFIG_AUFS_HNOTIFY is not set
 CONFIG_AUFS_POLL=y
 # CONFIG_AUFS_PROC_MAP is not set
@@ -402,7 +402,6 @@  CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BT=m
-CONFIG_BTREE=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_BT_ATH3K=m
@@ -536,7 +535,7 @@  CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootwait mem=1G"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CODA_FS is not set
+CONFIG_CODA_FS=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_CONFIGFS_FS=m
@@ -938,7 +937,7 @@  CONFIG_EXOFS_FS=m
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
 CONFIG_EXPORTFS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
@@ -1802,12 +1801,12 @@  CONFIG_LLC2=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCAL_TIMERS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_LOCK_STAT is not set
-CONFIG_LOGFS=m
+# CONFIG_LOGFS is not set
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -2301,9 +2300,9 @@  CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -2722,7 +2721,6 @@  CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
 CONFIG_ROMFS_FS=m
 CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_ROOT_NFS=y
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPS=y
@@ -3292,8 +3290,8 @@  CONFIG_STOP_MACHINE=y
 CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y