Update madde.patch - now working with last madde version

[kernel-power] / kernel-power-2.6.28 / debian / madde.patch

diff --git a/kernel-power-2.6.28/debian/madde.patch b/kernel-power-2.6.28/debian/madde.patch
index e6e05df..fda1fa3 100644 (file)
--- a/kernel-power-2.6.28/debian/madde.patch
+++ b/kernel-power-2.6.28/debian/madde.patch
@@ -1,5 +1,5 @@
 diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
-index ac43331..ec1431c 100644
+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
@@ -12,22 +12,32 @@ index ac43331..ec1431c 100644
  Standards-Version: 3.8.0
  
 diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
-index 95e3961..c5daf0e 100644
+index 469626f..43e30ca 100644
 --- a/kernel-power-2.6.28/debian/patches/series
 +++ b/kernel-power-2.6.28/debian/patches/series
-@@ -4,6 +4,7 @@ nokia-20100903+0m5.diff
- nokia-20101501+0m5.diff
+@@ -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 73ae638..6ff7473 100755
+index 934fb67..2298d52 100755
 --- a/kernel-power-2.6.28/debian/rules
 +++ b/kernel-power-2.6.28/debian/rules
-@@ -86,7 +86,10 @@ install-kernel:
+@@ -1,6 +1,9 @@
+ #!/usr/bin/make -f
+ #
+ 
++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
@@ -39,3 +49,35 @@ index 73ae638..6ff7473 100755
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
  
  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-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
+-ifeq ($(ARCH),arm)
+-      dh_strip -p$(HEADERS_PACKAGE)
+-endif
+       dh_compress -s
+       dh_fixperms -s --exclude /usr/src/kernel-headers
+       dh_installdeb -s