X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fudev;h=4667ff4a68b70f3c370531ef33388b0387bf60ae;hp=1bcd22f50b22460d458c7cfccd6d01946ab07cce;hb=fc558271507c47ac73eaa2a2d1643cb8281fbe91;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/udev b/lfs/udev
index 1bcd22f50b..4667ff4a68 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -80,6 +80,7 @@ $(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
 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
@@ -103,6 +104,8 @@ ifeq "$(LFS_PASS)" "install"
 	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
 ifeq "$(KLIBC)" "1"
 	cd $(DIR_APP) && sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
@@ -124,9 +127,12 @@ ifeq "$(KLIBC)" "1"
 	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
 	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
 	ln -sv /proc/self/fd /lib/udev/devices/fd
 	ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
@@ -140,7 +146,14 @@ else
 					extras/firmware extras/floppy extras/path_id \
 					extras/scsi_id extras/usb_id extras/volume_id" install
 	cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/
+	cp -rf $(DIR_SRC)/config/udev/10-dvb.rules /etc/udev/rules.d/
+	cp -rf $(DIR_SRC)/config/udev/55-scsi-cdrom.rules /etc/udev/rules.d/
+	chmod 644 /etc/udev/rules.d/10-dvb.rules
+	chmod 644 /etc/udev/rules.d/55-scsi-cdrom.rules
+	cp -rf $(DIR_SRC)/config/udev/dvb.sh /etc/udev/
+	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)