From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../linux-libc-headers-2.6.15.99/3477-1.patch | 43 +++++++++++++++++++++ .../asm-arch-irqs.patch | 19 +++++++++ .../linux-netdevice.patch | 11 ++++++ .../linux-netfilter_ipv4.patch | 31 +++++++++++++++ .../linux-libc-headers-2.6.15.99/linux-rtc.patch | 11 ++++++ .../linux-videodev2.patch | 45 ++++++++++++++++++++++ 6 files changed, 160 insertions(+) create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch create mode 100644 meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch (limited to 'meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99') diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch new file mode 100644 index 000000000..1b207b3cd --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch @@ -0,0 +1,43 @@ +From: Nicolas Pitre +Date: Sat, 15 Apr 2006 15:10:43 +0000 (+0100) +Subject: [ARM] 3477/1: ARM EABI: undefine removed syscalls +X-Git-Url: http://git.infradead.org/?p=mtd-2.6.git;a=commitdiff;h=463b158aab247b600e4e93614b7b8f42a66331c9 + +[ARM] 3477/1: ARM EABI: undefine removed syscalls + +Patch from Nicolas Pitre + +Avoid confusion for libraries assuming that a given syscall is available +when corresponding symbol is defined. + +Signed-off-by: Nicolas Pitre +Signed-off-by: Russell King +--- + +--- a/include/asm-arm/unistd.h ++++ b/include/asm-arm/unistd.h +@@ -360,6 +360,24 @@ + #define __ARM_NR_usr32 (__ARM_NR_BASE+4) + #define __ARM_NR_set_tls (__ARM_NR_BASE+5) + ++/* ++ * The following syscalls are obsolete and no longer available for EABI. ++ */ ++#if defined(__ARM_EABI__) ++#undef __NR_time ++#undef __NR_umount ++#undef __NR_stime ++#undef __NR_alarm ++#undef __NR_utime ++#undef __NR_getrlimit ++#undef __NR_select ++#undef __NR_readdir ++#undef __NR_mmap ++#undef __NR_socketcall ++#undef __NR_syscall ++#undef __NR_ipc ++#endif ++ + #define __sys2(x) #x + #define __sys1(x) __sys2(x) + diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch new file mode 100644 index 000000000..4785275db --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch @@ -0,0 +1,19 @@ +--- linux-libc-headers-2.6.15.99/include/asm-arm/arch-ebsa285/irqs.h.orig 2006-03-19 17:01:59.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/asm-arm/arch-ebsa285/irqs.h 2006-03-19 17:02:50.000000000 +0100 +@@ -8,7 +8,6 @@ + * 20-Jan-1998 RMK Started merge of EBSA286, CATS and NetWinder + * 01-Feb-1999 PJB ISA IRQs start at 0 not 16 + */ +-#include + + #define NR_IRQS 36 + #define NR_DC21285_IRQS 16 +@@ -92,7 +91,7 @@ + #undef RTC_IRQ + #define RTC_IRQ IRQ_ISA_RTC_ALARM + #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD +-#define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) ++#define I8042_AUX_IRQ IRQ_ISA_PS2MOUSE + #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY + + #define irq_canonicalize(_i) (((_i) == IRQ_ISA_CASCADE) ? IRQ_ISA_2 : _i) diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch new file mode 100644 index 000000000..588aea4ba --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch @@ -0,0 +1,11 @@ +--- linux-libc-headers-2.6.15.99/include/linux/netdevice.h.orig 2006-04-29 14:10:39.245687500 +0200 ++++ linux-libc-headers-2.6.15.99/include/linux/netdevice.h 2006-04-29 14:11:08.819535750 +0200 +@@ -100,8 +100,6 @@ + unsigned long tx_compressed; + }; + +-extern int __init netdev_boot_setup(char *str); +- + /* Media selection options. */ + enum { + IF_PORT_UNKNOWN = 0, diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch new file mode 100644 index 000000000..f7f77af0d --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch @@ -0,0 +1,31 @@ +iptables 1.3.3 assumes that ipt_scpt.h defines ELEMCOUNT, but ipt_scpt.h +moved to ARRAY_SIZE (which would be defined in linux/kernel.h). +The ip_conntrack_dir definition now resides in linux/netfilter/ip_conntrack_common.h + +--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h.orig 2006-03-20 22:03:04.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h 2006-03-20 22:07:09.000000000 +0100 +@@ -7,6 +7,8 @@ + + #define IPT_SCTP_VALID_FLAGS 0x07 + ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++#define ELEMCOUNT(x) (sizeof(x) / sizeof((x)[0])) + + struct ipt_sctp_flag_info { + u_int8_t chunktype; +--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h.orig 2006-03-20 21:51:10.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2006-03-20 21:51:12.000000000 +0100 +@@ -89,13 +89,6 @@ + (tuple)->dst.u.all = 0; \ + } while (0) + +-enum ip_conntrack_dir +-{ +- IP_CT_DIR_ORIGINAL, +- IP_CT_DIR_REPLY, +- IP_CT_DIR_MAX +-}; +- + static inline int ip_ct_tuple_src_equal(const struct ip_conntrack_tuple *t1, + const struct ip_conntrack_tuple *t2) + { diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch new file mode 100644 index 000000000..36b80fb9d --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch @@ -0,0 +1,11 @@ +--- linux-libc-headers-2.6.15.99/include/linux/rtc.h.orig 2006-03-19 12:31:07.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/rtc.h 2006-03-19 12:31:14.000000000 +0100 +@@ -11,8 +11,6 @@ + #ifndef _LINUX_RTC_H_ + #define _LINUX_RTC_H_ + +-#include +- + /* + * The struct used to pass data via the following ioctl. Similar to the + * struct tm in , but it needs to be here so that the kernel diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch new file mode 100644 index 000000000..95335c99b --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch @@ -0,0 +1,45 @@ +--- linux-libc-headers-2.6.15.99/include/linux/videodev2.h.orig 2006-03-20 11:14:35.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/videodev2.h 2006-03-20 11:14:37.000000000 +0100 +@@ -15,7 +15,32 @@ + */ + #include /* need struct timeval */ + #include /* needed __u64 */ +- ++ ++#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */ ++#define HAVE_V4L2 1 ++ ++/* ++ * Common stuff for both V4L1 and V4L2 ++ * Moved from videodev.h ++ */ ++ ++#define VIDEO_MAX_FRAME 32 ++ ++#define VID_TYPE_CAPTURE 1 /* Can capture */ ++#define VID_TYPE_TUNER 2 /* Can tune */ ++#define VID_TYPE_TELETEXT 4 /* Does teletext */ ++#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ ++#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ ++#define VID_TYPE_CLIPPING 32 /* Can clip */ ++#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ ++#define VID_TYPE_SCALES 128 /* Scalable */ ++#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ ++#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ ++#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ ++#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ ++#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ ++#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ ++ + /* + * M I S C E L L A N E O U S + */ +@@ -464,7 +489,7 @@ + struct v4l2_clip + { + struct v4l2_rect c; +- struct v4l2_clip __user *next; ++ struct v4l2_clip *next; + }; + + struct v4l2_window -- cgit v1.2.3