1 |
commit: d92848ed41befd692551afe9cd016cb87f7981a1 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 21:53:59 2011 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 12 15:50:02 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=d92848ed |
7 |
|
8 |
Rearrange the directory structure |
9 |
|
10 |
This removes the rc directory from the repository and renames the |
11 |
directories to more closely match where things are ultimately installed. |
12 |
|
13 |
--- |
14 |
Makefile | 33 +++++++++++++++-------------- |
15 |
{rc/baselayout1 => addons}/udev-start.sh | 0 |
16 |
{rc/baselayout1 => addons}/udev-stop.sh | 0 |
17 |
rc/confd/udev.confd => conf.d/udev | 0 |
18 |
{rc/openrc => init.d}/udev | 0 |
19 |
{rc/openrc => init.d}/udev-dev-tarball | 0 |
20 |
{rc/openrc => init.d}/udev-mount | 0 |
21 |
{rc/openrc => init.d}/udev-postmount | 0 |
22 |
{rules => rules.d}/40-gentoo.rules | 0 |
23 |
{rules => rules.d}/90-network.rules | 0 |
24 |
10 files changed, 17 insertions(+), 16 deletions(-) |
25 |
|
26 |
diff --git a/Makefile b/Makefile |
27 |
index 69fd4fb..287e094 100644 |
28 |
--- a/Makefile |
29 |
+++ b/Makefile |
30 |
@@ -1,10 +1,11 @@ |
31 |
LIBDIR ?= lib |
32 |
+RCADDON ?= /$(LIBDIR)/rcscripts/addons |
33 |
LIBUDEV ?= /lib/udev |
34 |
RULESDIR ?= $(LIBUDEV)/rules.d |
35 |
-MODPROBE_DIR ?= /etc/modprobe.d |
36 |
-INITD ?= /etc/init.d |
37 |
-CONFD ?= /etc/conf.d |
38 |
-RCADDON ?= /$(LIBDIR)/rcscripts/addons |
39 |
+SYSCONFDIR ?= /etc |
40 |
+CONFD ?= $(SYSCONFDIR)/conf.d |
41 |
+INITD ?= $(SYSCONFDIR)/init.d |
42 |
+MODPROBE_DIR ?= $(SYSCONFDIR)/modprobe.d |
43 |
|
44 |
VERSION = $(shell git describe --tags) |
45 |
|
46 |
@@ -12,6 +13,7 @@ KV_min ?= 2.6.24 |
47 |
KV_reliable ?= 2.6.26 |
48 |
|
49 |
DESTNAME = udev-gentoo-scripts-$(VERSION) |
50 |
+ |
51 |
HELPERS = \ |
52 |
helpers/net.sh \ |
53 |
helpers/write_root_link_rule |
54 |
@@ -20,27 +22,26 @@ HELPERS_NOEXE = \ |
55 |
helpers/shell-compat-addon.sh \ |
56 |
helpers/shell-compat-KV.sh |
57 |
|
58 |
-INIT_SCRIPTS = \ |
59 |
- rc/openrc/udev-dev-tarball \ |
60 |
- rc/openrc/udev \ |
61 |
- rc/openrc/udev-mount \ |
62 |
- rc/openrc/udev-postmount |
63 |
- |
64 |
all: |
65 |
@echo "Run make install DESTDIR= LIBDIR=lib" |
66 |
|
67 |
install: |
68 |
- @install -d $(DESTDIR)$(LIBUDEV) $(DESTDIR)$(RULESDIR) $(DESTDIR)$(MODPROBE_DIR) $(DESTDIR)$(INITD) $(DESTDIR)$(CONFD) $(DESTDIR)$(RCADDON) |
69 |
- @install -m 0644 modprobe.d/*.conf $(DESTDIR)$(MODPROBE_DIR) |
70 |
- @install -m 0644 rules/??-*.rules $(DESTDIR)$(RULESDIR) |
71 |
+ @install -d $(DESTDIR)$(RCADDON) |
72 |
+ @install -m 0755 addons/* $(DESTDIR)$(RCADDON) |
73 |
+ @install -d $(DESTDIR)$(LIBUDEV) |
74 |
@install -m 0755 $(HELPERS) $(DESTDIR)$(LIBUDEV) |
75 |
@install -m 0644 $(HELPERS_NOEXE) $(DESTDIR)$(LIBUDEV) |
76 |
- @install -m 0755 $(INIT_SCRIPTS) $(DESTDIR)$(INITD) |
77 |
+ @install -d $(DESTDIR)$(RULESDIR) |
78 |
+ @install -m 0644 rules.d/??-*.rules $(DESTDIR)$(RULESDIR) |
79 |
+ @install -d $(DESTDIR)$(CONFD) |
80 |
+ @install -m 0644 conf.d/* $(DESTDIR)$(CONFD) |
81 |
+ @install -d $(DESTDIR)$(INITD) |
82 |
+ @install -m 0755 init.d/* $(DESTDIR)$(INITD) |
83 |
+ @install -d $(DESTDIR)$(MODPROBE_DIR) |
84 |
+ @install -m 0644 modprobe.d/* $(DESTDIR)$(MODPROBE_DIR) |
85 |
@sed -e "s/%KV_MIN%/$(KV_min)/" \ |
86 |
-e "s/%KV_MIN_RELIABLE%/$(KV_reliable)/" \ |
87 |
-i "$(DESTDIR)$(INITD)"/udev-mount |
88 |
- @install -m 0644 rc/confd/udev.confd $(DESTDIR)$(CONFD)/udev |
89 |
- @install -m 0755 rc/baselayout1/* $(DESTDIR)$(RCADDON) |
90 |
|
91 |
check-git-repository: |
92 |
git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; } |
93 |
|
94 |
diff --git a/rc/baselayout1/udev-start.sh b/addons/udev-start.sh |
95 |
similarity index 100% |
96 |
rename from rc/baselayout1/udev-start.sh |
97 |
rename to addons/udev-start.sh |
98 |
|
99 |
diff --git a/rc/baselayout1/udev-stop.sh b/addons/udev-stop.sh |
100 |
similarity index 100% |
101 |
rename from rc/baselayout1/udev-stop.sh |
102 |
rename to addons/udev-stop.sh |
103 |
|
104 |
diff --git a/rc/confd/udev.confd b/conf.d/udev |
105 |
similarity index 100% |
106 |
rename from rc/confd/udev.confd |
107 |
rename to conf.d/udev |
108 |
|
109 |
diff --git a/rc/openrc/udev b/init.d/udev |
110 |
similarity index 100% |
111 |
rename from rc/openrc/udev |
112 |
rename to init.d/udev |
113 |
|
114 |
diff --git a/rc/openrc/udev-dev-tarball b/init.d/udev-dev-tarball |
115 |
similarity index 100% |
116 |
rename from rc/openrc/udev-dev-tarball |
117 |
rename to init.d/udev-dev-tarball |
118 |
|
119 |
diff --git a/rc/openrc/udev-mount b/init.d/udev-mount |
120 |
similarity index 100% |
121 |
rename from rc/openrc/udev-mount |
122 |
rename to init.d/udev-mount |
123 |
|
124 |
diff --git a/rc/openrc/udev-postmount b/init.d/udev-postmount |
125 |
similarity index 100% |
126 |
rename from rc/openrc/udev-postmount |
127 |
rename to init.d/udev-postmount |
128 |
|
129 |
diff --git a/rules/40-gentoo.rules b/rules.d/40-gentoo.rules |
130 |
similarity index 100% |
131 |
rename from rules/40-gentoo.rules |
132 |
rename to rules.d/40-gentoo.rules |
133 |
|
134 |
diff --git a/rules/90-network.rules b/rules.d/90-network.rules |
135 |
similarity index 100% |
136 |
rename from rules/90-network.rules |
137 |
rename to rules.d/90-network.rules |