From: Thomas Tanner <maemo@tannerlab.com>
Date: Tue, 25 May 2010 21:09:19 +0000 (+0200)
Subject: v37
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=1eea1609511b17dd99460694aa430fff6444edf4;p=kernel-bfs

v37
---

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index cf329f7..c13dd1d 100644
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,17 @@
+kernel-power (2.6.28-maemo37) fremantle; urgency=low
+
+  * disable buitin extra network options from v28 due to possible side-effects
+  * remove system-update flag due to HAM problems
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Tue, 25 May 2010 23:07:37 +0200
+
+kernel-power (2.6.28-maemo36) fremantle; urgency=low
+
+  * deinstall warning
+  * reupload due to autobuilder issue
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Tue, 25 May 2010 18:01:59 +0200
+
 kernel-power (2.6.28-maemo35) fremantle; urgency=low
 
   * activate new wlan-monitor patch
diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 1564d16..710260c 100644
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -20,7 +20,6 @@ Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, ke
   kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp,
   kernel-feature-wlan-monitor
 XB-Maemo-Display-Name: Enhanced Linux kernel for power users
-XB-Maemo-Flags: system-update
 Description: Linux kernel updater for an enhanced Maemo 5 kernel 2.6.28.10
  This package will flash the kernel image upon installation.
  After the installation, you need to unplug the USB cable,
diff --git a/kernel-power-2.6.28/debian/kernel-power-deinstall b/kernel-power-2.6.28/debian/kernel-power-deinstall
index 07a841b..f4f89aa 100755
--- a/kernel-power-2.6.28/debian/kernel-power-deinstall
+++ b/kernel-power-2.6.28/debian/kernel-power-deinstall
@@ -4,6 +4,8 @@ cat > $tmp <<EOF
 This program will remove the enhanced power-user Linux kernel
 and restore the original Nokia kernel.
 The settings will be kept but will have no effect.
+Warning: This deinstallation method is currently experimental and could lead to a bricked device.
+For a safe but manual deinstallation method please visit http://wiki.maemo.org/Kernel_Power
 
 For the deinstallation please make sure that you are connected to
 the Internet and that Application Manager is not running.
diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
index 69ea8f7..b9d4a91 100644
--- a/kernel-power-2.6.28/debian/rx51power_defconfig
+++ b/kernel-power-2.6.28/debian/rx51power_defconfig
@@ -401,8 +401,8 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
@@ -675,7 +675,7 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_HCIH4P=m
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
-CONFIG_FIB_RULES=y
+# CONFIG_FIB_RULES is not set
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_NL80211=y