浏览代码

Revert bogus changes to udev-config accidentally committed in r9944.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9947 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Ken Moffat 12 年之前
父节点
当前提交
46d74eccaf
共有 2 个文件被更改,包括 0 次插入25 次删除
  1. 0 5
      udev-config/ChangeLog
  2. 0 20
      udev-config/Makefile

+ 0 - 5
udev-config/ChangeLog

@@ -1,8 +1,3 @@
-2012-06-13	Ken Moffat <ken@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@linuxfromscratch.org>
 	* 55-lfs.rules: Remove lots of rules that have been merged upstream.
 	* 61-cdrom.rules: Remove as upstream has a replacement.

+ 0 - 20
udev-config/Makefile

@@ -4,7 +4,6 @@ PREFIX = /usr
 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 @@ DOC_FILES = $(RULES_FILES:.rules=.txt)
 # 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 @@ install-rules:
 	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)