diff options
| -rw-r--r-- | packages/udev/udev-065/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/udev/udev-065/fix-alignment.patch | 24 | ||||
| -rw-r--r-- | packages/udev/udev-065/flags.patch | 66 | ||||
| -rw-r--r-- | packages/udev/udev-065/noasmlinkage.patch | 38 | ||||
| -rw-r--r-- | packages/udev/udev-065/tty-symlinks.patch | 11 | ||||
| -rw-r--r-- | packages/udev/udev_065.bb | 22 |
6 files changed, 161 insertions, 0 deletions
diff --git a/packages/udev/udev-065/.mtn2git_empty b/packages/udev/udev-065/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-065/.mtn2git_empty diff --git a/packages/udev/udev-065/fix-alignment.patch b/packages/udev/udev-065/fix-alignment.patch new file mode 100644 index 0000000000..8c7b8b5ac5 --- /dev/null +++ b/packages/udev/udev-065/fix-alignment.patch @@ -0,0 +1,24 @@ +diff --git a/udev_rules_parse.c b/udev_rules_parse.c +--- a/udev_rules_parse.c ++++ b/udev_rules_parse.c +@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule + int valid; + char *linepos; + char *attr; ++ size_t padding; + int retval; + + /* get all the keys */ +@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule + + /* grow buffer and add rule */ + rule_size = sizeof(struct udev_rule) + rule->bufsize; ++ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t); ++ dbg("add %zi padding bytes", padding); ++ rule_size += padding; ++ rule->bufsize += padding; ++ + rules->buf = realloc(rules->buf, rules->bufsize + rule_size); + if (!rules->buf) { + err("realloc failed"); + diff --git a/packages/udev/udev-065/flags.patch b/packages/udev/udev-065/flags.patch new file mode 100644 index 0000000000..d95daa51e2 --- /dev/null +++ b/packages/udev/udev-065/flags.patch @@ -0,0 +1,66 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-065/Makefile~flags ++++ udev-065/Makefile +@@ -106,11 +106,11 @@ + # 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) +@@ -154,16 +154,16 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-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 += -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +@@ -180,18 +180,18 @@ + CC = $(KLCC) + LD = $(KLCC) + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + 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 +- LDFLAGS += -static ++ override CFLAGS += -DUSE_STATIC ++ override LDFLAGS += -static + endif + + ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-065/noasmlinkage.patch b/packages/udev/udev-065/noasmlinkage.patch new file mode 100644 index 0000000000..0d8e854c0e --- /dev/null +++ b/packages/udev/udev-065/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/packages/udev/udev-065/tty-symlinks.patch b/packages/udev/udev-065/tty-symlinks.patch new file mode 100644 index 0000000000..6a458de64c --- /dev/null +++ b/packages/udev/udev-065/tty-symlinks.patch @@ -0,0 +1,11 @@ +--- udev-063/etc/udev/udev.rules.devfs.orig 2005-07-27 19:55:51 +0200 ++++ udev-063/etc/udev/udev.rules.devfs 2005-07-27 19:56:49 +0200 +@@ -103,3 +103,8 @@ + + # raw devices + KERNEL="raw[0-9]*", NAME="raw/%k" ++ ++# tty devices ++KERNEL=="tty[0-9]*", SYMLINK="%k" ++KERNEL=="ttyS[0-9]*", SYMLINK="%k" ++ diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb new file mode 100644 index 0000000000..f6a2783136 --- /dev/null +++ b/packages/udev/udev_065.bb @@ -0,0 +1,22 @@ +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 \ + file://init" + +include udev.inc + +PR = "r0" +UDEV_EXTRAS = "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 + +do_install_append() { + install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/ + echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules +} |