From: Thomas Tanner <maemo@tannerlab.com>
Date: Wed, 19 May 2010 15:54:58 +0000 (+0200)
Subject: v34
X-Git-Url: http://vcs.maemo.org/git/?p=kernel-bfs;a=commitdiff_plain;h=cc3158e0128779263d02ef2f7fae31021581ec39

v34
---

diff --git a/kernel-power-2.6.28/debian/28.diff b/kernel-power-2.6.28/debian/28.diff
deleted file mode 100644
index d5a88f5..0000000
--- a/kernel-power-2.6.28/debian/28.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- rx51power_defconfig	2010-05-17 07:47:34.000000000 +0200
-+++ rx51power_defconfig.d	2010-05-16 22:42:40.000000000 +0200
-@@ -403,8 +403,8 @@
- CONFIG_ASK_IP_FIB_HASH=y
- # CONFIG_IP_FIB_TRIE is not set
- CONFIG_IP_FIB_HASH=y
--# CONFIG_IP_MULTIPLE_TABLES is not set
--# CONFIG_IP_ROUTE_MULTIPATH is not set
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
- # CONFIG_IP_ROUTE_VERBOSE is not set
- CONFIG_IP_PNP=y
- CONFIG_IP_PNP_DHCP=y
-@@ -677,6 +677,7 @@
- CONFIG_BT_HCIH4P=m
- # CONFIG_BT_HCIVHCI is not set
- # CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
- CONFIG_WIRELESS=y
- CONFIG_CFG80211=y
- CONFIG_NL80211=y
-@@ -1816,7 +1823,7 @@
- # MMC/SD/SDIO Card Drivers
- #
- CONFIG_MMC_BLOCK=m
--# CONFIG_MMC_BLOCK_BOUNCE is not set
-+CONFIG_MMC_BLOCK_BOUNCE=y
- # CONFIG_SDIO_UART is not set
- # CONFIG_MMC_TEST is not set
- 
diff --git a/kernel-power-2.6.28/debian/blacklist b/kernel-power-2.6.28/debian/blacklist
new file mode 100644
index 0000000..f1381e1
--- /dev/null
+++ b/kernel-power-2.6.28/debian/blacklist
@@ -0,0 +1 @@
+blacklist mousedev
diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 8a70bc9..396802e 100644
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,10 @@
+kernel-power (2.6.28-maemo34) fremantle; urgency=low
+
+  * install blacklist properly
+  * control: remove OABI
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Wed, 19 May 2010 17:54:12 +0200
+
 kernel-power (2.6.28-maemo33) fremantle; urgency=low
 
   * enable all v28 features again, except for OABI
diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 6356bd5..710260c 100644
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -38,7 +38,7 @@ Description: Linux kernel updater for an enhanced Maemo 5 kernel 2.6.28.10
  unionfs, device mapper and dm-loop, cryptography, cryptoloop,
  EFI partitions, UTF8 codepages, mouse+joystick input, PPP, PPTP,
  serial support, USB/IP and generic USB device drivers, battery info,
- WLAN monitoring, OABI, overclocking and kexec support.
+ WLAN monitoring, overclocking and kexec support.
  .
  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.
diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.install b/kernel-power-2.6.28/debian/kernel-power-modules.install
new file mode 100644
index 0000000..3bf3837
--- /dev/null
+++ b/kernel-power-2.6.28/debian/kernel-power-modules.install
@@ -0,0 +1 @@
+debian/blacklist /etc/modprobe.d
diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 8683bd9..5b5f558 100644
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -106,8 +106,6 @@ 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); \