diff options
| author | Ken Moffat <ken@linuxfromscratch.org> | 2012-08-20 23:51:22 +0000 |
|---|---|---|
| committer | Ken Moffat <ken@linuxfromscratch.org> | 2012-08-20 23:51:22 +0000 |
| commit | 7a6bcf996e754fcf8bc3ea80acc23865476044eb (patch) | |
| tree | abfa79e3e8f8e2c0b1f89b8cdcfb9fa2b7aecac6 /udev-config | |
| parent | 25d78ecbd764173db754061abeb275f33f3e35ed (diff) | |
Correct how timezones are installed - this fixes various errors in test-suites. Thanks to Markku Pesonen for noting how Debian install timezones.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9944 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'udev-config')
| -rw-r--r-- | udev-config/ChangeLog | 5 | ||||
| -rw-r--r-- | udev-config/Makefile | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/udev-config/ChangeLog b/udev-config/ChangeLog index 130678d95..257ac6505 100644 --- a/udev-config/ChangeLog +++ b/udev-config/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/udev-config/Makefile b/udev-config/Makefile index aa9dad742..f96f18123 100644 --- a/udev-config/Makefile +++ b/udev-config/Makefile @@ -4,6 +4,7 @@ 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) @@ -11,6 +12,14 @@ 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 @@ -20,6 +29,17 @@ 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) |