old version maemo10

diff --git a/kernel-maemo-2.6.28/debian/changelog b/kernel-maemo-2.6.28/debian/changelog
index bf23ee0..ff40717 100644 (file)
--- a/kernel-maemo-2.6.28/debian/changelog
+++ b/kernel-maemo-2.6.28/debian/changelog
@@ -1,3 +1,13 @@
+kernel-maemo (2.6.28-maemo10) fremantle; urgency=low
+
+  * integrate mobile hotspot patches from
+    http://vcs.maemo.org/svn/mobilehotspot/trunk/patches/
+  * enable QoS and more netfilter modules for hotspot
+  * specify Provides for different enhancements
+  * remove fiasco-gen dependency and download the package directly
+
+ -- Thomas Tanner <tanner@maemory.com>  Wed, 17 Feb 2010 00:00:00 +0100
+
 kernel-maemo (2.6.28-maemo9) fremantle; urgency=low
 
   * switch package name due to some other broken package in extras-devel

diff --git a/kernel-maemo-2.6.28/debian/control b/kernel-maemo-2.6.28/debian/control
index ba20768..8d6d267 100644 (file)
--- a/kernel-maemo-2.6.28/debian/control
+++ b/kernel-maemo-2.6.28/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Thomas Tanner <tanner@maemory.com>
 XSBC-Original-Maintainer:  Yauheni Kaliuta <yauheni.kaliuta@nokia.com>
 XSBC-Bugtracker: mailto:tanner@maemory.com
-Build-Depends: debhelper (>= 4.0.0), fiasco-gen, quilt
+Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen
 Build-Depends-Indep: bzip2
 Standards-Version: 3.8.0
 
@@ -115,5 +115,9 @@ Description: Linux Kernel Headers for development
 Package: kernel-modules-maemo
 Architecture: armel
 Depends: module-init-tools (>= 3.3), kernel-maemo (= ${binary:Version})
+Provides: kernel-modules-netfilter, kernel-modules-ipv6, kernel-modules-ext4, kernel-modules-xfs, kernel-modules-reiserfs,
+  kernel-modules-nilfs2, kernel-modules-ntfs-read, kernel-modules-udf, kernel-modules-cifs, kernel-modules-automounter,
+  kernel-modules-unionfs, kernel-modules-crypto, kernel-modules-dmloop, kernel-modules-utf8, kernel-modules-mousejoy,
+  kernel-modules-usbip
 Description: Linux kernel modules
  This package provides kernel modules

diff --git a/kernel-maemo-2.6.28/debian/patches/iphb-matan.diff b/kernel-maemo-2.6.28/debian/patches/iphb-matan.diff
new file mode 100644 (file)
index 0000000..4142e6c
--- /dev/null
+++ b/kernel-maemo-2.6.28/debian/patches/iphb-matan.diff
@@ -0,0 +1,14 @@
+--- kernel-maemo-2.6.28.orig/net/ipv4/netfilter/iphb.c
++++ kernel-maemo-2.6.28/net/ipv4/netfilter/iphb.c
+@@ -276,6 +276,11 @@
+       tsk = tcp_sk(skb->sk);
+       tcp = tcp_hdr(skb);
+ 
++      if (! tcp || ! tsk) {
++              flush_keepalives(1);
++              return NF_ACCEPT;       
++      }
++
+       len -= hlen;           /* ip4/6 header len     */
+       len -= tcp->doff << 2; /* tcp header + options */
+ 

