From: Lionel Sambuc Date: Tue, 29 Jul 2014 18:29:57 +0000 (+0200) Subject: Move all services to /service X-Git-Tag: v3.3.0~88 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=50a1aef12b6bc23a50543f1568991c700512bef6;p=minix.git Move all services to /service This concerns all services, a.k.a drivers, filesystem drivers, network (inet, lwip, uds) servers, and the system servers. Change-Id: I626fd15c795e15af42df2d10d47fb4a703665d63 --- diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm index 0e555535e..695d6d465 100644 --- a/distrib/sets/lists/minix/md.evbarm +++ b/distrib/sets/lists/minix/md.evbarm @@ -1,13 +1,20 @@ -./boot/minix/.temp/mod07_tty minix-sys -./boot/minix/.temp/mod08_mfs minix-sys -./boot/minix/.temp/mod09_vm minix-sys -./boot/minix/.temp/mod10_pfs minix-sys -./boot/minix/.temp/mod11_init minix-sys ./etc/rc.capes minix-sys ./etc/rc.capes/BB-BONE-WTHR-01 minix-sys ./etc/system.conf.d/lan8710a minix-sys ./etc/system.conf.d/usbd minix-sys -./sbin/gpio minix-sys +./service/bmp085 minix-sys +./service/cat24c256 minix-sys +./service/fb minix-sys +./service/gpio minix-sys +./service/i2c minix-sys +./service/lan8710a minix-sys +./service/random minix-sys +./service/sht21 minix-sys +./service/tda19988 minix-sys +./service/tps65217 minix-sys +./service/tps65950 minix-sys +./service/tsl2550 minix-sys +./service/usbd minix-sys ./usr/bin/eepromread minix-sys ./usr/include/arm minix-sys ./usr/include/arm/aeabi.h minix-sys @@ -100,18 +107,6 @@ ./usr/lib/libi2cdriver_pic.a minix-sys ./usr/man/man1/eepromread.1 minix-sys ./usr/mdec minix-sys -./usr/sbin/bmp085 minix-sys -./usr/sbin/cat24c256 minix-sys -./usr/sbin/fb minix-sys -./usr/sbin/i2c minix-sys -./usr/sbin/lan8710a minix-sys -./usr/sbin/random minix-sys -./usr/sbin/sht21 minix-sys -./usr/sbin/tda19988 minix-sys -./usr/sbin/tps65217 minix-sys -./usr/sbin/tps65950 minix-sys -./usr/sbin/tsl2550 minix-sys -./usr/sbin/usbd minix-sys ./usr/share/beaglebone minix-sys ./usr/share/beaglebone/weather minix-sys ./usr/share/beaglebone/weather/index.html minix-sys diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index 46e01d690..8fefd25ea 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -1,8 +1,3 @@ -./boot/minix/.temp/mod07_tty minix-sys -./boot/minix/.temp/mod08_mfs minix-sys -./boot/minix/.temp/mod09_vm minix-sys -./boot/minix/.temp/mod10_pfs minix-sys -./boot/minix/.temp/mod11_init minix-sys ./etc/system.conf.d/atl2 minix-sys ./etc/system.conf.d/dec21140A minix-sys ./etc/system.conf.d/e1000 minix-sys @@ -11,13 +6,36 @@ ./etc/system.conf.d/rtl8139 minix-sys ./etc/system.conf.d/rtl8169 minix-sys ./etc/system.conf.d/virtio_net minix-sys -./sbin/ahci minix-sys -./sbin/at_wini minix-sys -./sbin/floppy minix-sys -./sbin/hgfs minix-sys -./sbin/pckbd minix-sys -./sbin/vbfs minix-sys -./sbin/virtio_blk minix-sys +./service/acpi minix-sys +./service/ahci minix-sys +./service/amddev minix-sys +./service/atl2 minix-sys +./service/at_wini minix-sys +./service/dec21140A minix-sys +./service/dp8390 minix-sys +./service/dpeth minix-sys +./service/e1000 minix-sys +./service/es1370 minix-sys +./service/es1371 minix-sys +./service/fbd minix-sys +./service/filter minix-sys +./service/floppy minix-sys +./service/fxp minix-sys +./service/hgfs minix-sys +./service/lance minix-sys +./service/orinoco minix-sys +./service/pci minix-sys +./service/pckbd minix-sys +./service/printer minix-sys +./service/random minix-sys +./service/rtl8139 minix-sys +./service/rtl8169 minix-sys +./service/sb16 minix-sys +./service/ti1225 minix-sys +./service/vbfs minix-sys +./service/vbox minix-sys +./service/virtio_blk minix-sys +./service/virtio_net minix-sys ./usr/include/gcc-4.5/abmintrin.h minix-sys gcccmds ./usr/include/gcc-4.5/ammintrin.h minix-sys gcccmds ./usr/include/gcc-4.5/avxintrin.h minix-sys gcccmds @@ -158,29 +176,6 @@ ./usr/mdec/mbr_com0 minix-sys ./usr/mdec/mbr_com0_9600 minix-sys ./usr/mdec/mbr_ext minix-sys -./usr/sbin/acpi minix-sys -./usr/sbin/amddev minix-sys -./usr/sbin/atl2 minix-sys -./usr/sbin/dec21140A minix-sys -./usr/sbin/dp8390 minix-sys -./usr/sbin/dpeth minix-sys -./usr/sbin/e1000 minix-sys -./usr/sbin/es1370 minix-sys -./usr/sbin/es1371 minix-sys -./usr/sbin/fbd minix-sys -./usr/sbin/filter minix-sys -./usr/sbin/fxp minix-sys -./usr/sbin/lance minix-sys -./usr/sbin/orinoco minix-sys -./usr/sbin/pci minix-sys -./usr/sbin/printer minix-sys -./usr/sbin/random minix-sys -./usr/sbin/rtl8139 minix-sys -./usr/sbin/rtl8169 minix-sys -./usr/sbin/sb16 minix-sys -./usr/sbin/ti1225 minix-sys -./usr/sbin/vbox minix-sys -./usr/sbin/virtio_net minix-sys ./usr/tests/minix-posix/test47 minix-sys ./usr/tests/minix-posix/test51 minix-sys ./usr/tests/minix-posix/test57 minix-sys diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 01e913681..7f3b8e262 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -65,6 +65,11 @@ ./boot/minix/.temp/mod04_sched minix-sys ./boot/minix/.temp/mod05_vfs minix-sys ./boot/minix/.temp/mod06_memory minix-sys +./boot/minix/.temp/mod07_tty minix-sys +./boot/minix/.temp/mod08_mfs minix-sys +./boot/minix/.temp/mod09_vm minix-sys +./boot/minix/.temp/mod10_pfs minix-sys +./boot/minix/.temp/mod11_init minix-sys ./boot/minix_default minix-sys ./dev minix-sys ./etc minix-sys @@ -130,26 +135,46 @@ ./root/.profile minix-sys ./sbin minix-sys ./sbin/chown minix-sys -./sbin/devman minix-sys -./sbin/ext2 minix-sys ./sbin/fsck minix-sys ./sbin/fsck_ext2fs minix-sys ./sbin/fsck_mfs minix-sys ./sbin/halt minix-sys ./sbin/init minix-sys -./sbin/input minix-sys -./sbin/is minix-sys -./sbin/isofs minix-sys -./sbin/mfs minix-sys ./sbin/mkfs.mfs minix-sys ./sbin/mknod minix-sys ./sbin/newfs_ext2fs minix-sys ./sbin/nologin minix-sys ./sbin/poweroff minix-sys -./sbin/procfs minix-sys -./sbin/readclock.drv minix-sys ./sbin/reboot minix-sys ./sbin/shutdown minix-sys +./service minix-sys +./service/devman minix-sys +./service/ds minix-sys +./service/ext2 minix-sys +./service/hello minix-sys +./service/inet minix-sys +./service/input minix-sys +./service/ipc minix-sys +./service/is minix-sys +./service/isofs minix-sys +./service/log minix-sys +./service/lwip minix-sys +./service/memory minix-sys +./service/mfs minix-sys +./service/mmc minix-sys +./service/pfs minix-sys +./service/pm minix-sys +./service/procfs minix-sys +./service/pty minix-sys +./service/readclock.drv minix-sys +./service/rs minix-sys +./service/sched minix-sys +./service/tty minix-sys +./service/uds minix-sys +./service/usb_storage minix-sys +./service/vfs minix-sys +./service/vm minix-sys +./service/vnd minix-sys ./sys minix-sys ./tmp minix-sys ./usr minix-sys @@ -5114,49 +5139,30 @@ ./usr/sbin minix-sys ./usr/sbin/chown minix-sys ./usr/sbin/chroot minix-sys -./usr/sbin/ds minix-sys ./usr/sbin/group minix-sys ./usr/sbin/groupadd minix-sys ./usr/sbin/groupdel minix-sys ./usr/sbin/groupinfo minix-sys ./usr/sbin/groupmod minix-sys -./usr/sbin/hello minix-sys ./usr/sbin/i2cscan minix-sys -./usr/sbin/inet minix-sys ./usr/sbin/installboot_nbsd minix-sys -./usr/sbin/ipc minix-sys ./usr/sbin/kernel minix-sys ./usr/sbin/link minix-sys -./usr/sbin/log minix-sys -./usr/sbin/lwip minix-sys -./usr/sbin/memory minix-sys ./usr/sbin/mkfs.mfsv3 minix-sys ./usr/sbin/mkproto minix-sys -./usr/sbin/mmc minix-sys ./usr/sbin/mtree minix-sys ./usr/sbin/newfs_mfs minix-sys -./usr/sbin/pfs minix-sys -./usr/sbin/pm minix-sys ./usr/sbin/postinstall minix-sys -./usr/sbin/pty minix-sys ./usr/sbin/pwd_mkdb minix-sys ./usr/sbin/rdate minix-sys -./usr/sbin/rs minix-sys -./usr/sbin/sched minix-sys -./usr/sbin/tty minix-sys -./usr/sbin/uds minix-sys ./usr/sbin/unlink minix-sys -./usr/sbin/usb_storage minix-sys ./usr/sbin/user minix-sys ./usr/sbin/useradd minix-sys ./usr/sbin/userdel minix-sys ./usr/sbin/userinfo minix-sys ./usr/sbin/usermod minix-sys -./usr/sbin/vfs minix-sys ./usr/sbin/vipw minix-sys -./usr/sbin/vm minix-sys ./usr/sbin/vnconfig minix-sys -./usr/sbin/vnd minix-sys ./usr/sbin/vndconfig minix-sys ./usr/sbin/zic minix-sys ./usr/share minix-sys diff --git a/etc/defaults/minix.rc.conf b/etc/defaults/minix.rc.conf index ba40b5fd3..4f932fae5 100644 --- a/etc/defaults/minix.rc.conf +++ b/etc/defaults/minix.rc.conf @@ -1,8 +1,8 @@ # Minix-specific rc.conf default values # Where to find servers/drivers binaries -PKG_SERVICE_DIR=/usr/pkg/minixservices -SERVICES_DIRS="/usr/sbin $PKG_SERVICE_DIR" +PKG_SERVICE_DIR=/usr/pkg/service +SERVICES_DIRS="/service $PKG_SERVICE_DIR" # Where to find system.conf files and system.conf.d directories # for servers/drivers diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base index f989935ff..20f0663e3 100644 --- a/etc/mtree/NetBSD.dist.base +++ b/etc/mtree/NetBSD.dist.base @@ -29,6 +29,7 @@ ./proc ./root ./sbin +./service ./sys ./usr ./usr/adm diff --git a/etc/rc b/etc/rc index b030077ba..8fc7f0304 100755 --- a/etc/rc +++ b/etc/rc @@ -38,7 +38,7 @@ up() service=$1 shift - service $opt up /sbin/$service "$@" + service $opt up /service/$service "$@" } edit() @@ -54,10 +54,10 @@ edit() service=$1 shift - # Assume binaries are always in /sbin or /usr/sbin - binlocation=/usr/sbin/$service + # Assume binaries are always in /service or /usr/pkg/service + binlocation=/service/$service if [ ! -x $binlocation ] - then binlocation=/sbin/$service + then binlocation=/usr/pkg/service/$service fi service $opt edit $binlocation -label $service "$@" } @@ -200,7 +200,7 @@ down|stop) /usr/pkg/etc/rc.d/usbd stop fi - if [ -x /usr/sbin/usbd ] + if [ -x /service/usbd ] then service down usbd fi diff --git a/etc/rc.capes/BB-BONE-WTHR-01 b/etc/rc.capes/BB-BONE-WTHR-01 index d3f96c982..cb60e3e93 100644 --- a/etc/rc.capes/BB-BONE-WTHR-01 +++ b/etc/rc.capes/BB-BONE-WTHR-01 @@ -4,17 +4,17 @@ # TSL2550 Ambient Light Sensor test -e /dev/tsl2550b3s39 || (cd /dev && MAKEDEV tsl2550b3s39) -/bin/service up /usr/sbin/tsl2550 -dev /dev/tsl2550b3s39 \ +/bin/service up /service/tsl2550 -dev /dev/tsl2550b3s39 \ -label tsl2550.3.39 -args 'bus=3 address=0x39' && echo -n " tsl2550" # SHT21 Temperature and Humidity Sensor test -e /dev/sht21b3s40 || (cd /dev && MAKEDEV sht21b3s40) -/bin/service up /usr/sbin/sht21 -dev /dev/sht21b3s40 \ +/bin/service up /service/sht21 -dev /dev/sht21b3s40 \ -label sht21.3.40 -args 'bus=3 address=0x40' && echo -n " sht21" # BMP085 Temperature and Pressure Sensor test -e /dev/bmp085b3s77 || (cd /dev && MAKEDEV bmp085b3s77) -/bin/service up /usr/sbin/bmp085 -dev /dev/bmp085b3s77 \ +/bin/service up /service/bmp085 -dev /dev/bmp085b3s77 \ -label bmp085.3.77 -args 'bus=3 address=0x77' && echo -n " bmp085" daemonize tcpd http /usr/share/beaglebone/weather/weatherstation.lua diff --git a/etc/rs.inet b/etc/rs.inet index b4bc3c840..5bd9d6b70 100755 --- a/etc/rs.inet +++ b/etc/rs.inet @@ -6,8 +6,7 @@ kill_by_name() { label="$1" - pid=`ps ax | grep "$label" | grep -v grep | - sed 's,[ ]*\([0-9]*\).*,\1,` + pid=`ps ax | grep "$label" | grep -v grep | sed 's,[ ]*\([0-9]*\).*,\1,'` if [ X"$pid" = X ] then return 1 # No such process @@ -65,10 +64,10 @@ kill_by_name syslogd sleep 3 if [ X`/bin/sysenv lwip` = Xyes ] then - service up /usr/sbin/lwip -script /etc/rs.inet -dev /dev/ip + service up /service/lwip -script /etc/rs.inet -dev /dev/ip dhcpd --lwip & else - service up /usr/sbin/inet -script /etc/rs.inet -dev /dev/ip + service up /service/inet -script /etc/rs.inet -dev /dev/ip daemonize dhcpd fi daemonize nonamed -L diff --git a/minix/commands/swifi/run_swifi b/minix/commands/swifi/run_swifi index 1836e4af2..8d7fbcb70 100644 --- a/minix/commands/swifi/run_swifi +++ b/minix/commands/swifi/run_swifi @@ -2,7 +2,7 @@ LABEL=e1000_0 NAME=e1000 -EXEDIR=/usr/src/drivers/$NAME +EXEDIR=/service EXE=$EXEDIR/$NAME :>log @@ -19,7 +19,7 @@ do_one() while [ X"$pid" = X ] do pid=`ps ax | grep $NAME | grep -v grep | - sed 's,^[ ]*,,;s,[ ].*,,` + sed 's,^[ ]*,,;s,[ ].*,,'` if [ X"$pid" != X ] then break diff --git a/minix/commands/swifi/run_t1 b/minix/commands/swifi/run_t1 index cae9cb4ef..ebffbdc05 100755 --- a/minix/commands/swifi/run_t1 +++ b/minix/commands/swifi/run_t1 @@ -1,7 +1,7 @@ #!/bin/sh LABEL=es1371 -EXEDIR=/usr/build/drivers/es1371 +EXEDIR=/service/es1371 #LABEL=fxp #EXEDIR=/usr/build/drivers/fxp EXE=$EXEDIR/$LABEL @@ -18,7 +18,7 @@ do_one() ps ax | grep $LABEL | grep -v grep pid=`ps ax | grep $LABEL | grep -v grep | sort -n | tail -1 | - sed 's,^[ ]*,,;s,[ ].*,,` + sed 's,^[ ]*,,;s,[ ].*,,'` if [ X"$pid" != X ] then break diff --git a/minix/commands/swifi/run_t2 b/minix/commands/swifi/run_t2 index 4bce2aeaa..9a2408642 100755 --- a/minix/commands/swifi/run_t2 +++ b/minix/commands/swifi/run_t2 @@ -1,7 +1,7 @@ #!/bin/sh LABEL=dp8390 -EXEDIR=/usr/build/drivers/dp8390 +EXEDIR=/service/dp8390 EXE=$EXEDIR/$LABEL DAYTIME_HOST=jetsam.cs.vu.nl FAULTS_PER_BLOCK=1 @@ -19,7 +19,7 @@ do_one() while [ X"$pid" = X ] do pid=`ps ax | grep $LABEL | grep -v grep | - sed 's,^[ ]*,,;s,[ ].*,,` + sed 's,^[ ]*,,;s,[ ].*,,'` if [ X"$pid" != X ] then break diff --git a/minix/drivers/Makefile.inc b/minix/drivers/Makefile.inc index 5c329c729..c90ad6ae7 100644 --- a/minix/drivers/Makefile.inc +++ b/minix/drivers/Makefile.inc @@ -1,4 +1,4 @@ -BINDIR?=/usr/sbin +BINDIR?= /service MAN?= LDADD+= -lminlib -lcompat_minix diff --git a/minix/drivers/audio/Makefile.inc b/minix/drivers/audio/Makefile.inc index cc8cc2a9d..9af54d4af 100644 --- a/minix/drivers/audio/Makefile.inc +++ b/minix/drivers/audio/Makefile.inc @@ -1,4 +1,4 @@ -BINDIR?=/usr/sbin +BINDIR?= /service MAN?= DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINLIB} diff --git a/minix/drivers/audio/README b/minix/drivers/audio/README index a7f79249e..f8031831e 100644 --- a/minix/drivers/audio/README +++ b/minix/drivers/audio/README @@ -9,4 +9,4 @@ Needs updating: sb16/ SB16 ISA driver Running the drivers: -* service up /usr/sbin/es137{0,1} -dev /dev/audio +* service up /service/es137{0,1} -dev /dev/audio diff --git a/minix/drivers/audio/sb16/README b/minix/drivers/audio/sb16/README index 08e62a231..7ab8dd2c7 100644 --- a/minix/drivers/audio/sb16/README +++ b/minix/drivers/audio/sb16/README @@ -11,8 +11,8 @@ Installation instructions SB16 driver Minix >= 3.0.7 (default 7 and 220) - make install - MAKEDEV /dev/audio (if /dev/audio doesn't allready exist) -- service up /usr/sbin/sb16_dsp -dev /dev/audio -- service up /usr/sbin/sb16_mixer -dev /dev/mixer +- service up /service/sb16_dsp -dev /dev/audio +- service up /service/sb16_mixer -dev /dev/mixer done... (you can include the last 2 lines in /usr/etc/rc) diff --git a/minix/drivers/bus/i2c/README.txt b/minix/drivers/bus/i2c/README.txt index e9a69de30..a1ab83777 100644 --- a/minix/drivers/bus/i2c/README.txt +++ b/minix/drivers/bus/i2c/README.txt @@ -33,9 +33,9 @@ cd /dev && MAKEDEV i2c-1 && MAKEDEV i2c-2 && MAKEDEV i2c-3 Starting up the instances: -/bin/service up /usr/sbin/i2c -dev /dev/i2c-1 -label i2c.1 -args instance=1 -/bin/service up /usr/sbin/i2c -dev /dev/i2c-2 -label i2c.2 -args instance=2 -/bin/service up /usr/sbin/i2c -dev /dev/i2c-3 -label i2c.3 -args instance=3 +/bin/service up /service/i2c -dev /dev/i2c-1 -label i2c.1 -args instance=1 +/bin/service up /service/i2c -dev /dev/i2c-2 -label i2c.2 -args instance=2 +/bin/service up /service/i2c -dev /dev/i2c-3 -label i2c.3 -args instance=3 There is an i2cscan program from NetBSD which can detect devices on the bus: diff --git a/minix/drivers/clock/Makefile.inc b/minix/drivers/clock/Makefile.inc index 01b5f2341..969f178b2 100644 --- a/minix/drivers/clock/Makefile.inc +++ b/minix/drivers/clock/Makefile.inc @@ -1 +1,3 @@ +BINDIR?= /service + .include "../Makefile.inc" diff --git a/minix/drivers/clock/readclock/Makefile b/minix/drivers/clock/readclock/Makefile index 1d2f73171..cb7351d6c 100644 --- a/minix/drivers/clock/readclock/Makefile +++ b/minix/drivers/clock/readclock/Makefile @@ -1,17 +1,12 @@ # Makefile for readclock 'driver' PROG= readclock.drv +SRCS+= readclock.c forward.c forward.h .include "arch/${MACHINE_ARCH}/Makefile.inc" -SRCS+= readclock.c forward.c forward.h - DPADD+= ${LIBSYS} ${LIBTIMERS} LDADD+= -lsys -ltimers -MAN= - -BINDIR?= /sbin - CPPFLAGS+= -D_SYSTEM=1 -I${.CURDIR} .include diff --git a/minix/drivers/eeprom/cat24c256/README.txt b/minix/drivers/eeprom/cat24c256/README.txt index 0ec53259f..712498d19 100644 --- a/minix/drivers/eeprom/cat24c256/README.txt +++ b/minix/drivers/eeprom/cat24c256/README.txt @@ -12,5 +12,5 @@ Testing the Code Starting up an instance: -/bin/service up /usr/sbin/cat24c256 -dev /dev/eepromb1s50 -label cat24c256.1.50 -args 'bus=1 address=0x50' +/bin/service up /service/cat24c256 -dev /dev/eepromb1s50 -label cat24c256.1.50 -args 'bus=1 address=0x50' diff --git a/minix/drivers/hid/pckbd/Makefile b/minix/drivers/hid/pckbd/Makefile index f964367b7..edcfb86ec 100644 --- a/minix/drivers/hid/pckbd/Makefile +++ b/minix/drivers/hid/pckbd/Makefile @@ -5,8 +5,4 @@ SRCS= pckbd.c table.c DPADD+= ${LIBINPUTDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -linputdriver -lsys -ltimers -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/power/tps65950/README.txt b/minix/drivers/power/tps65950/README.txt index e80b1e45b..b72b5d885 100644 --- a/minix/drivers/power/tps65950/README.txt +++ b/minix/drivers/power/tps65950/README.txt @@ -28,7 +28,7 @@ Testing the Code Starting up an instance: -/bin/service up /usr/sbin/tps65950 -label tps65950.1.48 \ +/bin/service up /service/tps65950 -label tps65950.1.48 \ -args 'bus=1 address=0x48' Killing an instance: diff --git a/minix/drivers/sensors/bmp085/README.txt b/minix/drivers/sensors/bmp085/README.txt index d6d0cc317..5d0646057 100644 --- a/minix/drivers/sensors/bmp085/README.txt +++ b/minix/drivers/sensors/bmp085/README.txt @@ -50,7 +50,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not, this is how you start up an instance: cd /dev && MAKEDEV bmp085b3s77 -/bin/service up /usr/sbin/bmp085 -label bmp085.3.77 -dev /dev/bmp085b3s77 \ +/bin/service up /service/bmp085 -label bmp085.3.77 -dev /dev/bmp085b3s77 \ -args 'bus=3 address=0x77' Getting the sensor value: diff --git a/minix/drivers/sensors/sht21/README.txt b/minix/drivers/sensors/sht21/README.txt index fd3cba305..41df519ab 100644 --- a/minix/drivers/sensors/sht21/README.txt +++ b/minix/drivers/sensors/sht21/README.txt @@ -54,7 +54,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not, this is how you start up an instance: cd /dev && MAKEDEV sht21b3s40 -/bin/service up /usr/sbin/sht21 -label sht21.3.40 -dev /dev/sht21b3s40 \ +/bin/service up /service/sht21 -label sht21.3.40 -dev /dev/sht21b3s40 \ -args 'bus=3 address=0x40' Getting the sensor value: diff --git a/minix/drivers/sensors/tsl2550/README.txt b/minix/drivers/sensors/tsl2550/README.txt index a7bb7576f..5244feb8f 100644 --- a/minix/drivers/sensors/tsl2550/README.txt +++ b/minix/drivers/sensors/tsl2550/README.txt @@ -33,7 +33,7 @@ The driver should have been started by a script in /etc/rc.capes/ If not, this is how you start up an instance: cd /dev && MAKEDEV tsl2550b3s39 -/bin/service up /usr/sbin/tsl2550 -label tsl2550.3.39 -dev /dev/tsl2550b3s39 \ +/bin/service up /service/tsl2550 -label tsl2550.3.39 -dev /dev/tsl2550b3s39 \ -args 'bus=3 address=0x39' Getting the sensor value: diff --git a/minix/drivers/storage/ahci/Makefile b/minix/drivers/storage/ahci/Makefile index 058962dd7..687615913 100644 --- a/minix/drivers/storage/ahci/Makefile +++ b/minix/drivers/storage/ahci/Makefile @@ -5,8 +5,4 @@ SRCS= ahci.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBMTHREAD} LDADD+= -lblockdriver -lsys -ltimers -lmthread -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/storage/at_wini/Makefile b/minix/drivers/storage/at_wini/Makefile index 19556a45e..ecdb9023f 100644 --- a/minix/drivers/storage/at_wini/Makefile +++ b/minix/drivers/storage/at_wini/Makefile @@ -5,8 +5,4 @@ SRCS= at_wini.c liveupdate.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lblockdriver -lsys -ltimers -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/storage/floppy/Makefile b/minix/drivers/storage/floppy/Makefile index 99b180ccc..a1e8b03b6 100644 --- a/minix/drivers/storage/floppy/Makefile +++ b/minix/drivers/storage/floppy/Makefile @@ -5,8 +5,4 @@ SRCS= floppy.c liveupdate.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} LDADD+= -lblockdriver -lsys -ltimers -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/storage/mmc/mmcblk.c b/minix/drivers/storage/mmc/mmcblk.c index a3bcb171b..4d429ac4d 100644 --- a/minix/drivers/storage/mmc/mmcblk.c +++ b/minix/drivers/storage/mmc/mmcblk.c @@ -97,7 +97,7 @@ apply_env() * log_level=[0-4] (NONE,WARN,INFO,DEBUG,TRACE) instance=[0-3] * instance/bus number to use for this driver Passing these arguments * is done when starting the driver using the service command in the - * following way service up /sbin/mmc -args "log_level=2 instance=1 + * following way service up /service/mmc -args "log_level=2 instance=1 * driver=dummy" -dev /dev/c2d0 */ char driver[16]; memset(driver, '\0', 16); diff --git a/minix/drivers/storage/ramdisk/proto b/minix/drivers/storage/ramdisk/proto index 2dbc2c3de..b78f2d2ad 100644 --- a/minix/drivers/storage/ramdisk/proto +++ b/minix/drivers/storage/ramdisk/proto @@ -15,7 +15,7 @@ d--755 0 0 sh ---755 0 0 sh service ---755 0 0 service $ - sbin d--755 0 0 + service d--755 0 0 #ifdef __i386__ floppy ---755 0 0 floppy ahci ---755 0 0 ahci @@ -32,18 +32,16 @@ d--755 0 0 mfs ---755 0 0 mfs procfs ---755 0 0 procfs input ---755 0 0 input - $ - usr d--755 0 0 - bin d--755 0 0 - loadramdisk ---755 0 0 loadramdisk - $ - sbin d--755 0 0 #ifdef __i386__ #if RAMDISK_INC_ACPI == 1 - acpi ---755 0 0 acpi + acpi ---755 0 0 acpi #endif - pci ---755 0 0 pci + pci ---755 0 0 pci #endif + $ + usr d--755 0 0 + bin d--755 0 0 + loadramdisk ---755 0 0 loadramdisk $ $ proc d--755 0 0 diff --git a/minix/drivers/storage/ramdisk/rc b/minix/drivers/storage/ramdisk/rc index b9bfabbc5..94a17e5df 100644 --- a/minix/drivers/storage/ramdisk/rc +++ b/minix/drivers/storage/ramdisk/rc @@ -6,17 +6,17 @@ exec 2>/dev/log exec /dev/null @@ -30,27 +30,27 @@ then if [ -e $ACPI -a -n "`sysenv acpi`" ] virtio_blk=yes fi - /bin/service -cn up /sbin/floppy -dev /dev/fd0 + /bin/service -cn up /service/floppy -dev /dev/fd0 if [ X`/bin/sysenv ahci` = Xyes ] then # this is here temporarily, for testing purposes - /bin/service -c up /sbin/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0 + /bin/service -c up /service/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0 elif [ X"$virtio_blk" = Xyes ] then - /bin/service -c up /sbin/virtio_blk -dev /dev/c0d0 -label virtio_blk_0 -args instance=0 + /bin/service -c up /service/virtio_blk -dev /dev/c0d0 -label virtio_blk_0 -args instance=0 else - /bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0 - /bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1 2>/dev/null || : + /bin/service -c up /service/at_wini -dev /dev/c0d0 -label at_wini_0 + /bin/service -cr up /service/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1 2>/dev/null || : fi /bin/umount /proc >/dev/null fi if [ X`/bin/sysenv arch` = Xearm ] then echo Starting the mmc driver - /bin/service -c up /sbin/mmc -dev /dev/c0d0 + /bin/service -c up /service/mmc -dev /dev/c0d0 fi -/bin/service up /sbin/procfs || echo "WARNING: couldn't start procfs" +/bin/service up /service/procfs || echo "WARNING: couldn't start procfs" if /bin/sysenv rootdevname >/dev/null then rootdevname=/dev/`/bin/sysenv rootdevname` diff --git a/minix/drivers/storage/virtio_blk/Makefile b/minix/drivers/storage/virtio_blk/Makefile index 95171fce5..849c54a18 100644 --- a/minix/drivers/storage/virtio_blk/Makefile +++ b/minix/drivers/storage/virtio_blk/Makefile @@ -5,8 +5,4 @@ SRCS= virtio_blk.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBMTHREAD} ${LIBVIRTIO} LDADD+= -lblockdriver -lsys -lmthread -lvirtio -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/system/gpio/Makefile b/minix/drivers/system/gpio/Makefile index 2b3d832b6..6ebe80070 100644 --- a/minix/drivers/system/gpio/Makefile +++ b/minix/drivers/system/gpio/Makefile @@ -5,12 +5,7 @@ SRCS= gpio.c DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF} LDADD+= -lvtreefs -lsys -lgpio -lclkconf -# # This is a system driver. CPPFLAGS+= -D_SYSTEM=1 -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/drivers/usb/usbd/base/earm/Makefile b/minix/drivers/usb/usbd/base/earm/Makefile index e7babf6a1..59425a2c5 100644 --- a/minix/drivers/usb/usbd/base/earm/Makefile +++ b/minix/drivers/usb/usbd/base/earm/Makefile @@ -3,7 +3,7 @@ PROG= usbd SRCS= usbd.c usbd_earm.c hcd.c hcd_common.c hcd_ddekit.c musb_am335x.c musb_core.c MAN= -BINDIR= /usr/sbin +BINDIR= /service .PATH: ${.CURDIR}/../ ${.CURDIR}/../../hcd ${.CURDIR}/../../hcd/musb diff --git a/minix/drivers/video/fb/README.txt b/minix/drivers/video/fb/README.txt index 838901b82..f51b227b1 100644 --- a/minix/drivers/video/fb/README.txt +++ b/minix/drivers/video/fb/README.txt @@ -12,7 +12,7 @@ Testing the Code Starting up an instance: -service up /usr/sbin/fb -dev /dev/fb0 -args edid.0=cat24c256.3.50 +service up /service/fb -dev /dev/fb0 -args edid.0=cat24c256.3.50 The arguments take the following form: diff --git a/minix/drivers/video/tda19988/README.txt b/minix/drivers/video/tda19988/README.txt index 7b47e66a4..60c133054 100644 --- a/minix/drivers/video/tda19988/README.txt +++ b/minix/drivers/video/tda19988/README.txt @@ -52,7 +52,7 @@ Testing the Code Starting up an instance: -/bin/service up /usr/sbin/tda19988 -label tda19988.1.3470 \ +/bin/service up /service/tda19988 -label tda19988.1.3470 \ -args 'cec_bus=1 cec_address=0x34 hdmi_bus=1 hdmi_address=0x70' Killing an instance: @@ -67,7 +67,7 @@ device file to read the EDID like this: cd /dev mknod tda19988 b 32 0 chmod 600 tda19988 -/bin/service up /usr/sbin/tda19988 -label tda19988.1.3470 \ +/bin/service up /service/tda19988 -label tda19988.1.3470 \ -dev /dev/tda19988 \ -args 'cec_bus=1 cec_address=0x34 hdmi_bus=1 hdmi_address=0x70' dd if=/dev/tda19988 of=/root/edid.dat count=1 bs=128 diff --git a/minix/fs/Makefile.inc b/minix/fs/Makefile.inc index 5c329c729..c90ad6ae7 100644 --- a/minix/fs/Makefile.inc +++ b/minix/fs/Makefile.inc @@ -1,4 +1,4 @@ -BINDIR?=/usr/sbin +BINDIR?= /service MAN?= LDADD+= -lminlib -lcompat_minix diff --git a/minix/fs/ext2/Makefile b/minix/fs/ext2/Makefile index d1473d62c..44f289c30 100644 --- a/minix/fs/ext2/Makefile +++ b/minix/fs/ext2/Makefile @@ -10,9 +10,4 @@ LDADD+= -lminixfs -lbdev -lsys -lminlib WARNS=3 -MAN= - -BINDIR?= /sbin -CFLAGS+= -Wall -Wextra - .include diff --git a/minix/fs/hgfs/Makefile b/minix/fs/hgfs/Makefile index 534e30087..5fb1d3000 100644 --- a/minix/fs/hgfs/Makefile +++ b/minix/fs/hgfs/Makefile @@ -5,8 +5,4 @@ SRCS= hgfs.c DPADD+= ${LIBSFFS} ${LIBHGFS} ${LIBSYS} LDADD+= -lsffs -lhgfs -lsys -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/fs/iso9660fs/Makefile b/minix/fs/iso9660fs/Makefile index b90c38230..ecdc7c568 100644 --- a/minix/fs/iso9660fs/Makefile +++ b/minix/fs/iso9660fs/Makefile @@ -6,11 +6,6 @@ SRCS= main.c table.c mount.c super.c inode.c \ DPADD+= ${LIBBDEV} ${LIBSYS} ${LIBMINLIB} LDADD+= -lbdev -lsys -lc -lminixfs -lminlib -MAN= - -BINDIR?= /sbin - -NR_BUFS= 100 -CPPFLAGS+= -DNR_BUFS=${NR_BUFS} +CPPFLAGS+= -DNR_BUFS=100 .include diff --git a/minix/fs/mfs/Makefile b/minix/fs/mfs/Makefile index 1371c697d..7c0195bb2 100644 --- a/minix/fs/mfs/Makefile +++ b/minix/fs/mfs/Makefile @@ -8,11 +8,6 @@ SRCS= cache.c link.c \ DPADD+= ${LIBMINIXFS} ${LIBBDEV} ${LIBSYS} LDADD+= -lminixfs -lbdev -lsys -MAN= - -BINDIR?= /sbin - -DEFAULT_NR_BUFS= 1024 -CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS} +CPPFLAGS+= -DDEFAULT_NR_BUFS=1024 .include diff --git a/minix/fs/pfs/Makefile b/minix/fs/pfs/Makefile index 4e9380bf6..48619fee0 100644 --- a/minix/fs/pfs/Makefile +++ b/minix/fs/pfs/Makefile @@ -8,8 +8,4 @@ LDADD+= -lchardriver -lsys LDADD+= -lc -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/minix/fs/procfs/Makefile b/minix/fs/procfs/Makefile index 26acea459..8f18ef205 100644 --- a/minix/fs/procfs/Makefile +++ b/minix/fs/procfs/Makefile @@ -1,6 +1,4 @@ # Makefile for ProcFS server -# - .include PROG= procfs @@ -13,8 +11,4 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/minix/servers DPADD+= ${LIBVTREEFS} ${LIBMINLIB} LDADD+= -lvtreefs -lminlib -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/fs/vbfs/Makefile b/minix/fs/vbfs/Makefile index fd4153fe7..90e0f0a0e 100644 --- a/minix/fs/vbfs/Makefile +++ b/minix/fs/vbfs/Makefile @@ -5,8 +5,4 @@ SRCS= vbfs.c DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBSYS} LDADD+= -lsffs -lvboxfs -lsys -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/include/minix/paths.h b/minix/include/minix/paths.h index 357a4ac36..bb473a64f 100644 --- a/minix/include/minix/paths.h +++ b/minix/include/minix/paths.h @@ -15,7 +15,7 @@ #define _PATH_RAMDISK "/dev/ram" -#define _PATH_DRIVERS "/usr/sbin" +#define _PATH_DRIVERS "/service" #define _PATH_SERVACCES "/etc/serv.access" diff --git a/minix/lib/libc/sys/mount.c b/minix/lib/libc/sys/mount.c index 6e2703d46..1a05e3daf 100644 --- a/minix/lib/libc/sys/mount.c +++ b/minix/lib/libc/sys/mount.c @@ -15,7 +15,7 @@ #define FSDEFAULT "mfs" -static char fspath[] = "/sbin/:/usr/pkg/bin/"; /* Must include trailing '/' */ +static char fspath[] = "/service/:/usr/pkg/service/"; /* Must include trailing '/' */ static int rs_down(char *label) { diff --git a/minix/net/Makefile.inc b/minix/net/Makefile.inc index 5c329c729..c90ad6ae7 100644 --- a/minix/net/Makefile.inc +++ b/minix/net/Makefile.inc @@ -1,4 +1,4 @@ -BINDIR?=/usr/sbin +BINDIR?= /service MAN?= LDADD+= -lminlib -lcompat_minix diff --git a/minix/servers/Makefile.inc b/minix/servers/Makefile.inc index 86c4d21a5..c90ad6ae7 100644 --- a/minix/servers/Makefile.inc +++ b/minix/servers/Makefile.inc @@ -1,4 +1,5 @@ -BINDIR?=/usr/sbin +BINDIR?= /service +MAN?= LDADD+= -lminlib -lcompat_minix DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} diff --git a/minix/servers/devman/Makefile b/minix/servers/devman/Makefile index aed72d44c..02186db08 100644 --- a/minix/servers/devman/Makefile +++ b/minix/servers/devman/Makefile @@ -1,11 +1,7 @@ PROG = devman - SRCS = main.c device.c buf.c bind.c - DPADD+= ${LIBSYS} ${LIBMINLIB} LDADD = -lvtreefs -lsys -lminlib -BINDIR?= /sbin -MAN= .include diff --git a/minix/servers/ds/Makefile b/minix/servers/ds/Makefile index c7cad6605..6619f5448 100644 --- a/minix/servers/ds/Makefile +++ b/minix/servers/ds/Makefile @@ -5,8 +5,4 @@ SRCS= main.c store.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/minix/servers/input/Makefile b/minix/servers/input/Makefile index 192400063..02b38de01 100644 --- a/minix/servers/input/Makefile +++ b/minix/servers/input/Makefile @@ -6,9 +6,5 @@ SRCS= input.c DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -MAN= - -BINDIR?= /sbin - .include diff --git a/minix/servers/ipc/Makefile b/minix/servers/ipc/Makefile index ccda5f1ca..e26053c50 100644 --- a/minix/servers/ipc/Makefile +++ b/minix/servers/ipc/Makefile @@ -5,9 +5,6 @@ SRCS= main.c utility.c shm.c sem.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /usr/sbin FILES=ipc.conf FILESNAME=ipc FILESDIR= /etc/system.conf.d diff --git a/minix/servers/is/Makefile b/minix/servers/is/Makefile index 74dd9cf44..38644bf2d 100644 --- a/minix/servers/is/Makefile +++ b/minix/servers/is/Makefile @@ -1,6 +1,4 @@ # Makefile for Information Server (IS) -# - .include PROG= is @@ -9,10 +7,6 @@ SRCS= main.c dmp.c dmp_kernel.c dmp_pm.c dmp_fs.c dmp_rs.c dmp_ds.c dmp_vm.c DPADD+= ${LIBSYS} LDADD+= -lsys -MAN= - -BINDIR?= /sbin - CPPFLAGS.dmp_fs.c+= -I${NETBSDSRCDIR}/minix/servers \ -I${NETBSDSRCDIR}/minix/fs CPPFLAGS.dmp_kernel.c+= -I${NETBSDSRCDIR}/minix diff --git a/minix/servers/pm/Makefile b/minix/servers/pm/Makefile index 7d4fe60ea..75f4c540e 100644 --- a/minix/servers/pm/Makefile +++ b/minix/servers/pm/Makefile @@ -9,10 +9,6 @@ SRCS= main.c forkexit.c exec.c time.c alarm.c \ DPADD+= ${LIBSYS} ${LIBTIMERS} LDADD+= -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS.main.c+= -I${NETBSDSRCDIR}/minix CPPFLAGS.misc.c+= -I${NETBSDSRCDIR}/minix CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}/minix diff --git a/minix/servers/rs/Makefile b/minix/servers/rs/Makefile index 4fcd87852..eaac5e404 100644 --- a/minix/servers/rs/Makefile +++ b/minix/servers/rs/Makefile @@ -11,10 +11,6 @@ CPPFLAGS+= -DUSE_PCI DPADD+= ${LIBSYS} ${LIBEXEC} LDADD+= -lsys -lexec -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${NETBSDSRCDIR}/minix .include diff --git a/minix/servers/sched/Makefile b/minix/servers/sched/Makefile index f5f53df57..4202ecd9a 100644 --- a/minix/servers/sched/Makefile +++ b/minix/servers/sched/Makefile @@ -5,10 +5,6 @@ SRCS= main.c schedule.c utility.c DPADD+= ${LIBSYS} ${LIBTIMERS} LDADD+= -lsys -ltimers -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS.main.c+= -I${NETBSDSRCDIR}/minix CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}/minix CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}/minix diff --git a/minix/servers/vfs/Makefile b/minix/servers/vfs/Makefile index b1255ec85..76a22a4ba 100644 --- a/minix/servers/vfs/Makefile +++ b/minix/servers/vfs/Makefile @@ -18,8 +18,4 @@ CFLAGS+= -Wall -Wextra -Wno-sign-compare -Werror DPADD+= ${LIBSYS} ${LIBTIMERS} ${LIBEXEC} LDADD+= -lsys -ltimers -lexec -lmthread -MAN= - -BINDIR?= /usr/sbin - .include diff --git a/minix/servers/vm/Makefile b/minix/servers/vm/Makefile index c084a068f..b79f21741 100644 --- a/minix/servers/vm/Makefile +++ b/minix/servers/vm/Makefile @@ -15,12 +15,6 @@ LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/vm.lds DPADD+= ${LIBSYS} ${LIBEXEC} LDADD+= -lsys -lexec -WARNS=5 - -MAN= - -BINDIR?= /usr/sbin - CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CPPFLAGS+= -I${NETBSDSRCDIR}/minix diff --git a/minix/tests/fbdtest/test.sh b/minix/tests/fbdtest/test.sh index 304caf096..0d2c79553 100755 --- a/minix/tests/fbdtest/test.sh +++ b/minix/tests/fbdtest/test.sh @@ -82,7 +82,7 @@ read_test() { EXP=$2 shift 2 $RWBLOCKS $DEV $PAT - service up /usr/sbin/fbd -dev /dev/fbd -args "$PAIR" || exit 1 + service up /service/fbd -dev /dev/fbd -args "$PAIR" || exit 1 fbdctl add $@ >/dev/null #fbdctl list RES="`$RWBLOCKS /dev/fbd`" @@ -115,7 +115,7 @@ write_test() { WS=$3 shift 3 $RWBLOCKS $DEV UUUUUUUUUUUUUUUU - service up /usr/sbin/fbd -dev /dev/fbd -args "$PAIR" || exit 1 + service up /service/fbd -dev /dev/fbd -args "$PAIR" || exit 1 fbdctl add $@ >/dev/null #fbdctl list $RWBLOCKS /dev/fbd $PAT $WS