From a5696e751c5f0ec88a707125dd375a64b4f067de Mon Sep 17 00:00:00 2001
From: rlfnb <rlfnb@rlfnb.de>
Date: Thu, 4 Feb 2016 08:03:13 +0100
Subject: [PATCH] moved service configuration out of system.conf

---
 etc/system.conf                            | 29 ----------------------
 minix/drivers/examples/hello/Makefile      |  4 +++
 minix/drivers/examples/hello/hello.conf    | 13 ++++++++++
 minix/drivers/sensors/bmp085/Makefile      |  9 +++++--
 minix/drivers/sensors/bmp085/bmp085.conf   |  5 ++++
 minix/drivers/sensors/sht21/Makefile       |  9 +++++--
 minix/drivers/sensors/sht21/sht21.conf     |  5 ++++
 minix/drivers/sensors/tsl2550/Makefile     |  9 +++++--
 minix/drivers/sensors/tsl2550/tsl2550.conf |  5 ++++
 9 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 minix/drivers/examples/hello/hello.conf
 create mode 100644 minix/drivers/sensors/bmp085/bmp085.conf
 create mode 100644 minix/drivers/sensors/sht21/sht21.conf
 create mode 100644 minix/drivers/sensors/tsl2550/tsl2550.conf

diff --git a/etc/system.conf b/etc/system.conf
index e03d21393..3df3e0ea1 100644
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -549,20 +549,6 @@ service pckbd
 	priority	1;
 };
 
-service hello
-{
-        system
-                IRQCTL          # 19
-                DEVIO           # 21
-        ;
-        ipc
-                SYSTEM pm rs tty ds vm vfs
-                pci inet lwip amddev
-                ;
-    uid 0;
-};
-
-
 service devman
 {
 	uid 0;
@@ -669,21 +655,6 @@ service tps65950
 	ipc SYSTEM RS DS i2c readclock.drv;
 };
 
-service tsl2550
-{
-	ipc SYSTEM RS DS i2c;
-};
-
-service sht21
-{
-	ipc SYSTEM RS DS i2c;
-};
-
-service bmp085
-{
-	ipc SYSTEM RS DS i2c;
-};
-
 service vbox
 {
 	system
diff --git a/minix/drivers/examples/hello/Makefile b/minix/drivers/examples/hello/Makefile
index e22a2a5d7..248c37b0c 100644
--- a/minix/drivers/examples/hello/Makefile
+++ b/minix/drivers/examples/hello/Makefile
@@ -2,6 +2,10 @@
 PROG=	hello
 SRCS=	hello.c
 
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
+
 DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=	-lchardriver -lsys
 
diff --git a/minix/drivers/examples/hello/hello.conf b/minix/drivers/examples/hello/hello.conf
new file mode 100644
index 000000000..23caec224
--- /dev/null
+++ b/minix/drivers/examples/hello/hello.conf
@@ -0,0 +1,13 @@
+service hello
+{
+        system
+                IRQCTL          # 19
+                DEVIO           # 21
+        ;
+        ipc
+                SYSTEM pm rs tty ds vm vfs
+                pci inet lwip amddev
+                ;
+    uid 0;
+};
+
diff --git a/minix/drivers/sensors/bmp085/Makefile b/minix/drivers/sensors/bmp085/Makefile
index 1b2ceacc4..64ecdfaed 100644
--- a/minix/drivers/sensors/bmp085/Makefile
+++ b/minix/drivers/sensors/bmp085/Makefile
@@ -1,6 +1,11 @@
 # Makefile for the bmp085 pressure and temp sensor found on the Weather Cape.
-PROG=	bmp085
-SRCS=	bmp085.c
+
+PROG=   bmp085
+SRCS=   bmp085.c
+
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-li2cdriver -lchardriver -lsys -ltimers
diff --git a/minix/drivers/sensors/bmp085/bmp085.conf b/minix/drivers/sensors/bmp085/bmp085.conf
new file mode 100644
index 000000000..5a4adb9be
--- /dev/null
+++ b/minix/drivers/sensors/bmp085/bmp085.conf
@@ -0,0 +1,5 @@
+service bmp085
+{
+       ipc SYSTEM RS DS i2c;
+};
+
diff --git a/minix/drivers/sensors/sht21/Makefile b/minix/drivers/sensors/sht21/Makefile
index cbc417c45..8d7d90dc2 100644
--- a/minix/drivers/sensors/sht21/Makefile
+++ b/minix/drivers/sensors/sht21/Makefile
@@ -1,6 +1,11 @@
 # Makefile for the sht21 humidity and temp sensor found on the Weather Cape.
-PROG=	sht21
-SRCS=	sht21.c
+
+PROG=   sht21
+SRCS=   sht21.c
+
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-li2cdriver -lchardriver -lsys -ltimers
diff --git a/minix/drivers/sensors/sht21/sht21.conf b/minix/drivers/sensors/sht21/sht21.conf
new file mode 100644
index 000000000..1978c1fb5
--- /dev/null
+++ b/minix/drivers/sensors/sht21/sht21.conf
@@ -0,0 +1,5 @@
+service sht21
+{
+        ipc SYSTEM RS DS i2c;
+};
+
diff --git a/minix/drivers/sensors/tsl2550/Makefile b/minix/drivers/sensors/tsl2550/Makefile
index 9dcec6387..57c8c4765 100644
--- a/minix/drivers/sensors/tsl2550/Makefile
+++ b/minix/drivers/sensors/tsl2550/Makefile
@@ -1,6 +1,11 @@
 # Makefile for the tsl2550 ambient light sensor found on the Weather Cape.
-PROG=	tsl2550
-SRCS=	tsl2550.c
+
+PROG=   tsl2550
+SRCS=   tsl2550.c
+
+FILES=$(PROG).conf
+FILESNAME=$(PROG)
+FILESDIR= /etc/system.conf.d
 
 DPADD+=	${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
 LDADD+=	-li2cdriver -lchardriver -lsys -ltimers
diff --git a/minix/drivers/sensors/tsl2550/tsl2550.conf b/minix/drivers/sensors/tsl2550/tsl2550.conf
new file mode 100644
index 000000000..776e61c06
--- /dev/null
+++ b/minix/drivers/sensors/tsl2550/tsl2550.conf
@@ -0,0 +1,5 @@
+service tsl2550
+{
+        ipc SYSTEM RS DS i2c;
+};
+