diff options
12 files changed, 27 insertions, 18 deletions
diff --git a/debian.linaro/abi/2.6.38-1000.1/modules.ignore b/debian.linaro/abi/2.6.38-1000.1/modules.ignore index e5cbf919044..8ed7970cd69 100644 --- a/debian.linaro/abi/2.6.38-1000.1/modules.ignore +++ b/debian.linaro/abi/2.6.38-1000.1/modules.ignore @@ -1,2 +1,9 @@ -sctp_probe +auth_rpcgss +des_generic +lockd +nfs +nfs_acl panel-acx565akm +rpcsec_gss_krb5 +sctp_probe +sunrpc diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51 index 6e6bbacbd30..6f4da3d1673 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-mx51 +++ b/debian.linaro/config/armel/config.flavour.linaro-mx51 @@ -209,7 +209,6 @@ CONFIG_IOSCHED_CFQ=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_MULTICAST is not set -CONFIG_IP_PNP=y # CONFIG_IP_SCTP is not set # CONFIG_ISDN is not set # CONFIG_JFFS2_FS is not set @@ -378,7 +377,7 @@ CONFIG_RELAY=y # CONFIG_RFD_FTL is not set # CONFIG_RFKILL is not set # CONFIG_ROMFS_FS is not set -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_DS1286 is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap index 3fa26928ae8..bec7d796de6 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-omap +++ b/debian.linaro/config/armel/config.flavour.linaro-omap @@ -80,7 +80,7 @@ CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_GCM=m @@ -225,7 +225,6 @@ CONFIG_IPX=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_DCCP=m CONFIG_IP_MULTICAST=y -# CONFIG_IP_PNP is not set CONFIG_IP_SCTP=m CONFIG_ISDN=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y @@ -429,7 +428,7 @@ CONFIG_RELAY=y CONFIG_RFD_FTL=m CONFIG_RFKILL=m CONFIG_ROMFS_FS=m -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_RPCSEC_GSS_KRB5=y CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS1286=m diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310 index 709e27af29d..1053c528710 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 +++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310 @@ -214,7 +214,6 @@ CONFIG_IOSCHED_CFQ=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_MULTICAST is not set -CONFIG_IP_PNP=y # CONFIG_IP_SCTP is not set # CONFIG_ISDN is not set # CONFIG_JFFS2_FS is not set @@ -403,7 +402,7 @@ CONFIG_RELAY=y # CONFIG_RFD_FTL is not set # CONFIG_RFKILL is not set # CONFIG_ROMFS_FS is not set -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_DS1286 is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500 index 7f1318e8fb5..32b08788d37 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-u8500 +++ b/debian.linaro/config/armel/config.flavour.linaro-u8500 @@ -219,7 +219,6 @@ CONFIG_IOSCHED_CFQ=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_MULTICAST is not set -CONFIG_IP_PNP=y # CONFIG_IP_SCTP is not set # CONFIG_ISDN is not set # CONFIG_JFFS2_FS is not set @@ -414,7 +413,7 @@ CONFIG_RELAY=y # CONFIG_RFD_FTL is not set # CONFIG_RFKILL is not set # CONFIG_ROMFS_FS is not set -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_DS1286 is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress index 733f2dd86ab..02309e13ef6 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-vexpress +++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress @@ -214,7 +214,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_MULTICAST is not set -CONFIG_IP_PNP=y # CONFIG_IP_SCTP is not set # CONFIG_ISDN is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index afa0e4581a4..456b628c01a 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1200,6 +1200,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y +CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_RARP is not set @@ -1434,7 +1435,7 @@ CONFIG_LLC2=m CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCAL_TIMERS=y -CONFIG_LOCKD=m +CONFIG_LOCKD=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_LOCKD_V4=y # CONFIG_LOCKUP_DETECTOR is not set @@ -1835,10 +1836,9 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y -CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y -CONFIG_NFS_FS=m -CONFIG_NFS_FSCACHE=y +CONFIG_NFS_FS=y CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_LEGACY_DNS is not set # CONFIG_NFS_USE_NEW_IDMAPPER is not set @@ -2088,6 +2088,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y # CONFIG_ROMFS_BACKED_BY_BOTH is not set # CONFIG_ROMFS_BACKED_BY_MTD is not set CONFIG_ROMFS_ON_BLOCK=y +CONFIG_ROOT_NFS=y CONFIG_ROSE=m CONFIG_RPS=y CONFIG_RT2500USB=m @@ -2558,8 +2559,8 @@ CONFIG_STP=m CONFIG_STRICT_DEVMEM=y # CONFIG_STRIP_ASM_SYMS is not set CONFIG_ST_BT=m -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y CONFIG_SUN_PARTITION=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 b/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 index 5b91dd22b9f..00336967809 100644 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 +++ b/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 @@ -1 +1,2 @@ fs-secondary-modules +nfs-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-omap b/debian.linaro/d-i/exclude-modules.armel-linaro-omap new file mode 100644 index 00000000000..00336967809 --- /dev/null +++ b/debian.linaro/d-i/exclude-modules.armel-linaro-omap @@ -0,0 +1,2 @@ +fs-secondary-modules +nfs-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 b/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 index a2b8c17c6c4..127554b3ffd 100644 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 +++ b/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 @@ -1,3 +1,4 @@ -squashfs-modules fs-secondary-modules +nfs-modules +squashfs-modules vlan-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 b/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 index 5b91dd22b9f..00336967809 100644 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 +++ b/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 @@ -1 +1,2 @@ fs-secondary-modules +nfs-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress b/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress index a3a46940c89..965e72939c9 100644 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress +++ b/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress @@ -1,2 +1,3 @@ mouse-modules +nfs-modules fs-secondary-modules |