v33 final

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 5939291..8a70bc9 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -2,8 +2,10 @@ kernel-power (2.6.28-maemo33) fremantle; urgency=low
 
   * enable all v28 features again, except for OABI
    (commenting out features in configuration had no effect)
+  * add extra Netfilter connection tracking+mark modules
+  * fix for touchscreen calibration: disable automatic loading of mousedev module
 
- -- Thomas Tanner <maemo@tannerlab.com>  Tue, 18 May 2010 23:13:39 +0200
+ -- Thomas Tanner <maemo@tannerlab.com>  Wed, 19 May 2010 17:13:39 +0200
 
 kernel-power (2.6.28-maemo32) fremantle; urgency=low
 

diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 1fd66d1..6356bd5 100644 (file)
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -43,8 +43,6 @@ Description: Linux kernel updater for an enhanced Maemo 5 kernel 2.6.28.10
  Warning: Overclocking voids your warranty, may damage your device and is at your own risk!
  Overclocking is disabled by default and can be configured during runtime.
  .
- Known bugs: Touchscreen calibration (osso-applet-screencalibration) is incompatible
- with the enabled evdev modules. You need to use the stock Nokia kernel for calibration.
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABmJLR0QAAAAA
  AAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAwAAAAMADO

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 5b5f558..8683bd9 100644 (file)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -106,6 +106,8 @@ install-modules:
        dh_testroot
 
        mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)
+       mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d
+       echo blacklist mousedev > $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d/kernel-power
        for f in $$(find $(BUILDTMP) -name "*.ko"); do \
                install -c -m 644 $$f $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \
                strip --remove-section=.comment --remove-section=.note --strip-unneeded  $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \

diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
index 5975f46..69ea8f7 100644 (file)
--- a/kernel-power-2.6.28/debian/rx51power_defconfig
+++ b/kernel-power-2.6.28/debian/rx51power_defconfig
@@ -460,7 +460,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_NETLINK_LOG is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CONNTRACK_MARK is not set
+CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CT_PROTO_GRE=m
@@ -479,9 +479,9 @@ CONFIG_NF_CONNTRACK_SIP=m
 # CONFIG_NETFILTER_TPROXY is not set
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
@@ -490,8 +490,8 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set