X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fudev;h=6e31c90750ca4a3a72e9ce4d7ac4ba2efb781663;hp=2b091bbd9d7f383637e3a728e71ceda4a46096e3;hb=f7b9315ef36af9405529c7d77c23c28a02d9169f;hpb=38c982bb77390f53744815eedb877ebeab05ba4b

diff --git a/lfs/udev b/lfs/udev
index 2b091bbd9..6e31c9075 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,11 +30,7 @@ THISAPP    = udev-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -77,36 +73,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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 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"
-	cd $(DIR_APP) && make DESTDIR=/install/initrd 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" 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
-	cd /install/initrd/dev && mknod -m 0777 null c 1 3
-	cd /install/initrd/dev && rm -f tty*
-	cd /install/initrd/dev && mknod -m 0600 tty1 c 4 1
-	cd /install/initrd/dev && mknod -m 0600 tty2 c 4 2
-	cd /install/initrd/dev && mknod -m 0600 tty3 c 4 3
-	cd /install/initrd/dev && mknod -m 0600 tty4 c 4 4
-	cd /install/initrd/dev && mknod -m 0600 tty5 c 4 5
-	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
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-ext4_wo_journal.patch
 	rm -rf /lib/udev/devices
 	cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch
 	install -dv /lib/{firmware,udev/devices/{pts,shm}}
 	echo "Put device firmwares here ..." > /lib/firmware/dirinfo
 	mknod -m0666 /lib/udev/devices/null c 1 3
@@ -130,6 +101,11 @@ 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
+
+	# Install codel rules.
+	install -v -m 644 $(DIR_SRC)/config/udev/99-codel.rules \
+		/lib/udev/rules.d
+	install -m 755 $(DIR_SRC)/config/udev/enable_codel \
+		/lib/udev/enable_codel
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)