[lfs-book] r9947 - trunk/BOOK/udev-config

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Aug 21 07:17:05 PDT 2012


Author: ken
Date: 2012-08-21 08:16:57 -0600 (Tue, 21 Aug 2012)
New Revision: 9947

Modified:
   trunk/BOOK/udev-config/ChangeLog
   trunk/BOOK/udev-config/Makefile
Log:
Revert bogus changes to udev-config accidentally committed in r9944.

Modified: trunk/BOOK/udev-config/ChangeLog
===================================================================
--- trunk/BOOK/udev-config/ChangeLog	2012-08-21 03:06:31 UTC (rev 9946)
+++ trunk/BOOK/udev-config/ChangeLog	2012-08-21 14:16:57 UTC (rev 9947)
@@ -1,8 +1,3 @@
-2012-06-13	Ken Moffat <ken at linuxfromscratch.org>
-	* add rule_generator/: with persistent net and cd alias rules
-	  and functions which were removed from udev-182 after it was merged
-	  into systemd.
-
 2010-01-26	Matt Burgess <matthew at linuxfromscratch.org>
 	* 55-lfs.rules: Remove lots of rules that have been merged upstream.
 	* 61-cdrom.rules: Remove as upstream has a replacement.

Modified: trunk/BOOK/udev-config/Makefile
===================================================================
--- trunk/BOOK/udev-config/Makefile	2012-08-21 03:06:31 UTC (rev 9946)
+++ trunk/BOOK/udev-config/Makefile	2012-08-21 14:16:57 UTC (rev 9947)
@@ -4,7 +4,6 @@
 RULES_DIR = /etc/udev/rules.d
 INSTALL = install
 INSTALL_DATA = $(INSTALL) -m644
-INSTALL_EXEC = $(INSTALL) -m755
 RULES_FILES = \
 	55-lfs.rules
 DOC_FILES = $(RULES_FILES:.rules=.txt)
@@ -12,14 +11,6 @@
 # Location to install the docs
 DOC_DIR = $(PREFIX)/share/doc/udev-config
 
-# for files shipped with udev up to version 182
-SYS_LIB = /lib/udev
-SYS_RULES_DIR = $(SYS_LIB)/rules.d
-SYS_RULES = 75-cd-aliases-generator.rules \
-            75-persistent-net-generator.rules
-SYS_FUNCTIONS = rule_generator.functions
-SYS_SCRIPTS = write_cd_rules write_net_rules
-
 all:
 
 install: install-rules
@@ -29,17 +20,6 @@
 	for rule in $(RULES_FILES); do \
 		$(INSTALL_DATA) $$rule $(DESTDIR)$(RULES_DIR) || exit 1; \
 	done;
-	$(INSTALL) -d $(DESTDIR)$(SYS_LIB)
-	for function in $(SYS_FUNCTIONS); do \
-		$(INSTALL_DATA) rule_generator/$$function $(DESTDIR)$(SYS_LIB) || exit 1; \
-	done;
-	for script in $(SYS_SCRIPTS); do \
-		$(INSTALL_EXEC) rule_generator/$$script $(DESTDIR)$(SYS_LIB) || exit 1; \
-	done;
-	$(INSTALL) -d $(DESTDIR)$(SYS_RULES_DIR)
-	for rule in $(SYS_RULES); do \
-		$(INSTALL_DATA) rule_generator/$$rule $(DESTDIR)$(SYS_RULES_DIR) || exit 1; \
-	done;
 
 install-doc:
 	$(INSTALL) -d $(DESTDIR)$(DOC_DIR)




More information about the lfs-book mailing list