From 5cc4b1e6f949548302710f7a56be8179b455c43b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 16 Nov 2009 16:17:23 +0100 Subject: [PATCH] udev: - add some patches from moblin --- .../patches/fix-5820-fail-to-install.diff | 23 ++++++++++++++++++ .../udev/patches/udev-116-nettype.diff | 14 +++++++++++ .../udev/patches/udev-118-sysconf.diff | 24 +++++++++++++++++++ .../udev/patches/udev-136-audio-video.diff | 13 ++++++++++ .../udev/patches/udev-136-tty-group.diff | 11 +++++++++ .../udev/patches/udev-input-needs-group.diff | 15 ++++++++++++ 6 files changed, 100 insertions(+) create mode 100644 packages/sysutils/udev/patches/fix-5820-fail-to-install.diff create mode 100644 packages/sysutils/udev/patches/udev-116-nettype.diff create mode 100644 packages/sysutils/udev/patches/udev-118-sysconf.diff create mode 100644 packages/sysutils/udev/patches/udev-136-audio-video.diff create mode 100644 packages/sysutils/udev/patches/udev-136-tty-group.diff create mode 100644 packages/sysutils/udev/patches/udev-input-needs-group.diff diff --git a/packages/sysutils/udev/patches/fix-5820-fail-to-install.diff b/packages/sysutils/udev/patches/fix-5820-fail-to-install.diff new file mode 100644 index 0000000000..daa941e6e8 --- /dev/null +++ b/packages/sysutils/udev/patches/fix-5820-fail-to-install.diff @@ -0,0 +1,23 @@ +diff -Nur udev-145/udev/udevd.c udev-145-new/udev/udevd.c +--- udev-145/udev/udevd.c 2009-07-13 09:19:51.000000000 +0800 ++++ udev-145-new/udev/udevd.c 2009-09-03 22:49:08.000000000 +0800 +@@ -654,14 +654,16 @@ + if ((ioctl(pfd[FD_INOTIFY].fd, FIONREAD, &nbytes) < 0) || (nbytes <= 0)) + return 0; + +- buf = malloc(nbytes); ++ info(udev, "buf allocated size: %d", nbytes); ++ buf = malloc(nbytes*2); + if (buf == NULL) { + err(udev, "error getting buffer for inotify\n"); + return -1; + } +- ++ + nbytes = read(pfd[FD_INOTIFY].fd, buf, nbytes); +- ++ info(udev, "buf read size: %d", nbytes); ++ + for (pos = 0; pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) { + struct udev_device *dev; + diff --git a/packages/sysutils/udev/patches/udev-116-nettype.diff b/packages/sysutils/udev/patches/udev-116-nettype.diff new file mode 100644 index 0000000000..b68f236f2d --- /dev/null +++ b/packages/sysutils/udev/patches/udev-116-nettype.diff @@ -0,0 +1,14 @@ +diff -up udev-116/extras/rule_generator/write_net_rules.nettype udev-116/extras/rule_generator/write_net_rules +--- udev-116/extras/rule_generator/write_net_rules.nettype 2007-10-18 21:16:28.000000000 +0200 ++++ udev-116/extras/rule_generator/write_net_rules 2007-10-18 21:20:55.000000000 +0200 +@@ -23,6 +23,10 @@ + + RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + ++if [ "$MATCHIFTYPE" ]; then ++ [ $[MATCHIFTYPE] -gt 256 ] && return 0 ++fi ++ + . /lib/udev/rule_generator.functions + + interface_name_taken() { diff --git a/packages/sysutils/udev/patches/udev-118-sysconf.diff b/packages/sysutils/udev/patches/udev-118-sysconf.diff new file mode 100644 index 0000000000..25ce9374de --- /dev/null +++ b/packages/sysutils/udev/patches/udev-118-sysconf.diff @@ -0,0 +1,24 @@ +diff -up udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage.rules +--- udev-120/rules/rules.d/60-persistent-storage.rules.sysconf 2008-04-03 21:12:53.000000000 +0200 ++++ udev-120/rules/rules.d/60-persistent-storage.rules 2008-04-04 14:11:35.000000000 +0200 +@@ -3,6 +3,8 @@ + # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path} + # scheme based on "Linux persistent device names", 2004, Hannes Reinecke + ++ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end" ++ + ACTION!="add|change", GOTO="persistent_storage_end" + SUBSYSTEM!="block", GOTO="persistent_storage_end" + +diff -up udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules +--- udev-120/rules/rules.d/60-persistent-storage-tape.rules.sysconf 2008-04-03 21:12:53.000000000 +0200 ++++ udev-120/rules/rules.d/60-persistent-storage-tape.rules 2008-04-04 14:10:46.000000000 +0200 +@@ -2,6 +2,8 @@ + + # persistent storage links: /dev/tape/{by-id,by-path} + ++ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_tape_end" ++ + ACTION!="add|change", GOTO="persistent_storage_tape_end" + + KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" diff --git a/packages/sysutils/udev/patches/udev-136-audio-video.diff b/packages/sysutils/udev/patches/udev-136-audio-video.diff new file mode 100644 index 0000000000..ae42855c6a --- /dev/null +++ b/packages/sysutils/udev/patches/udev-136-audio-video.diff @@ -0,0 +1,13 @@ +Index: udev-136/rules/rules.d/50-udev-default.rules +=================================================================== +--- udev-136.orig/rules/rules.d/50-udev-default.rules ++++ udev-136/rules/rules.d/50-udev-default.rules +@@ -34,7 +34,7 @@ KERNEL=="winradio*", GROUP="video" + + # graphics + KERNEL=="agpgart", MODE="0600", GROUP="video" +-KERNEL=="card[0-9]*", NAME="dri/%k" ++KERNEL=="card[0-9]*", NAME="dri/%k" GROUP="video" + KERNEL=="pmu", GROUP="video" + KERNEL=="nvidia*|nvidiactl*", GROUP="video" + SUBSYSTEM=="graphics", GROUP="video" diff --git a/packages/sysutils/udev/patches/udev-136-tty-group.diff b/packages/sysutils/udev/patches/udev-136-tty-group.diff new file mode 100644 index 0000000000..d64db68d17 --- /dev/null +++ b/packages/sysutils/udev/patches/udev-136-tty-group.diff @@ -0,0 +1,11 @@ +diff -Naurp udev-145-orig/rules/rules.d/50-udev-default.rules udev-145/rules/rules.d/50-udev-default.rules +--- udev-145-orig/rules/rules.d/50-udev-default.rules 2009-07-15 14:01:46.000000000 -0400 ++++ udev-145/rules/rules.d/50-udev-default.rules 2009-07-15 14:04:36.000000000 -0400 +@@ -8,6 +8,6 @@ KERNEL=="tty[pqrstuvwxyzabcdef][01234567 + KERNEL=="ptmx", GROUP="tty", MODE="0666" + KERNEL=="tty", GROUP="tty", MODE="0666" +-KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" ++KERNEL=="tty[0-9]*", GROUP="video", MODE="0660" + KERNEL=="console", MODE="0600" + KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty" + diff --git a/packages/sysutils/udev/patches/udev-input-needs-group.diff b/packages/sysutils/udev/patches/udev-input-needs-group.diff new file mode 100644 index 0000000000..8b3b19b288 --- /dev/null +++ b/packages/sysutils/udev/patches/udev-input-needs-group.diff @@ -0,0 +1,15 @@ +--- udev-136/rules/rules.d/50-udev-default.rules~ 2009-07-01 13:13:13.000000000 -0700 ++++ udev-136/rules/rules.d/50-udev-default.rules 2009-07-01 13:13:13.000000000 -0700 +@@ -22,9 +22,9 @@ + KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640" + + # input +-KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640" +-KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0640" +-KERNEL=="js[0-9]*", NAME="input/%k", MODE="0644" ++KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0660", GROUP="video" ++KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0660", GROUP="video" ++KERNEL=="js[0-9]*", NAME="input/%k", MODE="0664", GROUP="video" + + # video4linux + SUBSYSTEM=="video4linux", GROUP="video"