[oe-commits] Martin Jansa : linux-nokia900-meego: update defconfig to build at least kernel-module-tun

[git version control]

Module: openembedded.git
Branch: master
Commit: 5ca8109054ecec16dc7791fb4521cbea8815a7fc
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=5ca8109054ecec16dc7791fb4521cbea8815a7fc

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Jul 19 14:28:25 2011 +0200

linux-nokia900-meego: update defconfig to build at least kernel-module-tun

* some people like me are using openvpn with tun/tap
* it was removed in 6a65a05de26f7875ea0cc0d03f09c14c4d151ad2

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/nokia900.conf                   |    2 +-
 recipes/linux/linux-nokia900-meego/defconfig |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index d897141..4b40092 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -118,4 +118,4 @@ module_autoload_hsi-char = "hsi-char"
 # Copied from include/omap3.inc (as we do not use linux-omap recipes):
 #
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r64"
+MACHINE_KERNEL_PR = "r65"
diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig
index 0889c2a..6ee3e00 100644
--- a/recipes/linux/linux-nokia900-meego/defconfig
+++ b/recipes/linux/linux-nokia900-meego/defconfig
@@ -24,7 +24,6 @@ CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_CFQ_GROUP_IOSCHED=y
@@ -64,7 +63,7 @@ CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rw console=ttyO2,115200n8 console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2"
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rw console=ttyO2,115200n8 console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 quiet"
 CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -106,7 +105,6 @@ CONFIG_CFG80211=m
 CONFIG_LIB80211=m
 CONFIG_MAC80211=m
 CONFIG_RFKILL=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_CONNECTOR=y
@@ -128,6 +126,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_MISC_DEVICES=y
 CONFIG_CMT=m
 CONFIG_NETDEVICES=y
+CONFIG_TUN=m
 CONFIG_PHYLIB=m
 CONFIG_SMSC_PHY=m
 CONFIG_NET_ETHERNET=y
@@ -276,6 +275,7 @@ CONFIG_FUSE_FS=m
 CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UBIFS_FS=m
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=m