diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-05-13 16:55:26 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-05-13 16:55:26 +0100 |
commit | 505c26951b14898cb9ede7c4cb76217202b655c4 (patch) | |
tree | cb8dcbf5af8e74ddfbf3716504c9f0de5ca5f212 /meta | |
parent | ad136ddeef5cc70ec76967b0560da42898e33e70 (diff) | |
download | poky-505c26951b14898cb9ede7c4cb76217202b655c4.tar.gz |
linux: Ensure we have buildable kernel recipes for each machine
Fix various kernels to build with our toolchain, this includes well known fixes
for:
* sumversion.c: compilation failing with a 'PATH_MAX' undeclared (fixed by
adding limits.h to sumversions includes
* a patch taken from oe.dev to stop GCC >= 4.3 from optimizing a loop which
causes compilation to fail
* Fixing the KERNEL_OUTPUT for mx31 and nokia800 kernel recipes
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch | 48 | ||||
-rw-r--r-- | meta/packages/linux/files/sumversion-fix.patch | 16 | ||||
-rw-r--r-- | meta/packages/linux/linux-mx31.inc | 2 | ||||
-rw-r--r-- | meta/packages/linux/linux-mx31_2.6.19.2.bb | 3 | ||||
-rw-r--r-- | meta/packages/linux/linux-mx31_2.6.22.6.bb | 3 | ||||
-rw-r--r-- | meta/packages/linux/linux-nokia800.inc | 2 | ||||
-rw-r--r-- | meta/packages/linux/linux-nokia800_2.6.18-osso40.bb | 5 | ||||
-rw-r--r-- | meta/packages/linux/linux-nokia800_2.6.21-osso71.bb | 9 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp_2.6.23.bb | 3 | ||||
-rw-r--r-- | meta/packages/linux/linux_2.6.23.bb | 5 |
10 files changed, 83 insertions, 13 deletions
diff --git a/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch b/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch new file mode 100644 index 0000000000..3ff0c07c18 --- /dev/null +++ b/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From f5b973489beb1a1239dfad53e3ad6e36ff7ee958 Mon Sep 17 00:00:00 2001 | ||
2 | From: Segher Boessenkool <segher@kernel.crashing.org> | ||
3 | Date: Thu, 9 Oct 2008 21:18:27 +0100 | ||
4 | Subject: [PATCH] fix-gcc-4.3-false-modulo-optimization.patch | ||
5 | |||
6 | I tried to compile the current stable kernel | ||
7 | (a2ef813d2f439a3e9f377d33a2e5baad098afb7e) | ||
8 | and get the following errors: | ||
9 | |||
10 | kernel/built-in.o: In function `timespec_add_ns': | ||
11 | /mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174: | ||
12 | undefined reference to `__aeabi_uldivmod' | ||
13 | /mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179: | ||
14 | undefined reference to `__aeabi_uldivmod' | ||
15 | /mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174: | ||
16 | undefined reference to `__aeabi_uldivmod' | ||
17 | /mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179: | ||
18 | undefined reference to `__aeabi_uldivmod' | ||
19 | |||
20 | applying the following patch solved the problem: | ||
21 | -------- | ||
22 | Prevent gcc-4.3 form "optimizing" the while loop into a costly modulo operation. | ||
23 | Patch found at http://lkml.org/lkml/2008/2/22/464. | ||
24 | |||
25 | Reported-by: Sven Rebhan <odinshorse@googlemail.com> | ||
26 | Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> | ||
27 | --- | ||
28 | include/linux/time.h | 4 ++++ | ||
29 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
30 | |||
31 | diff --git a/include/linux/time.h b/include/linux/time.h | ||
32 | index b04136d..3e8fd9e 100644 | ||
33 | --- a/include/linux/time.h | ||
34 | +++ b/include/linux/time.h | ||
35 | @@ -173,6 +173,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) | ||
36 | { | ||
37 | ns += a->tv_nsec; | ||
38 | while(unlikely(ns >= NSEC_PER_SEC)) { | ||
39 | + /* The following asm() prevents the compiler from | ||
40 | + * optimising this loop into a modulo operation. */ | ||
41 | + asm("" : "+r"(ns)); | ||
42 | + | ||
43 | ns -= NSEC_PER_SEC; | ||
44 | a->tv_sec++; | ||
45 | } | ||
46 | -- | ||
47 | 1.5.6.5 | ||
48 | |||
diff --git a/meta/packages/linux/files/sumversion-fix.patch b/meta/packages/linux/files/sumversion-fix.patch new file mode 100644 index 0000000000..8158d9d5f8 --- /dev/null +++ b/meta/packages/linux/files/sumversion-fix.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Fix compilation of the sumversion "script" | ||
2 | |||
3 | http://bugs.gentoo.org/show_bug.cgi?format=multiple&id=226169 | ||
4 | |||
5 | Index: linux-2.6.21/scripts/mod/sumversion.c | ||
6 | =================================================================== | ||
7 | --- linux-2.6.21.orig/scripts/mod/sumversion.c 2007-04-26 04:08:32.000000000 +0100 | ||
8 | +++ linux-2.6.21/scripts/mod/sumversion.c 2010-05-13 14:41:31.777882280 +0100 | ||
9 | @@ -7,6 +7,7 @@ | ||
10 | #include <ctype.h> | ||
11 | #include <errno.h> | ||
12 | #include <string.h> | ||
13 | +#include <limits.h> | ||
14 | #include "modpost.h" | ||
15 | |||
16 | /* | ||
diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc index 7df02c9b20..0f83ac7a4c 100644 --- a/meta/packages/linux/linux-mx31.inc +++ b/meta/packages/linux/linux-mx31.inc | |||
@@ -2,7 +2,7 @@ SECTION = "kernel" | |||
2 | DESCRIPTION = "Linux kernel for imx31 devices" | 2 | DESCRIPTION = "Linux kernel for imx31 devices" |
3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
4 | 4 | ||
5 | KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" | 5 | KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" |
6 | 6 | ||
7 | inherit kernel | 7 | inherit kernel |
8 | 8 | ||
diff --git a/meta/packages/linux/linux-mx31_2.6.19.2.bb b/meta/packages/linux/linux-mx31_2.6.19.2.bb index 8394bc417a..56d111e2f2 100644 --- a/meta/packages/linux/linux-mx31_2.6.19.2.bb +++ b/meta/packages/linux/linux-mx31_2.6.19.2.bb | |||
@@ -1,10 +1,11 @@ | |||
1 | require linux-mx31.inc | 1 | require linux-mx31.inc |
2 | 2 | ||
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | FILESDIR = "${WORKDIR}" | 5 | FILESDIR = "${WORKDIR}" |
6 | 6 | ||
7 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \ | 7 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \ |
8 | file://sumversion-fix.patch;patch=1 \ | ||
8 | file://defconfig-mx31litekit \ | 9 | file://defconfig-mx31litekit \ |
9 | file://defconfig-mx31ads \ | 10 | file://defconfig-mx31ads \ |
10 | file://defconfig-mx31phy \ | 11 | file://defconfig-mx31phy \ |
diff --git a/meta/packages/linux/linux-mx31_2.6.22.6.bb b/meta/packages/linux/linux-mx31_2.6.22.6.bb index 299e406532..d19a02fa09 100644 --- a/meta/packages/linux/linux-mx31_2.6.22.6.bb +++ b/meta/packages/linux/linux-mx31_2.6.22.6.bb | |||
@@ -1,10 +1,11 @@ | |||
1 | require linux-mx31.inc | 1 | require linux-mx31.inc |
2 | PR = "r4" | 2 | PR = "r5" |
3 | 3 | ||
4 | FILESDIR = "${WORKDIR}" | 4 | FILESDIR = "${WORKDIR}" |
5 | 5 | ||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2 \ | 7 | ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2 \ |
8 | file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \ | ||
8 | file://defconfig-mx31ads \ | 9 | file://defconfig-mx31ads \ |
9 | file://defconfig-mx31phy \ | 10 | file://defconfig-mx31phy \ |
10 | " | 11 | " |
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta/packages/linux/linux-nokia800.inc index d373e4c907..a9505fab5d 100644 --- a/meta/packages/linux/linux-nokia800.inc +++ b/meta/packages/linux/linux-nokia800.inc | |||
@@ -2,7 +2,7 @@ SECTION = "kernel" | |||
2 | DESCRIPTION = "Linux kernel for Nokia 770/800" | 2 | DESCRIPTION = "Linux kernel for Nokia 770/800" |
3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
4 | 4 | ||
5 | KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" | 5 | KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" |
6 | KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2" | 6 | KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2" |
7 | 7 | ||
8 | inherit kernel | 8 | inherit kernel |
diff --git a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb index 13c2e8f4af..f987ab321a 100644 --- a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb +++ b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require linux-nokia800.inc | 1 | require linux-nokia800.inc |
2 | 2 | ||
3 | PR = "r6" | 3 | PR = "r7" |
4 | SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \ | 4 | SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \ |
5 | http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \ | 5 | http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \ |
6 | ${RPSRC}/lzo_kernel-r0.patch;patch=1 \ | 6 | ${RPSRC}/lzo_kernel-r0.patch;patch=1 \ |
@@ -9,7 +9,8 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-r | |||
9 | ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \ | 9 | ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \ |
10 | ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \ | 10 | ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \ |
11 | file://fix_oprofile.patch;patch=1 \ | 11 | file://fix_oprofile.patch;patch=1 \ |
12 | file://defconfig" | 12 | file://sumversion-fix.patch;patch=1 \ |
13 | file://defconfig" | ||
13 | 14 | ||
14 | SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1" | 15 | SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1" |
15 | 16 | ||
diff --git a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb index aca6440875..b64c697c9b 100644 --- a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb +++ b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb | |||
@@ -1,13 +1,14 @@ | |||
1 | require linux-nokia800.inc | 1 | require linux-nokia800.inc |
2 | PR = "r4" | 2 | PR = "r5" |
3 | 3 | ||
4 | DEFAULT_PREFERENCE_nokia770 = "-1" | 4 | DEFAULT_PREFERENCE_nokia770 = "-1" |
5 | 5 | ||
6 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ | 6 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ |
7 | http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \ | 7 | http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \ |
8 | http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \ | 8 | http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \ |
9 | file://suspend-button.patch;patch=1 \ | 9 | file://suspend-button.patch;patch=1 \ |
10 | file://defconfig" | 10 | file://sumversion-fix.patch;patch=1 \ |
11 | file://defconfig" | ||
11 | 12 | ||
12 | S = "${WORKDIR}/linux-2.6.21" | 13 | S = "${WORKDIR}/linux-2.6.21" |
13 | 14 | ||
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb index 2293eea80e..0c67fd4ea6 100644 --- a/meta/packages/linux/linux-rp_2.6.23.bb +++ b/meta/packages/linux/linux-rp_2.6.23.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require linux-rp.inc | 1 | require linux-rp.inc |
2 | 2 | ||
3 | PR = "r35" | 3 | PR = "r36" |
4 | 4 | ||
5 | # Handy URLs | 5 | # Handy URLs |
6 | # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 | 6 | # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 |
@@ -60,6 +60,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ | |||
60 | file://htcuni.patch;patch=1 \ | 60 | file://htcuni.patch;patch=1 \ |
61 | file://binutils-buildid-arm.patch;patch=1 \ | 61 | file://binutils-buildid-arm.patch;patch=1 \ |
62 | file://versatile-armv6.patch;patch=1 \ | 62 | file://versatile-armv6.patch;patch=1 \ |
63 | file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \ | ||
63 | file://defconfig-c7x0 \ | 64 | file://defconfig-c7x0 \ |
64 | file://defconfig-hx2000 \ | 65 | file://defconfig-hx2000 \ |
65 | file://defconfig-collie \ | 66 | file://defconfig-collie \ |
diff --git a/meta/packages/linux/linux_2.6.23.bb b/meta/packages/linux/linux_2.6.23.bb index a517defd0f..5d5c21b9d3 100644 --- a/meta/packages/linux/linux_2.6.23.bb +++ b/meta/packages/linux/linux_2.6.23.bb | |||
@@ -7,10 +7,11 @@ DEFAULT_PREFERENCE_em-x270 = "1" | |||
7 | DEFAULT_PREFERENCE_mpc8313e-rdb = "1" | 7 | DEFAULT_PREFERENCE_mpc8313e-rdb = "1" |
8 | DEFAULT_PREFERENCE_mpc8323e-rdb = "1" | 8 | DEFAULT_PREFERENCE_mpc8323e-rdb = "1" |
9 | 9 | ||
10 | PR = "r6" | 10 | PR = "r7" |
11 | 11 | ||
12 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ | 12 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ |
13 | file://binutils-buildid-arm.patch;patch=1 \ | 13 | file://binutils-buildid-arm.patch;patch=1 \ |
14 | file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \ | ||
14 | file://defconfig \ | 15 | file://defconfig \ |
15 | " | 16 | " |
16 | 17 | ||