Moved madde.patch to debian
[kernel-power] / kernel-power-2.6.28 / debian / madde.patch
1 --- kernel-power-2.6.28/debian/control  2011-04-16 06:23:23.000000000 +0200
2 +++ kernel-power-2.6.28/debian/control  2011-04-16 06:24:33.000000000 +0200
3 @@ -3,7 +3,7 @@ Section: utils
4  Priority: optional
5  Maintainer: Thomas Tanner <maemo@tannerlab.com>
6  XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528
7 -Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils
8 +Build-Depends: debhelper (>= 4.0.0), quilt, libncurses5-dev, sharutils
9  Standards-Version: 3.8.0
10  
11  Package: kernel-power-flasher
12 --- kernel-power-2.6.28/debian/rules    2011-04-16 03:24:39.000000000 +0200
13 +++ kernel-power-2.6.28/debian/rules    2011-04-16 03:34:38.000000000 +0200
14 @@ -96,7 +96,10 @@ install-kernel:
15         dh_installdirs
16  
17         install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
18 -       fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
19 +       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
20 +       ar x sdk-fiasco-gen_2.8.2.0.1+0m5_i386.deb data.tar.gz
21 +       tar -xf data.tar.gz ./usr/bin/fiasco-gen -O > fiasco-gen; chmod +x fiasco-gen
22 +       ./fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
23                         -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
24         chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
25  
26 @@ -125,12 +128,12 @@ install-headers:
27         dh_installdirs
28  
29         install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
30 -       install -p -o root -g root -m 644 $(BUILDTMP)/.config  $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
31 -       install -p -o root -g root -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
32 -       install -p -o root -g root -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
33 -       cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/auto.conf \
34 +       install -p -m 644 $(BUILDTMP)/.config  $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
35 +       install -p -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
36 +       install -p -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
37 +       cd $(BUILDTMP) && install -p -m 644 -D include/config/auto.conf \
38                 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf
39 -       cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/kernel.release \
40 +       cd $(BUILDTMP) && install -p -m 644 -D include/config/kernel.release \
41                 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/kernel.release
42         cd $(KSRC) && \
43                 find arch/$(ARCH) $(foreach dir,$(INCLUDE_HEADERS),include/$(dir)) -name '*.h' \
44 @@ -229,9 +232,6 @@ endif
45         dh_installchangelogs -s
46         dh_installdocs -s
47         dh_install -s
48 -ifeq ($(ARCH),arm)
49 -       dh_strip -p$(HEADERS_PACKAGE)
50 -endif
51         dh_compress -s
52         dh_fixperms -s --exclude /usr/src/kernel-headers
53         dh_installdeb -s
54 --- kernel-power-2.6.28/debian/patches/series   2011-04-16 06:19:32.000000000 +0200
55 +++ kernel-power-2.6.28/debian/patches/series   2011-04-16 06:19:41.000000000 +0200
56 @@ -35,3 +35,4 @@ l2cap_parent.patch
57  wl12xx-rx-fix.diff
58  vanilla-2.6.28-anti-io-stalling.patch
59  joikuspot.diff
60 +madde.patch
61 --- kernel-power-2.6.28/debian/patches/madde.patch      2011-04-15 15:30:29.223356000 +0200
62 +++ kernel-power-2.6.28/debian/patches/madde.patch      2011-04-16 06:19:19.000000000 +0200
63 @@ -0,0 +1,30 @@
64 +--- kernel-power-2.6.28/Makefile       2011-01-23 14:06:07.000000000 +0100
65 ++++ kernel-power-2.6.28/Makefile       2011-01-23 14:06:53.000000000 +0100
66 +@@ -4,6 +4,8 @@ SUBLEVEL = 28
67 + EXTRAVERSION = .10power
68 + NAME = Erotic Pickled Herring
69
70 ++export PATH := /usr/bin:$(HOME)/.madde/0.6.72/toolchains/arm-2007q3-51sb6-gdb701-arm-none-linux-gnueabi_linux/bin:$(PATH)
71 ++
72 + # *DOCUMENTATION*
73 + # To see a list of typical targets execute "make help"
74 + # More info can be located in ./README
75 +@@ -196,7 +198,7 @@ SUBARCH := arm
76 + # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
77 + export KBUILD_BUILDHOST := $(SUBARCH)
78 + ARCH          ?= $(SUBARCH)
79 +-CROSS_COMPILE ?= arm-linux-
80 ++CROSS_COMPILE ?= arm-none-linux-gnueabi-
81
82 + # Architecture as present in compile.h
83 + UTS_MACHINE   := $(ARCH)
84 +--- kernel-power-2.6.28/scripts/unifdef.c      2011-01-23 18:22:03.000000000 +0100
85 ++++ kernel-power-2.6.28/scripts/unifdef.c      2011-01-23 18:22:17.000000000 +0100
86 +@@ -206,6 +206,7 @@
87 + static void             error(const char *);
88 + static int              findsym(const char *);
89 + static void             flushline(bool);
90 ++#define getline _getline
91 + static Linetype         getline(void);
92 + static Linetype         ifeval(const char **);
93 + static void             ignoreoff(void);