projects / kernel-power / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 2d06a8b..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,66 +12,71 @@ 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 ae7e212..b7c7b20 100644
+index 469626f..43e30ca 100644
 --- a/kernel-power-2.6.28/debian/patches/series
 +++ b/kernel-power-2.6.28/debian/patches/series
-@@ -6,6 +6,7 @@ nokia-20103103+0m5.diff
+@@ -9,6 +9,7 @@ nokia-20101501+0m5.diff
+ nokia-20103103+0m5.diff
+ #nokia-20103103+0m5_usb.diff
  2.6.28.10.diff
- rx51_defconfig.diff
- maemo-build.diff
 +madde.diff
+ rx51_defconfig.diff
  unionfs-2.5.3.diff
  dm-loop.diff
- usbip.diff
 diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
-index 37b6a9f..f046899 100755
+index 934fb67..2298d52 100755
 --- a/kernel-power-2.6.28/debian/rules
 +++ b/kernel-power-2.6.28/debian/rules
-@@ -108,7 +108,10 @@ install-kernel:
-       dh_installdirs
+@@ -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
  
-@@ -170,12 +173,12 @@ install-headers:
-       dh_installdirs
- 
-       install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
--      install -p -o root -g root -m 644 $(KSRC)/.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 $(KSRC)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
--      cd $(KSRC) && install -p -o root -g root -m 644 -D include/config/auto.conf \
-+      install -p -m 644 $(KSRC)/.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 $(KSRC)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-+      cd $(KSRC) && install -p -m 644 -D include/config/auto.conf \
-               $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf
--      cd $(KSRC) && install -p -o root -g root -m 644 -D include/config/kernel.release \
-+      cd $(KSRC) && 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' \
-@@ -220,7 +223,7 @@ install-indep:
-       dh_testdir
-       dh_testroot
+ 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 -p -d -o root -g root -m 755 debian/$(SOURCE_PACKAGE)/usr/src
-+      install -p -d -m 755 debian/$(SOURCE_PACKAGE)/usr/src
-       install -m 644 $(BUILDTMP)/$(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 debian/$(SOURCE_PACKAGE)/usr/src
+ 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
  
- install-arch: build-arch install-kernel install-bootimg install-flasher install-modules install-debug install-modules-debug install-headers install-libc-headers
-@@ -267,9 +270,7 @@ endif
+@@ -224,9 +230,6 @@ endif
        dh_testroot
        dh_installchangelogs -s
        dh_installdocs -s
 -ifeq ($(ARCH),arm)
-       dh_strip -p$(HEADERS_PACKAGE)
+-      dh_strip -p$(HEADERS_PACKAGE)
 -endif
        dh_compress -s
        dh_fixperms -s --exclude /usr/src/kernel-headers
Unnamed repository; edit this file to name it for gitweb.