r890 - in trunk: . udev

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Mon Dec 12 23:21:21 PST 2005


Author: ryan
Date: 2005-12-13 00:21:20 -0700 (Tue, 13 Dec 2005)
New Revision: 890

Modified:
   trunk/
   trunk/udev/Makefile
Log:
 r920 at rei:  ryan | 2005-12-13 18:24:18 +1100
 Fix typos/errors in Makefile



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:835
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:920
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Modified: trunk/udev/Makefile
===================================================================
--- trunk/udev/Makefile	2005-12-13 07:20:48 UTC (rev 889)
+++ trunk/udev/Makefile	2005-12-13 07:21:20 UTC (rev 890)
@@ -6,34 +6,35 @@
 
 all: install
 
-install: device_dirs device_link rules scripts boot
+install: device_dirs device_links rules scripts boot
 
 rules:
-	install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/05-udev-early.rules
-	install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/50-udev.rules
-	install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/60-persistent.rules
-	install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/80-sysconfig.rules
-	install -m ${RULESMODE} ${DESTDIR}/etc/udev/rules.d/95-debug.rules
+	install -m ${RULESMODE} 05-udev-early.rules ${DESTDIR}/etc/udev/rules.d/05-udev-early.rules
+	install -m ${RULESMODE} 50-udev.rules ${DESTDIR}/etc/udev/rules.d/50-udev.rules
+	install -m ${RULESMODE} 60-persistent.rules ${DESTDIR}/etc/udev/rules.d/60-persistent.rules
+	install -m ${RULESMODE} 80-sysconfig.rules ${DESTDIR}/etc/udev/rules.d/80-sysconfig.rules
+	install -m ${RULESMODE} 95-debug.rules ${DESTDIR}/etc/udev/rules.d/95-debug.rules
 
 scripts:
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/remove_floppy_devices.sh
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/load_floppy_module.sh
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/ide.sh
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/firmware.sh
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/input.sh
-	install -m ${SCRIPTMODE) ${DESTDIR}/lib/udev/mount.sh
-	install -m ${CONFMODE} ${DESTDIR}/etc/scsi_id.config
-	install -m ${SCRIPTMODE) ${DESTDIR}/usr/bin/udev.count_events
+	install -m ${SCRIPTMODE} remove_floppy_devices.sh ${DESTDIR}/lib/udev/remove_floppy_devices.sh
+	install -m ${SCRIPTMODE} load_floppy_module.sh ${DESTDIR}/lib/udev/load_floppy_module.sh
+	install -m ${SCRIPTMODE} ide.sh ${DESTDIR}/lib/udev/ide.sh
+	install -m ${SCRIPTMODE} firmware.sh ${DESTDIR}/lib/udev/firmware.sh
+	install -m ${SCRIPTMODE} input.sh ${DESTDIR}/lib/udev/input.sh
+	install -m ${SCRIPTMODE} mount.sh ${DESTDIR}/lib/udev/mount.sh
+	install -m ${CONFMODE} scsi_id.config ${DESTDIR}/etc/scsi_id.config
+	install -m ${SCRIPTMODE} udev.count_events ${DESTDIR}/usr/bin/udev.count_events
 
 boot:
-	install -d  ${DESTDIR}/usr/share/udev
-	install -m ${INITMODE} ${DESTDIR}/etc/rc.d/init.d/udev
-	install -m ${INITMODE} ${DESTDIR}/etc/rc.d/init.d/udev_retry
-	install -m ${CONFMODE} ${DESTDIR}/var/adm/fillup-templates/sysconfig.storage
-	install -m ${SCRIPTMODE) ${DESTDIR}/usr/share/udev/show_event_log
-	install -m ${CONFMODE}  ${DESTDIR}/usr/share/udev/README.Logging
-	ln -sf ${DESTDIR}/rc.d/init.d/udev ${DESTDIR}/rc.d/rcsysinit.d/S10udev
-	ln -sf ${DESTDIR}/rc.d/init.d/udev_retry ${DESTDIR}/rc.d/rcsysinit.d/S15udev_retry
+	install -d ${DESTDIR}/usr/share/udev
+	install -m ${INITMODE} udev ${DESTDIR}/etc/rc.d/init.d/udev
+	install -m ${INITMODE} udev_retry ${DESTDIR}/etc/rc.d/init.d/udev_retry
+	install -d ${DESTDIR}/var/adm/fillup-templates
+	install -m ${CONFMODE} sysconfig.storage ${DESTDIR}/var/adm/fillup-templates/sysconfig.storage
+	install -m ${SCRIPTMODE} show_event_log ${DESTDIR}/usr/share/udev/show_event_log
+	install -m ${CONFMODE} README.Logging ${DESTDIR}/usr/share/udev/README.Logging
+	ln -sf ../init.d/udev ${DESTDIR}/etc/rc.d/rcsysinit.d/S10udev
+	ln -sf ../init.d/udev_retry ${DESTDIR}/etc/rc.d/rcsysinit.d/S15udev_retry
 
 device_dirs:
 	install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices
@@ -42,10 +43,10 @@
 	install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices/net
 
 device_links:
-	ln -sn /proc/self/fd ${DESTDIR}/lib/udev/devices/fd
-	ln -sn /proc/self/fd/0 ${DESTDIR}/lib/udev/devices/stdin
-	ln -sn /proc/self/fd/1 ${DESTDIR}/lib/udev/devices/stdout
-	ln -sn /proc/self/fd/2 ${DESTDIR}/lib/udev/devices/stderr
-	ln -sn /proc/kcore ${DESTDIR}/lib/udev/devices/core
+	ln -snf /proc/self/fd ${DESTDIR}/lib/udev/devices/fd
+	ln -snf /proc/self/fd/0 ${DESTDIR}/lib/udev/devices/stdin
+	ln -snf /proc/self/fd/1 ${DESTDIR}/lib/udev/devices/stdout
+	ln -snf /proc/self/fd/2 ${DESTDIR}/lib/udev/devices/stderr
+	ln -snf /proc/kcore ${DESTDIR}/lib/udev/devices/core
 
 .PHONY: all install device_dirs device_links rules scripts boot




More information about the cross-lfs mailing list