From 5de252ff87d5a21134bb05d1a55a79efb241c581 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Nov 2005 22:23:22 +0000 Subject: udev: Upgrade to 071 - fixes /dev/input problem with -git3 kernel git-svn-id: https://svn.o-hand.com/repos/poky@156 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/udev/udev-070/flags.patch | 70 --------------------- .../packages/udev/udev-070/noasmlinkage.patch | 38 ------------ .../packages/udev/udev-070/tty-symlinks.patch | 13 ---- openembedded/packages/udev/udev-071/flags.patch | 72 ++++++++++++++++++++++ .../packages/udev/udev-071/noasmlinkage.patch | 38 ++++++++++++ .../packages/udev/udev-071/tty-symlinks.patch | 13 ++++ openembedded/packages/udev/udev_070.bb | 17 ----- openembedded/packages/udev/udev_071.bb | 17 +++++ 8 files changed, 140 insertions(+), 138 deletions(-) delete mode 100644 openembedded/packages/udev/udev-070/flags.patch delete mode 100644 openembedded/packages/udev/udev-070/noasmlinkage.patch delete mode 100644 openembedded/packages/udev/udev-070/tty-symlinks.patch create mode 100644 openembedded/packages/udev/udev-071/flags.patch create mode 100644 openembedded/packages/udev/udev-071/noasmlinkage.patch create mode 100644 openembedded/packages/udev/udev-071/tty-symlinks.patch delete mode 100644 openembedded/packages/udev/udev_070.bb create mode 100644 openembedded/packages/udev/udev_071.bb (limited to 'openembedded/packages') diff --git a/openembedded/packages/udev/udev-070/flags.patch b/openembedded/packages/udev/udev-070/flags.patch deleted file mode 100644 index bd04041f7..000000000 --- a/openembedded/packages/udev/udev-070/flags.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- udev-070/Makefile~flags 2005-09-15 01:19:07 +0200 -+++ udev-070/Makefile 2005-09-16 11:44:37 +0200 -@@ -160,36 +160,36 @@ - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} - --CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ -+override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ - -Wstrict-prototypes -Wsign-compare --CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) --CFLAGS += -pipe --CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) -+override CFLAGS += -pipe -+override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - - # use '-Os' optimization if available, else use -O2 - OPTFLAGS := $(call cc-supports, -Os, -O2) - - # include our local copy of libsysfs --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DUSE_LOG -+ override CFLAGS += -DUSE_LOG - endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -+ override CFLAGS += -O1 -g -DDEBUG - LDFLAGS += -Wl - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer -+ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer - LDFLAGS += -s -Wl - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif - - ifeq ($(strip $(USE_GCOV)),true) -- CFLAGS += -fprofile-arcs -ftest-coverage -+ override CFLAGS += -fprofile-arcs -ftest-coverage - LDFLAGS = -fprofile-arcs - endif - -@@ -200,18 +200,18 @@ - CC = $(KLCC) - LD = $(KLCC) - else -- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -+ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - LDFLAGS += -Wl,-warn-common - endif - - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(USE_STATIC)),true) -- CFLAGS += -DUSE_STATIC -+ override CFLAGS += -DUSE_STATIC - LDFLAGS += -static - endif - diff --git a/openembedded/packages/udev/udev-070/noasmlinkage.patch b/openembedded/packages/udev/udev-070/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0..000000000 --- a/openembedded/packages/udev/udev-070/noasmlinkage.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/udev.c~noasmlinkage.patch -+++ udev-062/udev.c -@@ -54,7 +54,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-062/udevd.c~noasmlinkage.patch -+++ udev-062/udevd.c -@@ -639,7 +639,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - ---- udev-062/udevstart.c~noasmlinkage.patch -+++ udev-062/udevstart.c -@@ -323,7 +323,7 @@ - exec_list(&device_list); - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/openembedded/packages/udev/udev-070/tty-symlinks.patch b/openembedded/packages/udev/udev-070/tty-symlinks.patch deleted file mode 100644 index 28bdf92af..000000000 --- a/openembedded/packages/udev/udev-070/tty-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 -+++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 -@@ -14,8 +14,8 @@ - KERNEL="fd[0-9]*", NAME="floppy/%n" - - # tty devices --KERNEL="tty[0-9]*", NAME="vc/%n" --KERNEL="ttyS[0-9]*", NAME="tts/%n" -+KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" -+KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" - KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" - - # vc devices diff --git a/openembedded/packages/udev/udev-071/flags.patch b/openembedded/packages/udev/udev-071/flags.patch new file mode 100644 index 000000000..cb1733621 --- /dev/null +++ b/openembedded/packages/udev/udev-071/flags.patch @@ -0,0 +1,72 @@ +Index: udev-071/Makefile +=================================================================== +--- udev-071.orig/Makefile 2005-10-19 23:28:34.000000000 +0100 ++++ udev-071/Makefile 2005-11-01 22:04:31.000000000 +0000 +@@ -160,36 +160,36 @@ + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} + +-CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ ++override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ + -Wstrict-prototypes -Wsign-compare +-CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) +-CFLAGS += -pipe +-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) ++override CFLAGS += -pipe ++override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + + # use '-Os' optimization if available, else use -O2 + OPTFLAGS := $(call cc-supports, -Os, -O2) + + # include our local copy of libsysfs +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ override CFLAGS += -O1 -g -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer ++ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer + LDFLAGS += -s -Wl + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS = -fprofile-arcs + endif + +@@ -200,18 +200,18 @@ + CC = $(KLCC) + LD = $(KLCC) + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + LDFLAGS += -Wl,-warn-common + endif + + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/openembedded/packages/udev/udev-071/noasmlinkage.patch b/openembedded/packages/udev/udev-071/noasmlinkage.patch new file mode 100644 index 000000000..0d8e854c0 --- /dev/null +++ b/openembedded/packages/udev/udev-071/noasmlinkage.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/udev.c~noasmlinkage.patch ++++ udev-062/udev.c +@@ -54,7 +54,7 @@ + } + #endif + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +--- udev-062/udevd.c~noasmlinkage.patch ++++ udev-062/udevd.c +@@ -639,7 +639,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + int rc; + +--- udev-062/udevstart.c~noasmlinkage.patch ++++ udev-062/udevstart.c +@@ -323,7 +323,7 @@ + exec_list(&device_list); + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/openembedded/packages/udev/udev-071/tty-symlinks.patch b/openembedded/packages/udev/udev-071/tty-symlinks.patch new file mode 100644 index 000000000..28bdf92af --- /dev/null +++ b/openembedded/packages/udev/udev-071/tty-symlinks.patch @@ -0,0 +1,13 @@ +--- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 ++++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 +@@ -14,8 +14,8 @@ + KERNEL="fd[0-9]*", NAME="floppy/%n" + + # tty devices +-KERNEL="tty[0-9]*", NAME="vc/%n" +-KERNEL="ttyS[0-9]*", NAME="tts/%n" ++KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" ++KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" + KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" + + # vc devices diff --git a/openembedded/packages/udev/udev_070.bb b/openembedded/packages/udev/udev_070.bb deleted file mode 100644 index e5f0409b1..000000000 --- a/openembedded/packages/udev/udev_070.bb +++ /dev/null @@ -1,17 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://tty-symlinks.patch;patch=1" - -include udev.inc - -PR = "r5" - -UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" - -#FIXME UDEV MIGRATION PLAN: -#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) -#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug -#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() -#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules diff --git a/openembedded/packages/udev/udev_071.bb b/openembedded/packages/udev/udev_071.bb new file mode 100644 index 000000000..e5f0409b1 --- /dev/null +++ b/openembedded/packages/udev/udev_071.bb @@ -0,0 +1,17 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://tty-symlinks.patch;patch=1" + +include udev.inc + +PR = "r5" + +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" + +#FIXME UDEV MIGRATION PLAN: +#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) +#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug +#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() +#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules -- cgit v1.2.3