From 07ef852b5f8ab5c3277876458486100136199118 Mon Sep 17 00:00:00 2001 From: geoff Date: Mon, 24 Aug 2009 20:19:26 +0000 Subject: udev: Update udev package from udev-106 to udev-142 Update the init scripts have to use udevadm where appropriate. The udev package no longer provides separate udev utilities like udevtrigger and udevsettle. These have been incorporated into the udev admin program udevadm. Replace the udevextras sub package with config options to the udev package. Update the preinit script to check for '/lib/udev/devices', and copy it to '/dev/ if it is found, then to conditionaly setup /dev the old way with mknod etc. Udev now recommends using the directory '/lib/udev/devices' to initialize the '/dev' directory at startup. Signed-off-by: Geoff Levand git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17378 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/udev/patches/001-no_debug.patch | 22 ---------- .../udev/patches/002-udevtrigger_no_config.patch | 12 ----- package/udev/patches/003-portability.patch | 51 ---------------------- 3 files changed, 85 deletions(-) delete mode 100644 package/udev/patches/001-no_debug.patch delete mode 100644 package/udev/patches/002-udevtrigger_no_config.patch delete mode 100644 package/udev/patches/003-portability.patch (limited to 'package/udev/patches') diff --git a/package/udev/patches/001-no_debug.patch b/package/udev/patches/001-no_debug.patch deleted file mode 100644 index 626181e47..000000000 --- a/package/udev/patches/001-no_debug.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: udev-106/Makefile -=================================================================== ---- udev-106.orig/Makefile 2007-06-04 13:22:17.765154568 +0200 -+++ udev-106/Makefile 2007-06-04 13:22:17.831144536 +0200 -@@ -113,7 +113,7 @@ - AR = $(CROSS_COMPILE)ar - RANLIB = $(CROSS_COMPILE)ranlib - --CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ - -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ - -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes -@@ -130,7 +130,7 @@ - - # if DEBUG is enabled, then we do not strip - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -DDEBUG -+ CFLAGS += -g -DDEBUG - endif - - ifeq ($(strip $(USE_GCOV)),true) diff --git a/package/udev/patches/002-udevtrigger_no_config.patch b/package/udev/patches/002-udevtrigger_no_config.patch deleted file mode 100644 index db68ebf76..000000000 --- a/package/udev/patches/002-udevtrigger_no_config.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: udev-106/udevtrigger.c -=================================================================== ---- udev-106.orig/udevtrigger.c 2007-06-04 13:22:17.745157608 +0200 -+++ udev-106/udevtrigger.c 2007-06-04 13:22:18.022115504 +0200 -@@ -446,7 +446,6 @@ - }; - - logging_init("udevtrigger"); -- udev_config_init(); - dbg("version %s", UDEV_VERSION); - sysfs_init(); - diff --git a/package/udev/patches/003-portability.patch b/package/udev/patches/003-portability.patch deleted file mode 100644 index f11f969bb..000000000 --- a/package/udev/patches/003-portability.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: udev-106/Makefile -=================================================================== ---- udev-106.orig/Makefile 2007-06-04 13:22:17.831144536 +0200 -+++ udev-106/Makefile 2007-06-04 13:22:18.210086928 +0200 -@@ -246,13 +246,15 @@ - .PHONY: install-config - - install-man: -- $(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7 -- $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8 -- $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8 -- $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8 -- $(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8 -- $(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8 -- $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8 -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man7 -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 -+ $(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7 -+ $(INSTALL_DATA) udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8 -+ $(INSTALL_DATA) udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8 -+ $(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8 -+ $(INSTALL_DATA) udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8 -+ $(INSTALL_DATA) udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8 -+ $(INSTALL_DATA) udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8 - - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8 - @extras="$(EXTRAS)"; for target in $$extras; do \ - $(MAKE) -C $$target $@ || exit 1; \ -@@ -275,13 +277,16 @@ - - install-bin: - $(INSTALL) -d $(DESTDIR)$(udevdir) -- $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd -- $(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger -- $(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle -- $(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol -- $(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor -- $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo -- $(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest -+ $(INSTALL) -d $(DESTDIR)$(sbindir) -+ $(INSTALL) -d $(DESTDIR)$(usrbindir) -+ $(INSTALL) -d $(DESTDIR)$(usrsbindir) -+ $(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd -+ $(INSTALL_PROGRAM) udevtrigger $(DESTDIR)$(sbindir)/udevtrigger -+ $(INSTALL_PROGRAM) udevsettle $(DESTDIR)$(sbindir)/udevsettle -+ $(INSTALL_PROGRAM) udevcontrol $(DESTDIR)$(sbindir)/udevcontrol -+ $(INSTALL_PROGRAM) udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor -+ $(INSTALL_PROGRAM) udevinfo $(DESTDIR)$(usrbindir)/udevinfo -+ $(INSTALL_PROGRAM) udevtest $(DESTDIR)$(usrbindir)/udevtest - @extras="$(EXTRAS)"; for target in $$extras; do \ - $(MAKE) -C $$target $@ || exit 1; \ - done; -- cgit v1.2.3