X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fudev;h=77d7ae546baf43b50b259da4ea72ff5d06032e2e;hp=4667ff4a68b70f3c370531ef33388b0387bf60ae;hb=1ea989ebb7f33c9d43ea52761683dacdb21d40de;hpb=2154c34815631b163c2dbc6d34ed1a4925339017

diff --git a/lfs/udev b/lfs/udev
index 4667ff4a68..77d7ae546b 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,21 +24,17 @@
 
 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"
 	TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-ifeq "$(KLIBC)" "1"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-klibc
 else
 	TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
-endif
 
 ###############################################################################
 # Top-level Rules
@@ -49,7 +45,7 @@ objects = $(DL_FILE) udev-config-6.2.tar.bz2
 $(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)
@@ -79,13 +75,13 @@ $(subst %,%_MD5,$(objects)) :
 
 $(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"
@@ -93,6 +89,7 @@ ifeq "$(LFS_PASS)" "install"
 					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
@@ -106,28 +103,6 @@ ifeq "$(LFS_PASS)" "install"
 	cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6
 	cp -f /etc/udev/rules.d/55-scsi-cdrom.rules /install/initrd/etc/udev/rules.d/55-scsi-cdrom.rules
 
-else
-ifeq "$(KLIBC)" "1"
-	cd $(DIR_APP) && sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
-	cd $(DIR_APP) && sed -i "s|USE_KLIBC = .*|USE_KLIBC = true|g" Makefile
-
-	cd $(DIR_APP) && make PROGRAMS="udevd udevsettle udevtrigger" EXTRAS="extras/firmware extras/cdrom_id"
-
-	-mkdir -p /lib/initcpio/udev
-	-mkdir -p /lib/initcpio/install
-	-mkdir -p /lib/initcpio/hooks
-	cd $(DIR_APP) && install -m755 udevd /lib/initcpio/udev
-	cd $(DIR_APP) && install -m755 udevtrigger  /lib/initcpio/udev
-	cd $(DIR_APP) && install -m755 udevsettle  /lib/initcpio/udev
-	cd $(DIR_APP) && install -m755 extras/firmware/firmware.sh  /lib/initcpio/udev
-	cd $(DIR_APP) && install -m755 extras/cdrom_id/cdrom_id  /lib/initcpio/udev
-	
-	install -m755 $(DIR_SRC)/config/mkinitcpio/start_udev /lib/initcpio/udev
-	install -m644 $(DIR_SRC)/config/mkinitcpio/udev.rules  /lib/initcpio/udev
-	install -m755 $(DIR_SRC)/config/mkinitcpio/load-modules.sh /lib/initcpio/udev
-	install -m644 $(DIR_SRC)/config/mkinitcpio/udev_install /lib/initcpio/install/udev
-	install -m644 $(DIR_SRC)/config/mkinitcpio/udev_hook /lib/initcpio/hooks/udev
-
 else
 	rm -rf /lib/udev/devices
 	cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
@@ -154,7 +129,6 @@ else
 	chmod 755 /etc/udev/dvb.sh
 	touch /etc/udev/rules.d/30-persistent-network.rules
 	cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
-endif
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)