-diff --git kernel-power-2.6.28/debian/control kernel-power-2.6.28/debian/control
-index 9b9e930..578e377 100644
---- kernel-power-2.6.28/debian/control
-+++ kernel-power-2.6.28/debian/control
+diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
+index b4f0406..cd80594 100644
+--- a/kernel-power-2.6.28/debian/control
++++ b/kernel-power-2.6.28/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Pali Rohár <pali.rohar@gmail.com>
XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528
-Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils
+Build-Depends: debhelper (>= 4.0.0), quilt, libncurses5-dev, sharutils
+ Build-Depends-Indep: bzip2
Standards-Version: 3.8.0
- Package: kernel-power-flasher
-diff --git kernel-power-2.6.28/debian/patches/series kernel-power-2.6.28/debian/patches/series
-index 4ae2339..93a7c2d 100644
---- kernel-power-2.6.28/debian/patches/series
-+++ kernel-power-2.6.28/debian/patches/series
-@@ -35,3 +35,4 @@ l2cap_parent.patch
- wl12xx-rx-fix.diff
- vanilla-2.6.28-anti-io-stalling.patch
- joikuspot.diff
-+madde.patch
-diff --git kernel-power-2.6.28/debian/rules kernel-power-2.6.28/debian/rules
-index ec876fa..e6f0a1c 100755
---- kernel-power-2.6.28/debian/rules
-+++ kernel-power-2.6.28/debian/rules
-@@ -101,7 +101,10 @@ install-kernel:
- dh_installdirs
+diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
+index 469626f..43e30ca 100644
+--- a/kernel-power-2.6.28/debian/patches/series
++++ b/kernel-power-2.6.28/debian/patches/series
+@@ -9,6 +9,7 @@ nokia-20101501+0m5.diff
+ nokia-20103103+0m5.diff
+ #nokia-20103103+0m5_usb.diff
+ 2.6.28.10.diff
++madde.diff
+ rx51_defconfig.diff
+ unionfs-2.5.3.diff
+ dm-loop.diff
+diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
+index 934fb67..2298d52 100755
+--- a/kernel-power-2.6.28/debian/rules
++++ b/kernel-power-2.6.28/debian/rules
+@@ -1,6 +1,9 @@
+ #!/usr/bin/make -f
+ #
- install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
-- fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
++MADDE := $(shell ls $(HOME)/.madde/ | sort -n -r | head -n1)
++export PATH := $(HOME)/.madde/$(MADDE)/toolchains/arm-2007q3-51sb6-gdb71-arm-none-linux-gnueabi_linux_x86_64/bin:$(PATH)
++
+ RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/')
+ REVISION := $(shell echo "$(RELEASE)" | sed 's/.*\./\./')
+ EXTRAVERSION := EXTRAVERSION=$(REVISION)
+@@ -80,7 +83,10 @@ install-kernel:
+ dh_testdir
+ dh_testroot
+ mkdir -p $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
+- fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE)
+ 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
+ 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)
++ 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 $(KSRC)/arch/arm/boot/zImage -v $(RELEASE)
chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
-@@ -134,12 +137,12 @@ install-headers:
- dh_installdirs
+ install-bootimg:
+@@ -112,9 +118,9 @@ install-debug: install-modules
+ mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/lib/modules/$(RELEASE)
+ install -m644 $(KSRC)/vmlinux $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-$(RELEASE)
+ for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE) -name "*.ko"); do \
+- objcopy --only-keep-debug $$f $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f); \
+- strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
+- objcopy --add-gnu-debuglink $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
++ arm-none-linux-gnueabi-objcopy --only-keep-debug $$f $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f); \
++ arm-none-linux-gnueabi-strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
++ arm-none-linux-gnueabi-objcopy --add-gnu-debuglink $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
+ done
- install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-- install -p -o root -g root -m 644 $(BUILDTMP)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-- install -p -o root -g root -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-- install -p -o root -g root -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-- cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/auto.conf \
-+ install -p -m 644 $(BUILDTMP)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-+ install -p -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-+ install -p -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-+ cd $(BUILDTMP) && install -p -m 644 -D include/config/auto.conf \
- $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf
-- cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/kernel.release \
-+ cd $(BUILDTMP) && install -p -m 644 -D include/config/kernel.release \
- $(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' \
-@@ -238,9 +241,6 @@ endif
+ install-modules-debug: install-debug
+@@ -131,7 +137,7 @@ install-modules:
+ mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d
+ for f in $$(find $(KSRC) -name "*.ko"); do \
+ install -c -m644 $$f $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
+- strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
++ arm-none-linux-gnueabi-strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \
+ done
+ install -m644 $(CURDIR)/debian/kernel-power.blacklist $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d
+
+@@ -224,9 +230,6 @@ endif
+ dh_testroot
dh_installchangelogs -s
dh_installdocs -s
- dh_install -s
-ifeq ($(ARCH),arm)
- dh_strip -p$(HEADERS_PACKAGE)
-endif