diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/udev/udev-071 | |
parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
download | poky-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/udev/udev-071')
-rw-r--r-- | openembedded/packages/udev/udev-071/flags.patch | 72 | ||||
-rw-r--r-- | openembedded/packages/udev/udev-071/noasmlinkage.patch | 38 | ||||
-rw-r--r-- | openembedded/packages/udev/udev-071/tty-symlinks.patch | 13 |
3 files changed, 0 insertions, 123 deletions
diff --git a/openembedded/packages/udev/udev-071/flags.patch b/openembedded/packages/udev/udev-071/flags.patch deleted file mode 100644 index cb17336212..0000000000 --- a/openembedded/packages/udev/udev-071/flags.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | Index: udev-071/Makefile | ||
2 | =================================================================== | ||
3 | --- udev-071.orig/Makefile 2005-10-19 23:28:34.000000000 +0100 | ||
4 | +++ udev-071/Makefile 2005-11-01 22:04:31.000000000 +0000 | ||
5 | @@ -160,36 +160,36 @@ | ||
6 | # check if compiler option is supported | ||
7 | cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} | ||
8 | |||
9 | -CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ | ||
10 | +override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ | ||
11 | -Wstrict-prototypes -Wsign-compare | ||
12 | -CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) | ||
13 | -CFLAGS += -pipe | ||
14 | -CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
15 | +override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) | ||
16 | +override CFLAGS += -pipe | ||
17 | +override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
18 | |||
19 | # use '-Os' optimization if available, else use -O2 | ||
20 | OPTFLAGS := $(call cc-supports, -Os, -O2) | ||
21 | |||
22 | # include our local copy of libsysfs | ||
23 | -CFLAGS += -I$(PWD)/libsysfs/sysfs \ | ||
24 | +override CFLAGS += -I$(PWD)/libsysfs/sysfs \ | ||
25 | -I$(PWD)/libsysfs | ||
26 | |||
27 | ifeq ($(strip $(USE_LOG)),true) | ||
28 | - CFLAGS += -DUSE_LOG | ||
29 | + override CFLAGS += -DUSE_LOG | ||
30 | endif | ||
31 | |||
32 | # if DEBUG is enabled, then we do not strip or optimize | ||
33 | ifeq ($(strip $(DEBUG)),true) | ||
34 | - CFLAGS += -O1 -g -DDEBUG | ||
35 | + override CFLAGS += -O1 -g -DDEBUG | ||
36 | LDFLAGS += -Wl | ||
37 | STRIPCMD = /bin/true -Since_we_are_debugging | ||
38 | else | ||
39 | - CFLAGS += $(OPTFLAGS) -fomit-frame-pointer | ||
40 | + override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer | ||
41 | LDFLAGS += -s -Wl | ||
42 | STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment | ||
43 | endif | ||
44 | |||
45 | ifeq ($(strip $(USE_GCOV)),true) | ||
46 | - CFLAGS += -fprofile-arcs -ftest-coverage | ||
47 | + override CFLAGS += -fprofile-arcs -ftest-coverage | ||
48 | LDFLAGS = -fprofile-arcs | ||
49 | endif | ||
50 | |||
51 | @@ -200,18 +200,18 @@ | ||
52 | CC = $(KLCC) | ||
53 | LD = $(KLCC) | ||
54 | else | ||
55 | - CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations | ||
56 | + override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations | ||
57 | LDFLAGS += -Wl,-warn-common | ||
58 | endif | ||
59 | |||
60 | ifeq ($(strip $(USE_SELINUX)),true) | ||
61 | UDEV_OBJS += udev_selinux.o | ||
62 | LIB_OBJS += -lselinux -lsepol | ||
63 | - CFLAGS += -DUSE_SELINUX | ||
64 | + override CFLAGS += -DUSE_SELINUX | ||
65 | endif | ||
66 | |||
67 | ifeq ($(strip $(USE_STATIC)),true) | ||
68 | - CFLAGS += -DUSE_STATIC | ||
69 | + override CFLAGS += -DUSE_STATIC | ||
70 | LDFLAGS += -static | ||
71 | endif | ||
72 | |||
diff --git a/openembedded/packages/udev/udev-071/noasmlinkage.patch b/openembedded/packages/udev/udev-071/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/openembedded/packages/udev/udev-071/noasmlinkage.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- udev-062/udev.c~noasmlinkage.patch | ||
7 | +++ udev-062/udev.c | ||
8 | @@ -54,7 +54,7 @@ | ||
9 | } | ||
10 | #endif | ||
11 | |||
12 | -static void asmlinkage sig_handler(int signum) | ||
13 | +static void sig_handler(int signum) | ||
14 | { | ||
15 | switch (signum) { | ||
16 | case SIGALRM: | ||
17 | --- udev-062/udevd.c~noasmlinkage.patch | ||
18 | +++ udev-062/udevd.c | ||
19 | @@ -639,7 +639,7 @@ | ||
20 | return msg; | ||
21 | } | ||
22 | |||
23 | -static void asmlinkage sig_handler(int signum) | ||
24 | +static void sig_handler(int signum) | ||
25 | { | ||
26 | int rc; | ||
27 | |||
28 | --- udev-062/udevstart.c~noasmlinkage.patch | ||
29 | +++ udev-062/udevstart.c | ||
30 | @@ -323,7 +323,7 @@ | ||
31 | exec_list(&device_list); | ||
32 | } | ||
33 | |||
34 | -static void asmlinkage sig_handler(int signum) | ||
35 | +static void sig_handler(int signum) | ||
36 | { | ||
37 | switch (signum) { | ||
38 | case SIGALRM: | ||
diff --git a/openembedded/packages/udev/udev-071/tty-symlinks.patch b/openembedded/packages/udev/udev-071/tty-symlinks.patch deleted file mode 100644 index 28bdf92af8..0000000000 --- a/openembedded/packages/udev/udev-071/tty-symlinks.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 | ||
2 | +++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 | ||
3 | @@ -14,8 +14,8 @@ | ||
4 | KERNEL="fd[0-9]*", NAME="floppy/%n" | ||
5 | |||
6 | # tty devices | ||
7 | -KERNEL="tty[0-9]*", NAME="vc/%n" | ||
8 | -KERNEL="ttyS[0-9]*", NAME="tts/%n" | ||
9 | +KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" | ||
10 | +KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" | ||
11 | KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" | ||
12 | |||
13 | # vc devices | ||