summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-11 09:32:06 +0000
committerRoy Marples <roy@marples.name>2008-01-11 09:32:06 +0000
commit2bd7f97b7269da6deee02d3d5ddc9114ef938dc2 (patch)
tree496d0dffeba66e8f3b3d84192dab20119fd80f03
parent50d73fa22374f5113eea3157c1357f44dfe06b92 (diff)
downloadopenrc-2bd7f97b7269da6deee02d3d5ddc9114ef938dc2.tar.gz
openrc-2bd7f97b7269da6deee02d3d5ddc9114ef938dc2.tar.bz2
openrc-2bd7f97b7269da6deee02d3d5ddc9114ef938dc2.tar.xz
Just have the one runlevels folder with OS includes.
-rw-r--r--runlevels.BSD/Makefile5
-rw-r--r--runlevels.FreeBSD/Makefile4
-rw-r--r--runlevels.Linux/Makefile5
-rw-r--r--runlevels.NetBSD/Makefile4
-rw-r--r--runlevels/Makefile4
-rw-r--r--runlevels/Makefile.BSD2
-rw-r--r--runlevels/Makefile.FreeBSD1
-rw-r--r--runlevels/Makefile.Linux2
-rw-r--r--runlevels/Makefile.NetBSD1
9 files changed, 10 insertions, 18 deletions
diff --git a/runlevels.BSD/Makefile b/runlevels.BSD/Makefile
deleted file mode 100644
index 7e8bbef..0000000
--- a/runlevels.BSD/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOT= hostid net.lo0 newsyslog savecore syslogd
-DEFAULT= local.rc mixer powerd
-
-MK= ../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.FreeBSD/Makefile b/runlevels.FreeBSD/Makefile
deleted file mode 100644
index b01dc2f..0000000
--- a/runlevels.FreeBSD/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT= clock dumpon syscons
-
-MK= ../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.Linux/Makefile b/runlevels.Linux/Makefile
deleted file mode 100644
index 0e8557b..0000000
--- a/runlevels.Linux/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOT= clock consolefont keymaps modules net.lo procfs
-DEFAULT= hdparm
-
-MK= ../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.NetBSD/Makefile b/runlevels.NetBSD/Makefile
deleted file mode 100644
index 31d01d8..0000000
--- a/runlevels.NetBSD/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT= ttys
-
-MK= ../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 7737678..11b606b 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -7,4 +7,8 @@ BOOTDIR= ${LEVELDIR}/boot
DEFAULTDIR= ${LEVELDIR}/default
MK= ../mk
+include ${MK}/os.mk
+include Makefile.${OS}
+include Makefile.${SUBOS}
+
include ${MK}/runlevels.mk
diff --git a/runlevels/Makefile.BSD b/runlevels/Makefile.BSD
new file mode 100644
index 0000000..255d117
--- /dev/null
+++ b/runlevels/Makefile.BSD
@@ -0,0 +1,2 @@
+BOOT+= hostid net.lo0 newsyslog savecore syslogd
+DEFAULT+= local.rc mixer powerd
diff --git a/runlevels/Makefile.FreeBSD b/runlevels/Makefile.FreeBSD
new file mode 100644
index 0000000..85d15fe
--- /dev/null
+++ b/runlevels/Makefile.FreeBSD
@@ -0,0 +1 @@
+BOOT+= clock dumpon syscons
diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux
new file mode 100644
index 0000000..205f097
--- /dev/null
+++ b/runlevels/Makefile.Linux
@@ -0,0 +1,2 @@
+BOOT+= clock consolefont keymaps modules net.lo procfs
+DEFAULT+= hdparm
diff --git a/runlevels/Makefile.NetBSD b/runlevels/Makefile.NetBSD
new file mode 100644
index 0000000..02a9903
--- /dev/null
+++ b/runlevels/Makefile.NetBSD
@@ -0,0 +1 @@
+BOOT+= ttys