etc/modprobe.d/blacklist
etc/scsi_id.config
etc/udev
-etc/udev/dvb.sh
+#etc/udev/dvb.sh
#etc/udev/rules.d
#etc/udev/rules.d/05-udev-early.rules
-etc/udev/rules.d/10-dvb.rules
+#etc/udev/rules.d/10-dvb.rules
#etc/udev/rules.d/25-lfs.rules
#etc/udev/rules.d/26-modprobe.rules
#etc/udev/rules.d/27-firmware.rules
#lib/firmware
lib/firmware/dirinfo
lib/libvolume_id.so.0
-lib/libvolume_id.so.0.66.0
+lib/libvolume_id.so.0.85.0
lib/udev
#lib/udev/ata_id
#lib/udev/cdrom_id
#lib/udev/edd_id
#lib/udev/firmware.sh
#lib/udev/path_id
+#lib/udev/rules.d
+#lib/udev/rules.d/50-udev-default.rules
+#lib/udev/rules.d/60-cdrom_id.rules
+#lib/udev/rules.d/60-persistent-input.rules
+#lib/udev/rules.d/60-persistent-storage-tape.rules
+#lib/udev/rules.d/60-persistent-storage.rules
+#lib/udev/rules.d/60-persistent-v4l.rules
+#lib/udev/rules.d/61-persistent-storage-edd.rules
+#lib/udev/rules.d/80-drivers.rules
+#lib/udev/rules.d/95-udev-late.rules
#lib/udev/scsi_id
#lib/udev/usb_id
#lib/udev/vol_id
-sbin/scsi_id
-sbin/udevcontrol
+sbin/udevadm
sbin/udevd
sbin/udevsettle
-sbin/udevtrigger
usr/bin/udevinfo
-usr/bin/udevtest
#usr/include/libvolume_id.h
-#usr/lib/libvolume_id.a
usr/lib/libvolume_id.so
#usr/lib/pkgconfig/libvolume_id.pc
-usr/sbin/udevmonitor
#usr/share/man/man7/udev.7
#usr/share/man/man8/ata_id.8
#usr/share/man/man8/cdrom_id.8
+#usr/share/man/man8/create_floppy_devices.8
#usr/share/man/man8/edd_id.8
+#usr/share/man/man8/path_id.8
#usr/share/man/man8/scsi_id.8
-#usr/share/man/man8/udevcontrol.8
+#usr/share/man/man8/udevadm.8
#usr/share/man/man8/udevd.8
-#usr/share/man/man8/udevinfo.8
-#usr/share/man/man8/udevmonitor.8
-#usr/share/man/man8/udevsettle.8
-#usr/share/man/man8/udevtest.8
-#usr/share/man/man8/udevtrigger.8
#usr/share/man/man8/vol_id.8
include Config
-VER = 096
+VER = 125
THISAPP = udev-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2
-$(DL_FILE)_MD5 = f4effef7807ce1dc91ab581686ef197b
+$(DL_FILE)_MD5 = be98e04cefdd9ca76b8fe7e92735ce29
udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-096-netif_rename.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-netif_rename.patch
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev
cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install
rm -f /install/initrd/sbin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev*
- cd $(DIR_APP) && install udevstart udevinfo udevd udevsettle udevtrigger /install/initrd/sbin
+ cd $(DIR_APP) && install udevadm udevd /install/initrd/sbin
cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
extras/firmware extras/floppy extras/path_id \
extras/scsi_id extras/usb_id extras/volume_id"
extras/firmware extras/floppy extras/path_id \
extras/scsi_id extras/usb_id extras/volume_id" install
cd /install/initrd/usr/share && rm -rf man
+ -mkdir -pv /install/initrd/dev
cd /install/initrd/dev && rm -f console
cd /install/initrd/dev && mknod -m 0600 console c 5 1
cd /install/initrd/dev && rm -f null
+++ /dev/null
-diff -Naur udev-096.org/udev_device.c udev-096/udev_device.c
---- udev-096.org/udev_device.c 2006-07-09 21:48:19.000000000 +0200
-+++ udev-096/udev_device.c 2009-04-28 22:04:56.000000000 +0200
-@@ -102,40 +102,8 @@
- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
- retval = ioctl(sk, SIOCSIFNAME, &ifr);
- if (retval != 0) {
-- int loop;
--
-- /* see if the destination interface name already exists */
-- if (errno != EEXIST) {
-- err("error changing netif name: %s", strerror(errno));
-- goto exit;
-- }
--
-- /* free our own name, another process may wait for us */
-- strlcpy(ifr.ifr_newname, udev->dev->kernel_name, IFNAMSIZ);
-- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
-- retval = ioctl(sk, SIOCSIFNAME, &ifr);
-- if (retval != 0) {
-- err("error changing netif name: %s", strerror(errno));
-- goto exit;
-- }
--
-- /* wait 30 seconds for our target to become available */
-- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
-- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
-- loop = 30 * 20;
-- while (loop--) {
-- retval = ioctl(sk, SIOCSIFNAME, &ifr);
-- if (retval != 0) {
-- if (errno != EEXIST) {
-- err("error changing net interface name: %s", strerror(errno));
-- break;
-- }
-- dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
-- usleep(1000 * 1000 / 20);
-- }
-- }
-+ err("error changing netif name: %s", strerror(errno));
- }
--
- exit:
- close(sk);
- return retval;
--- /dev/null
+diff -Nur udev-125.vanilla/udev_device.c udev-125/udev_device.c
+--- udev-125.vanilla/udev_device.c 2008-07-18 16:26:55.000000000 +0200
++++ udev-125/udev_device.c 2010-07-25 18:15:12.289242450 +0200
+@@ -123,42 +123,7 @@
+ if (retval == 0)
+ kernel_log(ifr);
+ else {
+- int loop;
+-
+- /* see if the destination interface name already exists */
+- if (errno != EEXIST) {
+- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+- goto exit;
+- }
+-
+- /* free our own name, another process may wait for us */
+- strlcpy(ifr.ifr_newname, udev->dev->kernel, IFNAMSIZ);
+- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
+- retval = ioctl(sk, SIOCSIFNAME, &ifr);
+- if (retval != 0) {
+- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+- goto exit;
+- }
+-
+- /* wait 30 seconds for our target to become available */
+- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
+- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
+- loop = 30 * 20;
+- while (loop--) {
+- retval = ioctl(sk, SIOCSIFNAME, &ifr);
+- if (retval == 0) {
+- kernel_log(ifr);
+- break;
+- }
+-
+- if (errno != EEXIST) {
+- err("error changing net interface name %s to %s: %s\n",
+- ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+- break;
+- }
+- dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop);
+- usleep(1000 * 1000 / 20);
+- }
++ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+ }
+
+ exit: