summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-03-17 09:49:02 +0000
committerRichard Purdie <richard@openedhand.com>2007-03-17 09:49:02 +0000
commit87101356ff05cc7d06e10fe6f96464b17a3ee65c (patch)
tree624ac04f701f65d42b49bd340e315ebfe9e4646e /meta
parenta6cc8ec3090b8716847b124f740c50f4fed2f3af (diff)
downloadpoky-87101356ff05cc7d06e10fe6f96464b17a3ee65c.tar.gz
linux-libc-headers: Switch to 2.6.18+2.6.19-rc1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1364 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-eabi.inc2
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch31
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch190
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch23
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb56
5 files changed, 301 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index 381e2424b3..064fb698dc 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -10,7 +10,7 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.1"
10PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" 10PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
11PREFERRED_VERSION_binutils ?= "2.17.50.0.5" 11PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
12PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" 12PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
13PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" 13PREFERRED_VERSION_linux-libc-headers ?= "2.6.18+2.6.19-rc1"
14PREFERRED_VERSION_glibc ?= "2.5" 14PREFERRED_VERSION_glibc ?= "2.5"
15PREFERRED_VERSION_glibc-intermediate ?= "2.5" 15PREFERRED_VERSION_glibc-intermediate ?= "2.5"
16PREFERRED_VERSION_glibc-initial ?= "2.5" 16PREFERRED_VERSION_glibc-initial ?= "2.5"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch
new file mode 100644
index 0000000000..3b20b4ac59
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch
@@ -0,0 +1,31 @@
1# Add HWCAP definitions in asm/procinfo.h
2
3Index: linux-2.6.19-rc1/usr/include/asm-arm/procinfo.h
4===================================================================
5--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6+++ linux-2.6.19-rc1/usr/include/asm-arm/procinfo.h 2006-10-05 10:28:40.000000000 +0200
7@@ -0,0 +1,24 @@
8+/*
9+ * linux/include/asm-arm/procinfo.h
10+ *
11+ * Copyright (C) 1996-1999 Russell King
12+ *
13+ * This program is free software; you can redistribute it and/or modify
14+ * it under the terms of the GNU General Public License version 2 as
15+ * published by the Free Software Foundation.
16+ */
17+#ifndef __ASM_PROCINFO_H
18+#define __ASM_PROCINFO_H
19+
20+#define HWCAP_SWP 1
21+#define HWCAP_HALF 2
22+#define HWCAP_THUMB 4
23+#define HWCAP_26BIT 8 /* Play it safe */
24+#define HWCAP_FAST_MULT 16
25+#define HWCAP_FPA 32
26+#define HWCAP_VFP 64
27+#define HWCAP_EDSP 128
28+#define HWCAP_JAVA 256
29+#define HWCAP_IWMMXT 512
30+
31+#endif
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch
new file mode 100644
index 0000000000..f1fed650bb
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch
@@ -0,0 +1,190 @@
1# Add asm syscall definitions, needed for fstab/llseek.c in util-linux
2
3Index: linux-2.6.19-rc1/usr/include/asm-arm/unistd.h
4===================================================================
5--- linux-2.6.19-rc1.orig/usr/include/asm-arm/unistd.h 2006-10-05 10:29:50.000000000 +0200
6+++ linux-2.6.19-rc1/usr/include/asm-arm/unistd.h 2006-10-05 10:31:43.000000000 +0200
7@@ -376,4 +376,183 @@
8 #undef __NR_ipc
9 #endif
10
11+#include <linux/err.h>
12+
13+#define __sys2(x) #x
14+#define __sys1(x) __sys2(x)
15+
16+#ifndef __syscall
17+#if defined(__thumb__) || defined(__ARM_EABI__)
18+#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
19+#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
20+#define __syscall(name) "swi\t0"
21+#else
22+#define __SYS_REG(name)
23+#define __SYS_REG_LIST(regs...) regs
24+#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
25+#endif
26+#endif
27+
28+#define __syscall_return(type, res) \
29+do { \
30+ if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
31+ errno = -(res); \
32+ res = -1; \
33+ } \
34+ return (type) (res); \
35+} while (0)
36+
37+#define _syscall0(type,name) \
38+type name(void) { \
39+ __SYS_REG(name) \
40+ register long __res_r0 __asm__("r0"); \
41+ long __res; \
42+ __asm__ __volatile__ ( \
43+ __syscall(name) \
44+ : "=r" (__res_r0) \
45+ : __SYS_REG_LIST() \
46+ : "memory" ); \
47+ __res = __res_r0; \
48+ __syscall_return(type,__res); \
49+}
50+
51+#define _syscall1(type,name,type1,arg1) \
52+type name(type1 arg1) { \
53+ __SYS_REG(name) \
54+ register long __r0 __asm__("r0") = (long)arg1; \
55+ register long __res_r0 __asm__("r0"); \
56+ long __res; \
57+ __asm__ __volatile__ ( \
58+ __syscall(name) \
59+ : "=r" (__res_r0) \
60+ : __SYS_REG_LIST( "0" (__r0) ) \
61+ : "memory" ); \
62+ __res = __res_r0; \
63+ __syscall_return(type,__res); \
64+}
65+
66+#define _syscall2(type,name,type1,arg1,type2,arg2) \
67+type name(type1 arg1,type2 arg2) { \
68+ __SYS_REG(name) \
69+ register long __r0 __asm__("r0") = (long)arg1; \
70+ register long __r1 __asm__("r1") = (long)arg2; \
71+ register long __res_r0 __asm__("r0"); \
72+ long __res; \
73+ __asm__ __volatile__ ( \
74+ __syscall(name) \
75+ : "=r" (__res_r0) \
76+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \
77+ : "memory" ); \
78+ __res = __res_r0; \
79+ __syscall_return(type,__res); \
80+}
81+
82+
83+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
84+type name(type1 arg1,type2 arg2,type3 arg3) { \
85+ __SYS_REG(name) \
86+ register long __r0 __asm__("r0") = (long)arg1; \
87+ register long __r1 __asm__("r1") = (long)arg2; \
88+ register long __r2 __asm__("r2") = (long)arg3; \
89+ register long __res_r0 __asm__("r0"); \
90+ long __res; \
91+ __asm__ __volatile__ ( \
92+ __syscall(name) \
93+ : "=r" (__res_r0) \
94+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \
95+ : "memory" ); \
96+ __res = __res_r0; \
97+ __syscall_return(type,__res); \
98+}
99+
100+
101+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
102+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
103+ __SYS_REG(name) \
104+ register long __r0 __asm__("r0") = (long)arg1; \
105+ register long __r1 __asm__("r1") = (long)arg2; \
106+ register long __r2 __asm__("r2") = (long)arg3; \
107+ register long __r3 __asm__("r3") = (long)arg4; \
108+ register long __res_r0 __asm__("r0"); \
109+ long __res; \
110+ __asm__ __volatile__ ( \
111+ __syscall(name) \
112+ : "=r" (__res_r0) \
113+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \
114+ : "memory" ); \
115+ __res = __res_r0; \
116+ __syscall_return(type,__res); \
117+}
118+
119+
120+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
121+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
122+ __SYS_REG(name) \
123+ register long __r0 __asm__("r0") = (long)arg1; \
124+ register long __r1 __asm__("r1") = (long)arg2; \
125+ register long __r2 __asm__("r2") = (long)arg3; \
126+ register long __r3 __asm__("r3") = (long)arg4; \
127+ register long __r4 __asm__("r4") = (long)arg5; \
128+ register long __res_r0 __asm__("r0"); \
129+ long __res; \
130+ __asm__ __volatile__ ( \
131+ __syscall(name) \
132+ : "=r" (__res_r0) \
133+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
134+ "r" (__r3), "r" (__r4) ) \
135+ : "memory" ); \
136+ __res = __res_r0; \
137+ __syscall_return(type,__res); \
138+}
139+
140+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
141+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) { \
142+ __SYS_REG(name) \
143+ register long __r0 __asm__("r0") = (long)arg1; \
144+ register long __r1 __asm__("r1") = (long)arg2; \
145+ register long __r2 __asm__("r2") = (long)arg3; \
146+ register long __r3 __asm__("r3") = (long)arg4; \
147+ register long __r4 __asm__("r4") = (long)arg5; \
148+ register long __r5 __asm__("r5") = (long)arg6; \
149+ register long __res_r0 __asm__("r0"); \
150+ long __res; \
151+ __asm__ __volatile__ ( \
152+ __syscall(name) \
153+ : "=r" (__res_r0) \
154+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
155+ "r" (__r3), "r" (__r4), "r" (__r5) ) \
156+ : "memory" ); \
157+ __res = __res_r0; \
158+ __syscall_return(type,__res); \
159+}
160+
161+#define __ARCH_WANT_IPC_PARSE_VERSION
162+#define __ARCH_WANT_STAT64
163+#define __ARCH_WANT_SYS_GETHOSTNAME
164+#define __ARCH_WANT_SYS_PAUSE
165+#define __ARCH_WANT_SYS_GETPGRP
166+#define __ARCH_WANT_SYS_LLSEEK
167+#define __ARCH_WANT_SYS_NICE
168+#define __ARCH_WANT_SYS_SIGPENDING
169+#define __ARCH_WANT_SYS_SIGPROCMASK
170+#define __ARCH_WANT_SYS_RT_SIGACTION
171+
172+#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
173+#define __ARCH_WANT_SYS_TIME
174+#define __ARCH_WANT_SYS_OLDUMOUNT
175+#define __ARCH_WANT_SYS_ALARM
176+#define __ARCH_WANT_SYS_UTIME
177+#define __ARCH_WANT_SYS_OLD_GETRLIMIT
178+#define __ARCH_WANT_OLD_READDIR
179+#define __ARCH_WANT_SYS_SOCKETCALL
180+#endif
181+
182+/*
183+ * "Conditional" syscalls
184+ *
185+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
186+ * but it doesn't work on all toolchains, so we just do it by hand
187+ */
188+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
189+
190 #endif /* __ASM_ARM_UNISTD_H */
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch
new file mode 100644
index 0000000000..39a8e8a2f5
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch
@@ -0,0 +1,23 @@
1# Add linux/err.h for MAX_ERRNO definition, needed by util-linux mount
2
3Index: linux-2.6.19-rc1/usr/include/linux/err.h
4===================================================================
5--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6+++ linux-2.6.19-rc1/usr/include/linux/err.h 2006-10-05 10:55:17.000000000 +0200
7@@ -0,0 +1,16 @@
8+#ifndef _LINUX_ERR_H
9+#define _LINUX_ERR_H
10+
11+#include <asm/errno.h>
12+
13+/*
14+ * Kernel pointers have redundant information, so we can use a
15+ * scheme where we can return either an error code or a dentry
16+ * pointer with the same return value.
17+ *
18+ * This should be a per-architecture thing, to allow different
19+ * error and pointer decisions.
20+ */
21+#define MAX_ERRNO 4095
22+
23+#endif /* _LINUX_ERR_H */
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
new file mode 100644
index 0000000000..c4125ee75a
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -0,0 +1,56 @@
1require linux-libc-headers.inc
2
3DEFAULT_PREFERENCE = "-1"
4INHIBIT_DEFAULT_DEPS = "1"
5
6SRC_URI = " \
7 ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \
8 file://arm-procinfo-hwcap.patch;patch=1 \
9 file://arm-unistd-syscall.patch;patch=1 \
10 file://linux-err.patch;patch=1 \
11"
12
13S = "${WORKDIR}/linux-2.6.19-rc1"
14
15set_arch() {
16 case ${TARGET_ARCH} in
17 alpha*) ARCH=alpha ;;
18 arm*) ARCH=arm ;;
19 cris*) ARCH=cris ;;
20 hppa*) ARCH=parisc ;;
21 i*86*) ARCH=i386 ;;
22 ia64*) ARCH=ia64 ;;
23 mips*) ARCH=mips ;;
24 m68k*) ARCH=m68k ;;
25 powerpc*) ARCH=powerpc ;;
26 s390*) ARCH=s390 ;;
27 sh*) ARCH=sh ;;
28 sparc64*) ARCH=sparc64 ;;
29 sparc*) ARCH=sparc ;;
30 x86_64*) ARCH=x86_64 ;;
31 esac
32}
33
34do_install() {
35 set_arch
36 install -d ${D}${includedir}
37 cp -pfLR ${S}${includedir}/linux ${D}${includedir}/
38 cp -pfLR ${S}${includedir}/asm-${ARCH} ${D}${includedir}/asm
39 cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/
40}
41
42do_stage () {
43 set_arch
44 install -d ${STAGING_INCDIR}
45 rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
46 cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/
47 cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm
48 cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/
49 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
50 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
51 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
52 install -d ${CROSS_DIR}/${TARGET_SYS}/include
53 cp -pfLR ${S}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
54 cp -pfLR ${S}${includedir}/asm-${ARCH} ${CROSS_DIR}/${TARGET_SYS}/include/asm
55 cp -pfLR ${S}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
56}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-08 20:16:02 +0000