Updated build patches for madde

diff --git a/kernel-power-2.6.28/.gitignore b/kernel-power-2.6.28/.gitignore
new file mode 100644 (file)
index 0000000..01e9800
--- /dev/null
+++ b/kernel-power-2.6.28/.gitignore
@@ -0,0 +1,96 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git-ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.so
+*.so.dbg
+*.mod.c
+*.i
+*.lst
+*.symtypes
+*.order
+*.elf
+*.bin
+*.gz
+
+#
+# Top-level generic files
+#
+tags
+TAGS
+vmlinux
+System.map
+Module.markers
+Module.symvers
+!.gitignore
+!.mailmap
+
+#
+# Generated include files
+#
+include/asm
+include/asm-*/asm-offsets.h
+include/config
+include/linux/autoconf.h
+include/linux/compile.h
+include/linux/version.h
+include/linux/utsrelease.h
+include/linux/bounds.h
+
+# stgit generated dirs
+patches-*
+
+# quilt's files
+#patches
+#series
+
+# cscope files
+cscope.*
+ncscope.*
+
+*.orig
+*~
+\#*#
+
+# kernel-power tree
+.mailmap
+COPYING
+CREDITS
+Documentation
+Kbuild
+MAINTAINERS
+Makefile
+README
+REPORTING-BUGS
+arch
+block
+crypto
+drivers
+firmware
+fs
+include
+init
+ipc
+kernel
+lib
+mm
+net
+samples
+scripts
+security
+sound
+usr
+virt

diff --git a/kernel-power-2.6.28/debian/madde.patch b/kernel-power-2.6.28/debian/madde.patch
index e466d8f..2d06a8b 100644 (file)
--- a/kernel-power-2.6.28/debian/madde.patch
+++ b/kernel-power-2.6.28/debian/madde.patch
@@ -1,30 +1,33 @@
-diff --git kernel-power-2.6.28/debian/control kernel-power-2.6.28/debian/control
-index f178559..6ae60c1 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 ac43331..ec1431c 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 3f5cb4e..e0b7a44 100755
---- kernel-power-2.6.28/debian/rules
-+++ kernel-power-2.6.28/debian/rules
-@@ -102,7 +102,10 @@ install-kernel:
+diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
+index ae7e212..b7c7b20 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
+ 2.6.28.10.diff
+ rx51_defconfig.diff
+ maemo-build.diff
++madde.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
+--- a/kernel-power-2.6.28/debian/rules
++++ b/kernel-power-2.6.28/debian/rules
+@@ -108,7 +108,10 @@ install-kernel:
        dh_installdirs
  
        install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
@@ -36,30 +39,39 @@ index 3f5cb4e..e0b7a44 100755
                        -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
  
-@@ -136,12 +139,12 @@ install-headers:
+@@ -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 $(BUILDTMP)/.config  $(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 $(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 -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 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
-+      cd $(BUILDTMP) && install -p -m 644 -D include/config/auto.conf \
++      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 $(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 \
+-      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' \
-@@ -240,9 +243,6 @@ endif
+@@ -220,7 +223,7 @@ install-indep:
+       dh_testdir
+       dh_testroot
+ 
+-      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-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
+       dh_testroot
        dh_installchangelogs -s
        dh_installdocs -s
-       dh_install -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

diff --git a/kernel-power-2.6.28/debian/patches/madde.diff b/kernel-power-2.6.28/debian/patches/madde.diff
new file mode 100644 (file)
index 0000000..8c8af2c
--- /dev/null
+++ b/kernel-power-2.6.28/debian/patches/madde.diff
@@ -0,0 +1,30 @@
+--- kernel-power-2.6.28/Makefile       2011-07-09 10:24:38.656013905 +0200
++++ kernel-power-2.6.28/Makefile       2011-07-09 10:24:40.536013905 +0200
+@@ -4,6 +4,8 @@ SUBLEVEL = 28
+ EXTRAVERSION = .10
+ NAME = Erotic Pickled Herring
+ 
++export PATH := /usr/bin:$(HOME)/.madde/0.7.48/toolchains/arm-2007q3-51sb6-gdb71-arm-none-linux-gnueabi_linux_x86_64/bin:$(PATH)
++
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
+ # More info can be located in ./README
+@@ -196,7 +198,7 @@ SUBARCH := arm
+ # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
+ export KBUILD_BUILDHOST := $(SUBARCH)
+ ARCH          ?= $(SUBARCH)
+-CROSS_COMPILE ?= arm-linux-
++CROSS_COMPILE ?= arm-none-linux-gnueabi-
+ 
+ # Architecture as present in compile.h
+ UTS_MACHINE   := $(ARCH)
+--- kernel-power-2.6.28/scripts/unifdef.c      2011-01-23 18:22:03.000000000 +0100
++++ kernel-power-2.6.28/scripts/unifdef.c      2011-01-23 18:22:17.000000000 +0100
+@@ -206,6 +206,7 @@
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
++#define getline _getline
+ static Linetype         getline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);