Fixed JoikuSpot patch

Fixed using fiasco-gen with madde
Updated debian/changelog
Changed version suffix to 'pali'

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 6c3ff37..3827256 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,11 @@
+kernel-power (2.6.28-pali1) fremantle; urgency=low
+
+  * enabled additional kernel modules (for usb host mode)
+  * backported bq27x00_battery patch
+  * some patches from kernel-power bugtracker
+
+ -- Pali Rohár <pali.rohar@gmail.com>  Sat, 16 Apr 2011 08:21:47 +0200
+
 kernel-power (2.6.28-maemo46) fremantle; urgency=low
 
   * disable u-boot as causes too much trouble

diff --git a/kernel-power-2.6.28/debian/patches/joikuspot.diff b/kernel-power-2.6.28/debian/patches/joikuspot.diff
index 6d7f79c..f67bb55 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/joikuspot.diff
+++ b/kernel-power-2.6.28/debian/patches/joikuspot.diff
@@ -1,11 +1,14 @@
 --- kernel-power-2.6.28/drivers/misc/Makefile  2011-04-16 03:01:15.000000000 +0200
 +++ kernel-power-2.6.28/drivers/misc/Makefile  2011-04-16 03:01:45.000000000 +0200
-@@ -33,3 +33,5 @@ obj-$(CONFIG_SGI_XP)         += sgi-xp/
- obj-$(CONFIG_SGI_GRU)         += sgi-gru/
- obj-$(CONFIG_HP_ILO)          += hpilo.o
- obj-$(CONFIG_C2PORT)          += c2port/
-+
+@@ -3,6 +3,8 @@
+ #
+ obj- := misc.o        # Dummy rule to force built-in.o to be made
+ 
 +obj-m += JoikuSpot_Bouncer.o
++
+ obj-$(CONFIG_IBM_ASM)         += ibmasm/
+ obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
+ obj-$(CONFIG_OMAP_STI)                += sti/
 --- kernel-power-2.6.28/drivers/misc/JoikuSpot_Bouncer.c       2011-04-15 15:30:29.223356000 +0200
 +++ kernel-power-2.6.28/drivers/misc/JoikuSpot_Bouncer.c       2011-04-16 03:00:40.000000000 +0200
 @@ -0,0 +1,196 @@

diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
index 25eceeb..a11d92d 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@ -21,12 +21,12 @@ mmcnames-fanoush.diff
 gethercharge.diff
 ondemand-avoid.diff
 overclock.diff
+arm-proc-v7.diff
 armthumb.diff
 wl12xx_rohar.diff
 fmtx.unlock.diff
 radio-bcm2048.diff
 i2c-battery.diff
-usbhostmode.diff
 bt-mice.diff
 board-rx51-peripherals.patch
 bq27x00_battery.patch

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 0ac1459..c497ec7
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -3,7 +3,7 @@
 
 WEEK := $(shell date +%Y%W)
 RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10power\2/')
+REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-pali\(.*\)/.10pali\2/')
 EXTRAVERSION := EXTRAVERSION=$(REVISION)
 
 PACKAGE := kernel

diff --git a/kernel-power-2.6.28/madde.patch b/kernel-power-2.6.28/madde.patch
index d90e3b9..8e8fd86 100644 (file)
--- a/kernel-power-2.6.28/madde.patch
+++ b/kernel-power-2.6.28/madde.patch
@@ -11,18 +11,19 @@
  Package: kernel-power-flasher
 --- kernel-power-2.6.28/debian/rules   2011-04-16 03:24:39.000000000 +0200
 +++ kernel-power-2.6.28/debian/rules   2011-04-16 03:34:38.000000000 +0200
-@@ -96,7 +96,9 @@ install-kernel:
+@@ -96,7 +96,10 @@ install-kernel:
        dh_installdirs
  
        install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
 -      fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
 +      test -f sdk-fiasco-gen_2.8.2.0.1+0m5_i386.deb || wget http://repository.maemo.org/pool/fremantle/non-free/s/sdk-fiasco-gen/sdk-fiasco-gen_2.8.2.0.1+0m5_i386.deb
-+      test -f fiasco-gen || dpkg --fsys-tarfile sdk-fiasco-gen_2.8.2.0.1+0m5_i386.deb | tar -xv ./usr/bin/fiasco-gen -O > fiasco-gen; chmod 755 fiasco-gen
++      ar x sdk-fiasco-gen_2.8.2.0.1+0m5_i386.deb data.tar.gz
++      tar -xf data.tar.gz ./usr/bin/fiasco-gen -O > fiasco-gen; chmod +x fiasco-gen
 +      ./fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
                        -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
  
-@@ -125,12 +127,12 @@ install-headers:
+@@ -125,12 +128,12 @@ install-headers:
        dh_installdirs
  
        install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
@@ -40,7 +41,7 @@
                $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/kernel.release
        cd $(KSRC) && \
                find arch/$(ARCH) $(foreach dir,$(INCLUDE_HEADERS),include/$(dir)) -name '*.h' \
-@@ -229,9 +231,6 @@ endif
+@@ -229,9 +232,6 @@ endif
        dh_installchangelogs -s
        dh_installdocs -s
        dh_install -s