X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fudev;h=15dae817b2b35dd6d02f7ccbfb80be7dbdb487b1;hb=16d49f73e54ca80e7f6fb670cee6f67f93187fe4;hp=2b091bbd9d7f383637e3a728e71ceda4a46096e3;hpb=57e682114e87ea9ed4cc419aea17dfd63cf3917b;p=ipfire-2.x.git

diff --git a/lfs/udev b/lfs/udev
index 2b091bbd9d..15dae817b2 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-2013  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        #
@@ -24,29 +24,26 @@
 
 include Config
 
-VER        = 125
+VER        = 208
 
 THISAPP    = udev-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = systemd-$(VER).tar.xz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+DIR_APP    = $(DIR_SRC)/systemd-$(VER)
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) udev-config-6.2.tar.bz2
+objects = $(DL_FILE) udev-lfs-208-1.tar.bz2
+
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2
+udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2
 
-$(DL_FILE)_MD5 = be98e04cefdd9ca76b8fe7e92735ce29
-udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0
+$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165
+udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7
 
 install : $(TARGET)
 
@@ -75,61 +72,49 @@ $(subst %,%_MD5,$(objects)) :
 
 $(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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
+
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
+
+	cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h
+
 	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
-	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
-	ln -sv /proc/self/fd/1 /lib/udev/devices/stdout
-	ln -sv /proc/self/fd/2 /lib/udev/devices/stderr
-	ln -sv /proc/kcore /lib/udev/devices/core
-	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=/ 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 $(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
+	install -dv /lib/firmware
+
+	cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING)
+	cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install
+
+	# Make some compat symlinks
+	ln -sf /lib/udev/udevd /sbin/udevd
+	ln -sf /sbin/udevadm /bin/udevadm
+
+	# Disable net generator rule. This does not work with the setup.
+	rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
+	rm -f /lib/udev/rules.d/80-net-name-slot.rules
+
+	# Create rule file for the setup
 	touch /etc/udev/rules.d/30-persistent-network.rules
-	cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
-endif
+
+	# Blacklist some modules
+	cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf
+
+	# Install config file
+	install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \
+		/etc/udev/
+
+	# Install alsa rules.
+	install -v -m 644 $(DIR_SRC)/config/udev/25-alsa.rules \
+		/lib/udev/rules.d
+
+	# Install hwrng rules.
+	install -v -m 644 $(DIR_SRC)/config/udev/90-hwrng.rules \
+		/lib/udev/rules.d
+
+	# 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)