From 7018fe0a81fa33c6d73d6296d25517b5d427d0a7 Mon Sep 17 00:00:00 2001 From: Enrico Butera Date: Wed, 20 Jul 2011 11:33:46 +0200 Subject: [PATCH] linux-omap 2.6.39: fix rootfs over nfs Import patch from [1] to fix mounting the rootfs over nfs. [1]: http://git.linux-nfs.org/?p=trondmy/nfs-2.6.git;a=commit;h=4251c94833aa516c1fc7a0f8f504a26eadd4b91e Tested-by: Enrico Butera Signed-off-by: Koen Kooi --- ...1-NFS-Revert-NFSROOT-default-mount-options.patch | 13 +++++++++++++ recipes-kernel/linux/linux-omap_2.6.39.bb | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-omap-2.6.39/net/0001-NFS-Revert-NFSROOT-default-mount-options.patch diff --git a/recipes-kernel/linux/linux-omap-2.6.39/net/0001-NFS-Revert-NFSROOT-default-mount-options.patch b/recipes-kernel/linux/linux-omap-2.6.39/net/0001-NFS-Revert-NFSROOT-default-mount-options.patch new file mode 100644 index 00000000..617698da --- /dev/null +++ b/recipes-kernel/linux/linux-omap-2.6.39/net/0001-NFS-Revert-NFSROOT-default-mount-options.patch @@ -0,0 +1,13 @@ +diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c +index c541093..c4744e1 100644 +--- a/fs/nfs/nfsroot.c ++++ b/fs/nfs/nfsroot.c +@@ -87,7 +87,7 @@ + #define NFS_ROOT "/tftpboot/%s" + + /* Default NFSROOT mount options. */ +-#define NFS_DEF_OPTIONS "udp" ++#define NFS_DEF_OPTIONS "vers=2,udp,rsize=4096,wsize=4096" + + /* Parameters passed from the kernel command line */ + static char nfs_root_parms[256] __initdata = ""; diff --git a/recipes-kernel/linux/linux-omap_2.6.39.bb b/recipes-kernel/linux/linux-omap_2.6.39.bb index 10a2426c..c92846d7 100644 --- a/recipes-kernel/linux/linux-omap_2.6.39.bb +++ b/recipes-kernel/linux/linux-omap_2.6.39.bb @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc SRCREV_pn-${PN} = "v2.6.39" -MACHINE_KERNEL_PR_append = "m" +MACHINE_KERNEL_PR_append = "n" FILESPATHPKG_prepend = "linux-omap-2.6.39:" @@ -113,6 +113,8 @@ SRC_URI_append = " \ file://mfd/0013-MFD-TWL4030-optimizing-resource-configuration.patch \ \ file://musb/0001-usb-musb-Enable-DMA-mode1-RX-for-USB-Mass-Storage.patch \ + \ + file://net/0001-NFS-Revert-NFSROOT-default-mount-options.patch \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \