diff options
author | William Hubbs <williamh@gentoo.org> | 2011-07-09 16:53:59 -0500 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2011-07-12 10:50:02 -0500 |
commit | d92848ed41befd692551afe9cd016cb87f7981a1 (patch) | |
tree | eacc948734cfb551ff14f63dcac21ce0f78da5ca | |
parent | fix permissions on rules and modprobe configurations (diff) | |
download | udev-gentoo-scripts-d92848ed41befd692551afe9cd016cb87f7981a1.tar.gz udev-gentoo-scripts-d92848ed41befd692551afe9cd016cb87f7981a1.tar.bz2 udev-gentoo-scripts-d92848ed41befd692551afe9cd016cb87f7981a1.zip |
Rearrange the directory structure
This removes the rc directory from the repository and renames the
directories to more closely match where things are ultimately installed.
-rw-r--r-- | Makefile | 33 | ||||
-rw-r--r-- | addons/udev-start.sh (renamed from rc/baselayout1/udev-start.sh) | 0 | ||||
-rw-r--r-- | addons/udev-stop.sh (renamed from rc/baselayout1/udev-stop.sh) | 0 | ||||
-rw-r--r-- | conf.d/udev (renamed from rc/confd/udev.confd) | 0 | ||||
-rw-r--r-- | init.d/udev (renamed from rc/openrc/udev) | 0 | ||||
-rw-r--r-- | init.d/udev-dev-tarball (renamed from rc/openrc/udev-dev-tarball) | 0 | ||||
-rw-r--r-- | init.d/udev-mount (renamed from rc/openrc/udev-mount) | 0 | ||||
-rw-r--r-- | init.d/udev-postmount (renamed from rc/openrc/udev-postmount) | 0 | ||||
-rw-r--r-- | rules.d/40-gentoo.rules (renamed from rules/40-gentoo.rules) | 0 | ||||
-rw-r--r-- | rules.d/90-network.rules (renamed from rules/90-network.rules) | 0 |
10 files changed, 17 insertions, 16 deletions
@@ -1,10 +1,11 @@ LIBDIR ?= lib +RCADDON ?= /$(LIBDIR)/rcscripts/addons LIBUDEV ?= /lib/udev RULESDIR ?= $(LIBUDEV)/rules.d -MODPROBE_DIR ?= /etc/modprobe.d -INITD ?= /etc/init.d -CONFD ?= /etc/conf.d -RCADDON ?= /$(LIBDIR)/rcscripts/addons +SYSCONFDIR ?= /etc +CONFD ?= $(SYSCONFDIR)/conf.d +INITD ?= $(SYSCONFDIR)/init.d +MODPROBE_DIR ?= $(SYSCONFDIR)/modprobe.d VERSION = $(shell git describe --tags) @@ -12,6 +13,7 @@ KV_min ?= 2.6.24 KV_reliable ?= 2.6.26 DESTNAME = udev-gentoo-scripts-$(VERSION) + HELPERS = \ helpers/net.sh \ helpers/write_root_link_rule @@ -20,27 +22,26 @@ HELPERS_NOEXE = \ helpers/shell-compat-addon.sh \ helpers/shell-compat-KV.sh -INIT_SCRIPTS = \ - rc/openrc/udev-dev-tarball \ - rc/openrc/udev \ - rc/openrc/udev-mount \ - rc/openrc/udev-postmount - all: @echo "Run make install DESTDIR= LIBDIR=lib" install: - @install -d $(DESTDIR)$(LIBUDEV) $(DESTDIR)$(RULESDIR) $(DESTDIR)$(MODPROBE_DIR) $(DESTDIR)$(INITD) $(DESTDIR)$(CONFD) $(DESTDIR)$(RCADDON) - @install -m 0644 modprobe.d/*.conf $(DESTDIR)$(MODPROBE_DIR) - @install -m 0644 rules/??-*.rules $(DESTDIR)$(RULESDIR) + @install -d $(DESTDIR)$(RCADDON) + @install -m 0755 addons/* $(DESTDIR)$(RCADDON) + @install -d $(DESTDIR)$(LIBUDEV) @install -m 0755 $(HELPERS) $(DESTDIR)$(LIBUDEV) @install -m 0644 $(HELPERS_NOEXE) $(DESTDIR)$(LIBUDEV) - @install -m 0755 $(INIT_SCRIPTS) $(DESTDIR)$(INITD) + @install -d $(DESTDIR)$(RULESDIR) + @install -m 0644 rules.d/??-*.rules $(DESTDIR)$(RULESDIR) + @install -d $(DESTDIR)$(CONFD) + @install -m 0644 conf.d/* $(DESTDIR)$(CONFD) + @install -d $(DESTDIR)$(INITD) + @install -m 0755 init.d/* $(DESTDIR)$(INITD) + @install -d $(DESTDIR)$(MODPROBE_DIR) + @install -m 0644 modprobe.d/* $(DESTDIR)$(MODPROBE_DIR) @sed -e "s/%KV_MIN%/$(KV_min)/" \ -e "s/%KV_MIN_RELIABLE%/$(KV_reliable)/" \ -i "$(DESTDIR)$(INITD)"/udev-mount - @install -m 0644 rc/confd/udev.confd $(DESTDIR)$(CONFD)/udev - @install -m 0755 rc/baselayout1/* $(DESTDIR)$(RCADDON) check-git-repository: git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; } diff --git a/rc/baselayout1/udev-start.sh b/addons/udev-start.sh index a85d0c3..a85d0c3 100644 --- a/rc/baselayout1/udev-start.sh +++ b/addons/udev-start.sh diff --git a/rc/baselayout1/udev-stop.sh b/addons/udev-stop.sh index 784e5d5..784e5d5 100644 --- a/rc/baselayout1/udev-stop.sh +++ b/addons/udev-stop.sh diff --git a/rc/confd/udev.confd b/conf.d/udev index 7c3d3eb..7c3d3eb 100644 --- a/rc/confd/udev.confd +++ b/conf.d/udev diff --git a/rc/openrc/udev b/init.d/udev index 699030c..699030c 100644 --- a/rc/openrc/udev +++ b/init.d/udev diff --git a/rc/openrc/udev-dev-tarball b/init.d/udev-dev-tarball index 7d5a6b7..7d5a6b7 100644 --- a/rc/openrc/udev-dev-tarball +++ b/init.d/udev-dev-tarball diff --git a/rc/openrc/udev-mount b/init.d/udev-mount index 3e4f884..3e4f884 100644 --- a/rc/openrc/udev-mount +++ b/init.d/udev-mount diff --git a/rc/openrc/udev-postmount b/init.d/udev-postmount index 12a30f6..12a30f6 100644 --- a/rc/openrc/udev-postmount +++ b/init.d/udev-postmount diff --git a/rules/40-gentoo.rules b/rules.d/40-gentoo.rules index fa99ba9..fa99ba9 100644 --- a/rules/40-gentoo.rules +++ b/rules.d/40-gentoo.rules diff --git a/rules/90-network.rules b/rules.d/90-network.rules index 50903af..50903af 100644 --- a/rules/90-network.rules +++ b/rules.d/90-network.rules |