- update to udev-157
- remove unneeded patches
This commit is contained in:
Stephan Raue 2010-06-05 08:16:07 +02:00
parent a08c198e93
commit 0a5994aef7
6 changed files with 11 additions and 88 deletions

View File

@ -1,7 +1,7 @@
diff -Naur udev-153/configure.ac udev-153.patch/configure.ac
--- udev-153/configure.ac 2010-04-21 08:30:43.000000000 +0200
+++ udev-153.patch/configure.ac 2010-04-21 17:47:39.531454320 +0200
@@ -59,9 +59,6 @@
diff -Naur udev-157/configure.ac udev-157.patch/configure.ac
--- udev-157/configure.ac 2010-05-25 12:37:13.000000000 +0200
+++ udev-157.patch/configure.ac 2010-06-04 03:21:27.322476023 +0200
@@ -77,9 +77,6 @@
AC_SUBST([GLIB_CFLAGS])
AC_SUBST([GLIB_LIBS])
@ -11,10 +11,10 @@ diff -Naur udev-153/configure.ac udev-153.patch/configure.ac
PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LIBS)
diff -Naur udev-153/Makefile.am udev-153.patch/Makefile.am
--- udev-153/Makefile.am 2010-04-20 07:02:58.000000000 +0200
+++ udev-153.patch/Makefile.am 2010-04-21 17:47:06.705490633 +0200
@@ -418,21 +418,6 @@
diff -Naur udev-157/Makefile.am udev-157.patch/Makefile.am
--- udev-157/Makefile.am 2010-05-30 15:15:15.000000000 +0200
+++ udev-157.patch/Makefile.am 2010-06-04 03:22:58.538351510 +0200
@@ -419,21 +419,6 @@
libexec_PROGRAMS += extras/hid2hci/hid2hci
# ------------------------------------------------------------------------------
@ -36,7 +36,7 @@ diff -Naur udev-153/Makefile.am udev-153.patch/Makefile.am
# usb-db - read USB vendor/device string database
# ------------------------------------------------------------------------------
extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
@@ -465,101 +450,6 @@
@@ -466,101 +451,6 @@
libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
@ -119,7 +119,7 @@ diff -Naur udev-153/Makefile.am udev-153.patch/Makefile.am
- extras/keymap/force-release-maps/common-volume-keys
-
-extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
- mkdir -p extras/keymap
- $(AM_V_at)mkdir -p extras/keymap
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt

View File

@ -1,24 +0,0 @@
diff -Naur udev-151.orig/extras/ata_id/ata_id.c udev-151/extras/ata_id/ata_id.c
--- udev-151.orig/extras/ata_id/ata_id.c 2010-02-16 21:25:09.530757189 +0100
+++ udev-151/extras/ata_id/ata_id.c 2010-02-16 21:39:06.082007681 +0100
@@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define u8 uint8_t
+
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
diff -Naur udev-151.orig/extras/scsi_id/scsi_serial.c udev-151/extras/scsi_id/scsi_serial.c
--- udev-151.orig/extras/scsi_id/scsi_serial.c 2010-02-16 21:25:09.530757189 +0100
+++ udev-151/extras/scsi_id/scsi_serial.c 2010-02-16 21:38:56.010757438 +0100
@@ -14,6 +14,8 @@
* Free Software Foundation version 2 of the License.
*/
+#define u8 uint8_t
+
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/stat.h>

View File

@ -1,23 +0,0 @@
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;

View File

@ -1,14 +0,0 @@
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() {

View File

@ -1,16 +0,0 @@
diff -urN udev-150/rules/rules.d/50-udev-default.rules udev-150-new/rules/rules.d/50-udev-default.rules
--- udev-150/rules/rules.d/50-udev-default.rules 2009-12-15 23:17:02.000000000 +0800
+++ udev-150-new/rules/rules.d/50-udev-default.rules 2010-01-09 21:03:09.000000000 +0800
@@ -22,9 +22,9 @@
KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
# input
-KERNEL=="mouse*|mice|event*", MODE="0640"
-KERNEL=="ts[0-9]*|uinput", MODE="0640"
-KERNEL=="js[0-9]*", MODE="0644"
+KERNEL=="mouse*|mice|event*", MODE="0660", GROUP="video"
+KERNEL=="ts[0-9]*|uinput", MODE="0660", GROUP="video"
+KERNEL=="js[0-9]*", MODE="0664", GROUP="video"
# video4linux
SUBSYSTEM=="video4linux", GROUP="video"

View File

@ -1 +1 @@
http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-156.tar.bz2
http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-157.tar.bz2