Just have the one runlevels folder with OS includes.

2008-01-11 09:32:06 +00:00
parent 50d73fa223
commit 2bd7f97b72
9 changed files with 10 additions and 18 deletions
--- a/runlevels.BSD/Makefile
+++ b/runlevels.BSD/Makefile
@@ -1,5 +0,0 @@
-BOOT=		hostid net.lo0 newsyslog savecore syslogd
-DEFAULT=	local.rc mixer powerd 
-
-MK=		../mk
-include ${MK}/runlevels.mk
--- a/runlevels.FreeBSD/Makefile
+++ b/runlevels.FreeBSD/Makefile
@@ -1,4 +0,0 @@
-BOOT=	clock dumpon syscons
-
-MK=	../mk
-include ${MK}/runlevels.mk
--- a/runlevels.Linux/Makefile
+++ b/runlevels.Linux/Makefile
@@ -1,5 +0,0 @@
-BOOT=		clock consolefont keymaps modules net.lo procfs
-DEFAULT=	hdparm
-
-MK=			../mk
-include ${MK}/runlevels.mk
--- a/runlevels.NetBSD/Makefile
+++ b/runlevels.NetBSD/Makefile
@@ -1,4 +0,0 @@
-BOOT=	ttys
-
-MK=	../mk
-include ${MK}/runlevels.mk
--- 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
--- a/runlevels/Makefile.BSD
+++ b/runlevels/Makefile.BSD
@@ -0,0 +1,2 @@
+BOOT+=		hostid net.lo0 newsyslog savecore syslogd
+DEFAULT+=	local.rc mixer powerd 
--- a/runlevels/Makefile.FreeBSD
+++ b/runlevels/Makefile.FreeBSD
@@ -0,0 +1 @@
+BOOT+=	clock dumpon syscons
--- a/runlevels/Makefile.Linux
+++ b/runlevels/Makefile.Linux
@@ -0,0 +1,2 @@
+BOOT+=		clock consolefont keymaps modules net.lo procfs
+DEFAULT+=	hdparm
--- a/runlevels/Makefile.NetBSD
+++ b/runlevels/Makefile.NetBSD
@@ -0,0 +1 @@
+BOOT+=	ttys