diff --git a/kernel-maemo-2.6.28/debian/patches/minstrel-aziwoqpa.diff b/kernel-maemo-2.6.28/debian/patches/minstrel-aziwoqpa.diff
new file mode 100644 (file)
index 0000000..e1d9180
--- /dev/null
+++ b/kernel-maemo-2.6.28/debian/patches/minstrel-aziwoqpa.diff
@@ -0,0 +1,11 @@
+--- kernel-maemo-2.6.28.orig/net/mac80211/rc80211_minstrel.c
++++ kernel-maemo-2.6.28/net/mac80211/rc80211_minstrel.c
+@@ -224,7 +224,7 @@
+       unsigned int sample_ndx;
+       sample_ndx = SAMPLE_TBL(mi, mi->sample_idx, mi->sample_column);
+       mi->sample_idx++;
+-      if (mi->sample_idx > (mi->n_rates - 2)) {
++      if (mi->n_rates == 1 || mi->sample_idx > (mi->n_rates - 2)) {
+               mi->sample_idx = 0;
+               mi->sample_column++;
+               if (mi->sample_column >= SAMPLE_COLUMNS)

diff --git a/kernel-maemo-2.6.28/debian/patches/series b/kernel-maemo-2.6.28/debian/patches/series
index d483688..ee81fc9 100644 (file)
--- a/kernel-maemo-2.6.28/debian/patches/series
+++ b/kernel-maemo-2.6.28/debian/patches/series
@@ -4,3 +4,5 @@ dm-loop.diff
 usbip.diff
 nilfs2-2.0.18.diff
 maemo-build.diff
+minstrel-aziwoqpa.diff
+iphb-matan.diff

diff --git a/kernel-maemo-2.6.28/debian/rules b/kernel-maemo-2.6.28/debian/rules
index 8ffadb2..44181dd 100644 (file)
--- a/kernel-maemo-2.6.28/debian/rules
+++ b/kernel-maemo-2.6.28/debian/rules
@@ -29,6 +29,7 @@ INCLUDE_HEADERS = acpi asm-generic asm-$(ARCH) config crypto drm Kbuild keys lin
 RM_SCRIPTS = bloat-o-meter show_delta
 DEBUG_MODULES = oprofile.ko
 MAKE += $(MAKEFLAGS)
+FIASCOURL = "http://repository.maemo.org/pool/fremantle/non-free/s/sdk-fiasco-gen/sdk-fiasco-gen_2.8.2.0.1+0m5_armel.deb"
 
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
     PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
@@ -110,8 +111,12 @@ install-kernel:
        dh_installdirs
 
        install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
+       #wget -Odebian/fiasco.deb $(FIASCOURL) && dpkg-deb -x debian/fiasco.deb debian/fiasco
+       #debian/fiasco/usr/bin/fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
+       #               -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE)
        fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
                        -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE)
+       #rm -rf debian/fiasco debian/fiasco.deb
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
 
 install-debug: install-modules

diff --git a/kernel-maemo-2.6.28/debian/rx51_defconfig b/kernel-maemo-2.6.28/debian/rx51_defconfig
index 6c914df..dad4c68 100644 (file)
--- a/kernel-maemo-2.6.28/debian/rx51_defconfig
+++ b/kernel-maemo-2.6.28/debian/rx51_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28maemo-omap1
-# Tue Feb 16 14:48:11 2010
+# Wed Feb 17 15:18:24 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -47,7 +47,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 # CONFIG_CGROUP_NS is not set
@@ -476,17 +476,20 @@ CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SIP=m
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
 CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT 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_DCCP is not set
@@ -494,7 +497,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
@@ -513,7 +516,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+CONFIG_NETFILTER_XT_MATCH_U32=m
 # CONFIG_IP_VS is not set
 
 #
@@ -529,13 +532,13 @@ CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_ECN is not set
 # CONFIG_IP_NF_MATCH_TTL is not set
 CONFIG_IP_NF_FILTER=m
-# CONFIG_IP_NF_TARGET_REJECT is not set
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
 # CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
-# CONFIG_IP_NF_TARGET_NETMAP is not set
+CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 # CONFIG_IP_NF_TARGET_IDLETIMER is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set
@@ -547,7 +550,10 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_SIP=m
-# CONFIG_IP_NF_MANGLE is not set
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
 # CONFIG_IP_NF_ARPTABLES is not set
@@ -590,7 +596,52 @@ CONFIG_IP6_NF_FILTER=m
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_RED is not set
+CONFIG_NET_SCH_SFQ=m
+# CONFIG_NET_SCH_TEQL is not set
+CONFIG_NET_SCH_TBF=m
+# CONFIG_NET_SCH_GRED is not set
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_INGRESS is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+# CONFIG_NET_CLS_ROUTE4 is not set
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+# CONFIG_NET_ACT_MIRRED is not set
+CONFIG_NET_ACT_IPT=m
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
@@ -836,6 +887,7 @@ CONFIG_DM_LOOP=m
 # CONFIG_DM_DELAY is not set
 # CONFIG_DM_UEVENT is not set
 CONFIG_NETDEVICES=y
+# CONFIG_IFB is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set