diff --git a/src/etc/Makefile b/src/etc/Makefile index 4aa5c9d0..2d83da76 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.427 2016/08/10 14:27:15 deraadt Exp $ +# $OpenBSD: Makefile,v 1.428 2016/09/01 09:54:17 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -264,7 +264,7 @@ distrib: SUBDIR+= etc.alpha etc.amd64 etc.armv7 SUBDIR+= etc.hppa etc.i386 etc.landisk etc.loongson etc.luna88k SUBDIR+= etc.macppc etc.octeon -SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.zaurus +SUBDIR+= etc.sgi etc.socppc etc.sparc64 etc.zaurus .include .include diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV deleted file mode 100644 index cdaf59a1..00000000 --- a/src/etc/etc.sparc/MAKEDEV +++ /dev/null @@ -1,554 +0,0 @@ -#!/bin/sh - -# -# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. -# generated from: -# -# OpenBSD: etc.sparc/MAKEDEV.md,v 1.57 2016/04/25 20:38:11 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp -# OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp -# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp -# -# -# Copyright (c) 2001-2004 Todd T. Fries -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# Device "make" file. Valid arguments: -# all makes all known devices, including local devices. -# Tries to make the ``standard'' number of each type. -# ramdisk Ramdisk kernel devices -# std Standard devices -# local Configuration specific devices -# Disks: -# cd* ATAPI and SCSI CD-ROM drives -# fd* Floppy disk drives (3 1/2", 5 1/4") -# presto* Prestoserve NVRAM memory -# sd* SCSI disks, including flopticals -# rd* "rd" pseudo-disks -# vnd* "file" pseudo-disk devices -# xd* Xylogic 753/7053 disks -# xy* Xylogic 450/451 disks -# Tapes: -# ch* SCSI media changers -# st* SCSI tape drives -# Terminal ports: -# cua[a-z]* Zilog 8530 serial ports -# magma* Magma multiport cards -# spif* "spif" multiport cards -# tty[0-7][0-9a-f] NS16x50 serial ports -# tty[a-z]* Zilog 8530 serial ports -# Pseudo terminals: -# ptm pty master device -# pty* Set of 62 master pseudo terminals -# tty* Set of 62 slave pseudo terminals -# Printers: -# bpp* Parallel port -# bpp[jkl] "spif" parallel port -# bppmag[mno] Magma parallel port -# Console ports: -# ttyC-J* wscons display devices -# wscons Minimal wscons devices -# wskbd* wscons keyboards -# wsmux wscons keyboard/mouse mux devices -# Pointing devices: -# wsmouse* wscons mice -# Special purpose devices: -# apm Power management device -# audio* Audio devices -# bio ioctl tunnel pseudo-device -# bpf Berkeley Packet Filter -# diskmap Disk mapper -# fd fd/* nodes -# fuse Userland Filesystem -# hotplug devices hot plugging -# openprom PROM settings -# pf* Packet Filter -# pppx* PPP Multiplexer -# *random In-kernel random data source -# tun* Network tunnel driver -# tap* Ethernet tunnel driver -# uk* Unknown SCSI devices -# vscsi* Virtual SCSI controller -PATH=/sbin:/usr/sbin:/bin:/usr/bin -T=$0 - -# set this to echo for Echo-Only debugging -[ "$eo" ] || eo= - -hex() -{ - case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; - esac -} - -alph2d() -{ - local t="$1" - local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - local sub=${p%${t}*} - echo ${#sub} -} - -h2d() -{ - local s="$1" - local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*} - - echo $(($(_h2d $f)*16+ $(_h2d $n) )) -} - -_h2d() -{ - case $1 in - [0-9]) echo -n $1;; - a) echo -n 10;; - b) echo -n 11;; - c) echo -n 12;; - d) echo -n 13;; - e) echo -n 14;; - f) echo -n 15;; - esac -} - -unt() -{ - # XXX pdksh can't seem to deal with locally scoped variables - # in ${foo#$bar} expansions - arg="$1" - tmp="${arg#[a-zA-Z]*}" - tmp="${tmp%*[a-zA-Z]}" - while [ "$tmp" != "$arg" ] - do - arg=$tmp - tmp="${arg#[a-zA-Z]*}" - tmp="${tmp%*[a-zA-Z]}" - done - echo $arg -} - -dodisk() -{ - [ "$DEBUG" ] && set -x - n=$(($((${5}*${7:-16}))+${6})) count=0 - [ 0$7 -ne 8 ] && l="i j k l m n o p" - for d in a b c d e f g h $l - do - M $1$2$d b $3 $(($n+$count)) 640 operator - M r$1$2$d c $4 $(($n+$count)) 640 operator - let count=count+1 - done -} - -dodisk2() -{ - n=$(($(($5*${7:-16}))+$6)) - M $1$2a b $3 $n 640 operator - M r$1$2a c $4 $n 640 operator - n=$(($n+2)) - M $1$2c b $3 $n 640 operator - M r$1$2c c $4 $n 640 operator -} - -# M name b/c major minor [mode] [group] -RMlist[0]="rm -f" - -mkl() { - : ${mklist[0]:=";mknod"} - mklist[${#mklist[*]}]=" -m $1 $2 $3 $4 $5" -} - -M() { - RMlist[${#RMlist[*]}]=$1 - mkl ${5-666} $1 $2 $3 $4 - G=${6:-wheel} - [ "$7" ] && { - MKlist[${#MKlist[*]}]="&& chown $7:$G $1" - } || { - case $G in - wheel) - [ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel" - whlist[${#whlist[*]}]="$1" - ;; - operator) - [ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator" - oplist[${#oplist[*]}]="$1" - ;; - *) - MKlist[${#MKlist[*]}]="&& chgrp $G $1"; - esac - } - return 0 -} - -R() { -[ "$DEBUG" ] && set -x -for i in "$@" -do -U=`unt $i` -[ "$U" ] || U=0 - -case $i in -ramdisk) - R std bpf bio diskmap random - R fd0 sd0 sd1 sd2 rd0 cd0 - ;; - -std) - M console c 0 0 600 - M tty c 2 0 - M mem c 3 0 640 kmem - M kmem c 3 1 640 kmem - M null c 3 2 - M zero c 3 12 - M stdin c 24 0 - M stdout c 24 1 - M stderr c 24 2 - M ksyms c 122 0 640 kmem - M klog c 16 0 600 - M eeprom c 3 11 600 - M openprom c 70 0 600 - ;; - -vscsi*) - M vscsi$U c 128 $U 600 - ;; - -uk*) - M uk$U c 120 $U 640 operator - ;; - -tap*) - M tap$U c 132 $U 600 - ;; - -tun*) - M tun$U c 111 $U 600 - ;; - -*random) - n=0 - for pre in " " s u a - do - M ${pre}random c 119 $n 644 - n=$(($n+1)) - done - ;; - -pppx*) - M pppx$U c 130 $U 600 - ;; - -pf*) - M pf c 59 0 600 - ;; - -openprom) - M openprom c 70 0 - ;; - -hotplug) - M hotplug c 131 $U 400 - ;; - -fuse) - M fuse$U c 82 $U 600 - ;; - -fd) - RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0 - while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done - MKlist[${#MKlist[*]}]=";chmod 555 fd" - ;; - -diskmap) - M diskmap c 129 0 640 operator - ;; - -bpf) - M bpf c 105 0 600 - M bpf0 c 105 0 600 - ;; - -bio) - M bio c 124 0 600 - ;; - -audio*) - M sound$U c 69 $U - M mixer$U c 69 $(($U+16)) - M audio$U c 69 $(($U+128)) - M audioctl$U c 69 $(($U+192)) - MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio" - MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer" - MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound" - MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl" - ;; - -apm*) - M apm c 30 0 644 - M apmctl c 30 8 644 - ;; - -wsmouse[0-9]*) - M wsmouse$U c 80 $U 600 - ;; - -wsmux|wsmouse|wskbd) - M wsmouse c 81 0 600 - M wskbd c 81 1 600 - ;; - -wskbd[0-9]*) - M wskbd$U c 79 $U 600 - ;; - -wscons) - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 - R wskbd3 wsmux ttyIcfg ttyI0 ttyI1 ttyI2 ttyI3 ttyI4 ttyI5 - R ttyI6 ttyI7 ttyI8 ttyI9 ttyIa ttyIb ttyHcfg ttyH0 ttyH1 - R ttyH2 ttyH3 ttyH4 ttyH5 ttyH6 ttyH7 ttyH8 ttyH9 ttyHa ttyHb - R ttyGcfg ttyG0 ttyG1 ttyG2 ttyG3 ttyG4 ttyG5 ttyG6 ttyG7 - R ttyG8 ttyG9 ttyGa ttyGb ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3 - R ttyF4 ttyF5 ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg - R ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9 - R ttyEa ttyEb ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5 - R ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1 - R ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb - ;; - -tty[C-J]*) - U=${i##tty[C-J]} - case $i in - ttyC*) n=C m=0;; - ttyD*) n=D m=256;; - ttyE*) n=E m=512;; - ttyF*) n=F m=768;; - ttyG*) n=G m=1024;; - ttyH*) n=H m=1280;; - ttyI*) n=I m=1536;; - ttyJ*) n=J m=1792;; - esac - case $U in - [0-9a-f]) M tty$n$U c 78 $((16#$U+$m)) 600;; - cfg) M tty${n}cfg c 78 $((255+$m)) 600;; - *) echo bad unit $U for $i; exit 1;; - esac - ;; - -bpp*) - M bpp$U c 104 $U 600 - ;; - -pty*) - if [ $U -gt 15 ]; then - echo bad unit for pty in: $i - continue - fi - set -A letters p q r s t u v w x y z P Q R S T - set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \ - r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \ - Y Z - - name=${letters[$U]} - n=0 - while [ $n -lt 62 ] - do - nam=$name${suffixes[$n]} - off=$(($U*62)) - M tty$nam c 20 $(($off+$n)) - M pty$nam c 21 $(($off+$n)) - n=$(($n+1)) - done - ;; - -ptm) - M ptm c 125 0 666 - ;; - -tty[a-z]) - u=${i#tty*} - case $u in - a) n=0 ;; - b) n=1 ;; - c) n=2 ;; - d) n=3 ;; - e) n=4;; - f) n=5;; - *) echo unknown tty device $i ;; - esac - M tty$u c 12 $n 660 dialer uucp - ;; - -tty[0-7][0-9a-f]) - U=${i#tty*} - o=$(h2d $U) - M tty$U c 36 $o 660 dialer uucp - M cua$U c 36 $(($o+128)) 660 dialer uucp - ;; - -spif*) - case $U in - 0) offset=0 nam=j;; - 1) offset=16 nam=k;; - 2) offset=32 nam=l;; - *) echo "bad unit for $i: $U"; exit 127;; - esac - offset=$(($U*64)) - n=0 - while [ $n -lt 8 ] - do - name=${nam}`hex $n` - M tty$name c 102 $(($offset+$n)) 660 dialer uucp - n=$(($n+1)) - done - M bpp${nam}0 c 103 $(($offset+0)) 600 - ;; - -magma*) - case $U in - 0) offset=0 nam=m;; - 1) offset=16 nam=n;; - 2) offset=32 nam=o;; - *) echo "bad unit for $i: $U"; exit 127;; - esac - offset=$(($U*64)) - n=0 - while [ $n -lt 16 ] - do - name=${nam}`hex $n` - M tty$name c 100 $(($offset+$n)) 660 dialer uucp - n=$(($n+1)) - done - M bpp${nam}0 c 101 $(($offset+0)) 600 - M bpp${nam}1 c 101 $(($offset+1)) 600 - ;; - -cua[a-z]) - u=${i#cua*} - case $u in - a) n=0 ;; - b) n=1 ;; - c) n=2 ;; - d) n=3 ;; - e) n=4;; - f) n=5;; - *) echo unknown cua device $i ;; - esac - M cua$u c 12 $(($n+128)) 660 dialer uucp - ;; - -st*) - n=$(($U*16)) - for pre in " " n e en - do - M ${pre}st$U b 11 $n 660 operator - M ${pre}rst$U c 18 $n 660 operator - n=$(($n+1)) - done - ;; - -ch*) - M ch$U c 19 $U 660 operator - ;; - -vnd*) - dodisk vnd $U 8 110 $U 0 - ;; - -rd*) - dodisk2 rd $U 17 106 $U 0 - ;; - -fd*) - typnam=$U${i#fd[01]*} - case $typnam in - 0|1) typnum=0;; # no type specified, assume A - *A) typnum=0; typnam=0;; - *B) typnum=1;; - *C) typnum=2;; - *D) typnum=3;; - *E) typnum=4;; - *F) typnum=5;; - *G) typnum=6;; - *H) typnum=7;; - *) echo bad type $typnam for $i; exit 1;; - esac - case $U in - 0|1) blk=16; chr=54;; - *) echo bad unit $U for $i; exit 1;; - esac - nam=fd${typnam} - n=$(($(($U*128))+$(($typnum*16)))) - M ${nam}a b $blk $n 640 operator - M ${nam}b b $blk $(($n+1)) 640 operator - M ${nam}c b $blk $(($n+2)) 640 operator - M ${nam}i b $blk $(($n+8)) 640 operator - M r${nam}a c $chr $n 640 operator - M r${nam}b c $chr $(($n+1)) 640 operator - M r${nam}c c $chr $(($n+2)) 640 operator - M r${nam}i c $chr $(($n+8)) 640 operator - ;; - -cd*) - dodisk2 cd $U 18 58 $U 0 - ;; - -local) - test -s $T.local && sh $T.local - ;; - -all) - R presto0 bpp0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 - R cd1 rd0 xy0 xy1 xy2 xy3 tap0 tap1 tap2 tap3 tun0 tun1 tun2 - R tun3 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B - R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 bio cuaa - R cuab cuac cuad ttya ttyb ttyc ttyd audio0 audio1 audio2 bpf - R fuse pppx hotplug ptm local wscons uk0 random tty00 tty01 - R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b - R apm pf xd0 xd1 xd2 xd3 std st0 st1 fd - ;; - -presto*|xd*|xy*|sd*) - case $i in - presto*) dodisk presto $U 26 25 $U 0;; - xd*) dodisk xd $U 10 42 $U 0;; - xy*) dodisk xy $U 3 9 $U 0;; - sd*) dodisk sd $U 7 17 $U 0;; - esac - ;; - -*) - echo $i: unknown device - ;; -esac -done -} -R "$@" -{ -echo -n ${RMlist[*]} -echo -n ${mklist[*]} -echo -n ${MKlist[*]} -echo -n ${whlist[*]} -echo ${oplist[*]} -} | if [ "$eo" = "echo" ]; then - cat -else - sh -fi diff --git a/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md deleted file mode 100644 index f2a4da8b..00000000 --- a/src/etc/etc.sparc/MAKEDEV.md +++ /dev/null @@ -1,148 +0,0 @@ -define(MACHINE,sparc)dnl -vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.58 2016/04/28 18:17:31 natano Exp $-}, -etc.MACHINE)dnl -dnl -dnl Copyright (c) 2001-2006 Todd T. Fries -dnl -dnl Permission to use, copy, modify, and distribute this software for any -dnl purpose with or without fee is hereby granted, provided that the above -dnl copyright notice and this permission notice appear in all copies. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -dnl -dnl -dnl -dnl *** some sparc-specific devices -dnl -__devitem(s64_tzs, tty[a-z]*, Zilog 8530 serial ports,zs)dnl -__devitem(s64_czs, cua[a-z]*, Zilog 8530 serial ports,zs)dnl -_mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*} - case $u in - a) n=0 ;; - b) n=1 ;; - c) n=2 ;; - d) n=3 ;; - e) n=4;; - f) n=5;; - *) echo unknown tty device $i ;; - esac - M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl -_mkdev(s64_czs, cua[a-z], {-u=${i#cua*} - case $u in - a) n=0 ;; - b) n=1 ;; - c) n=2 ;; - d) n=3 ;; - e) n=4;; - f) n=5;; - *) echo unknown cua device $i ;; - esac - M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl -__devitem(presto, presto*, Prestoserve NVRAM memory)dnl -disk_q(presto)dnl -__devitem(apm, apm, Power management device, tctrl)dnl -dnl -dnl *** MAKEDEV itself -dnl -_TITLE(make) -_DEV(all) -_DEV(ramdisk) -_DEV(std) -_DEV(local) -_TITLE(dis) -_DEV(cd, 58, 18) -_DEV(flo, 54, 16) -_DEV(presto, 25, 26) -_DEV(sd, 17, 7) -_DEV(rd, 106, 17) -_DEV(vnd, 110, 8) -_DEV(xd, 42, 10) -_DEV(xy, 9, 3) -_TITLE(tap) -_DEV(ch, 19) -_DEV(st, 18, 11) -_TITLE(term) -_DEV(s64_czs, 12) -_DEV(mag, 100) -_DEV(spif, 102) -_DEV(com, 36) -_DEV(s64_tzs, 12) -_TITLE(pty) -_DEV(ptm, 125) -_DEV(pty, 21) -_DEV(tty, 20) -_TITLE(prn) -_DEV(bpp, 104) -_DEV(bppsp, 103) -_DEV(bppmag, 101) -_TITLE(cons) -_DEV(wsdisp, 78) -_DEV(wscons) -_DEV(wskbd, 79) -_DEV(wsmux, 81) -_TITLE(point) -_DEV(wsmouse, 80) -_TITLE(spec) -_DEV(apm, 30) -_DEV(au, 69) -_DEV(bio, 124) -_DEV(bpf, 105) -_DEV(diskmap, 129) -_DEV(fdesc, 24) -_DEV(fuse, 82) -_DEV(hotplug, 131) -_DEV(oppr) -_DEV(pf, 59) -_DEV(pppx, 130) -_DEV(rnd, 119) -_DEV(tun, 111) -_DEV(tap, 132) -_DEV(uk, 120) -_DEV(vscsi, 128) -dnl -divert(__mddivert)dnl -dnl -ramdisk) - _recurse std bpf bio diskmap random - _recurse fd0 sd0 sd1 sd2 rd0 cd0 - ;; - -_std(2, 3, 122, 16) - M eeprom c 3 11 600 - M openprom c 70 0 600 - ;; -dnl -dnl *** some sparc-specific targets -dnl -twrget(all, au, audio, 0, 1, 2)dnl -twrget(all, s64_tzs, tty, a, b, c, d)dnl -twrget(all, s64_czs, cua, a, b, c, d)dnl -target(all, bio)dnl -target(all, ch, 0)dnl -target(all, vscsi, 0)dnl -target(all, diskmap)dnl -twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl -twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl -target(all, pty, 0)dnl -target(all, tun, 0, 1, 2, 3)dnl -target(all, tap, 0, 1, 2, 3)dnl -target(all, xy, 0, 1, 2, 3)dnl -target(all, rd, 0)dnl -target(all, cd, 0, 1)dnl -target(all, sd, 0, 1, 2, 3, 4)dnl -target(all, vnd, 0, 1, 2, 3)dnl -target(all, bpp, 0)dnl -target(all, presto, 0)dnl -twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -twrget(wscons, wscons, ttyG, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -twrget(wscons, wscons, ttyH, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -twrget(wscons, wscons, ttyI, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl diff --git a/src/etc/etc.sparc/Makefile b/src/etc/etc.sparc/Makefile deleted file mode 100644 index 324bc976..00000000 --- a/src/etc/etc.sparc/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $ - -all: MAKEDEV - -.include diff --git a/src/etc/etc.sparc/Makefile.inc b/src/etc/etc.sparc/Makefile.inc deleted file mode 100644 index 89996f94..00000000 --- a/src/etc/etc.sparc/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.21 2011/07/22 09:30:54 espie Exp $ - -bootblocks: - cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} - ${DESTDIR}/usr/mdec/binstall net /tmp && \ - mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net - -MDEXT= bsd.rd cd${OSrev}.iso \ - floppy${OSrev}.fs miniroot${OSrev}.fs \ - boot boot.net bootxx installboot diff --git a/src/etc/etc.sparc/disktab b/src/etc/etc.sparc/disktab deleted file mode 100644 index 441fb564..00000000 --- a/src/etc/etc.sparc/disktab +++ /dev/null @@ -1,31 +0,0 @@ -# $OpenBSD: disktab,v 1.28 2015/08/13 21:37:56 krw Exp $ - -miniroot:\ - :ty=winchester:se#512:nt#2:ns#64:nc#96:\ - :pa#12288:oa#0:ba#8192:fa#1024:ta=4.2BSD:\ - :pb#0:ob#0:\ - :pc#12288:oc#0: - -rdroot:\ - :ty=ramdisk:se#512:nt#2:ns#4:nc#500:\ - :pa#4000:oa#0:ta=4.2BSD:ba#8192:fa#1024:\ - :pc#4000:oc#0: - -floppy|floppy3|3in|3.5in High Density Floppy:\ - :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\ - :pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\ - :pb#2880:ob#0:\ - :pc#2880:oc#0: - -# test if not having an 'a' works? -fakecdrom|Fake image for Bootable CDROM:\ - :ty=winchester:se#512:nt#1:ns#640:nc#2048:\ - :pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\ - :pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\ - :pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\ - :pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD: - -fakeramdisk:\ - :ty=winchester:se#512:nt#1:ns#32:nc#384:\ - :pa#12288:oa#0:ba#8192:fa#4096:ta=4.2BSD:\ - :pc#12288:oc#0: diff --git a/src/etc/etc.sparc/fbtab b/src/etc/etc.sparc/fbtab deleted file mode 100644 index 4e5a3a8c..00000000 --- a/src/etc/etc.sparc/fbtab +++ /dev/null @@ -1 +0,0 @@ -/dev/console 0600 /dev/ttyC0:/dev/ttyD0:/dev/ttyE0:/dev/ttyF0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg diff --git a/src/etc/etc.sparc/login.conf b/src/etc/etc.sparc/login.conf deleted file mode 100644 index 0f98caeb..00000000 --- a/src/etc/etc.sparc/login.conf +++ /dev/null @@ -1,107 +0,0 @@ -# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $ - -# -# Sample login.conf file. See login.conf(5) for details. -# - -# -# Standard authentication styles: -# -# passwd Use only the local password file -# chpass Do not authenticate, but change users password (change -# the YP password if the user has one, else change the -# local password) -# lchpass Do not login; change user's local password instead -# radius Use radius authentication -# reject Use rejected authentication -# skey Use S/Key authentication -# activ ActivCard X9.9 token authentication -# crypto CRYPTOCard X9.9 token authentication -# snk Digital Pathways SecureNet Key authentication -# tis TIS Firewall Toolkit authentication -# token Generic X9.9 token authentication -# yubikey YubiKey authentication -# - -# Default allowed authentication styles -auth-defaults:auth=passwd,skey: - -# Default allowed authentication styles for authentication type ftp -auth-ftp-defaults:auth-ftp=passwd: - -# -# The default values -# To alter the default authentication types change the line: -# :tc=auth-defaults:\ -# to be read something like: (enables passwd, "myauth", and activ) -# :auth=passwd,myauth,activ:\ -# Any value changed in the daemon class should be reset in default -# class. -# -default:\ - :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\ - :umask=022:\ - :datasize-max=512M:\ - :datasize-cur=512M:\ - :maxproc-max=256:\ - :maxproc-cur=128:\ - :openfiles-cur=512:\ - :stacksize-cur=4M:\ - :localcipher=blowfish,8:\ - :tc=auth-defaults:\ - :tc=auth-ftp-defaults: - -# -# Settings used by /etc/rc and root -# This must be set properly for daemons started as root by inetd as well. -# Be sure reset these values back to system defaults in the default class! -# -daemon:\ - :ignorenologin:\ - :datasize=infinity:\ - :maxproc=infinity:\ - :openfiles-cur=128:\ - :stacksize-cur=8M:\ - :localcipher=blowfish,9:\ - :tc=default: - -# -# Staff have fewer restrictions and can login even when nologins are set. -# -staff:\ - :datasize-cur=512M:\ - :datasize-max=infinity:\ - :maxproc-max=512:\ - :maxproc-cur=128:\ - :ignorenologin:\ - :requirehome@:\ - :tc=default: - -# -# Authpf accounts get a special motd and shell -# -authpf:\ - :welcome=/etc/motd.authpf:\ - :shell=/usr/sbin/authpf:\ - :tc=default: - -# -# Building ports with DPB uses raised limits -# -pbuild:\ - :datasize-max=infinity:\ - :datasize-cur=1024M:\ - :maxproc-max=1024:\ - :maxproc-cur=256:\ - :tc=default: - -# -# Override resource limits for certain daemons started by rc.d(8) -# -bgpd:\ - :openfiles-cur=512:\ - :tc=daemon: - -unbound:\ - :openfiles-cur=512:\ - :tc=daemon: diff --git a/src/etc/etc.sparc/sysctl.conf b/src/etc/etc.sparc/sysctl.conf deleted file mode 100644 index 50e54ded..00000000 --- a/src/etc/etc.sparc/sysctl.conf +++ /dev/null @@ -1 +0,0 @@ -#machdep.led_blink=1 # 1=On sparc, make led(s) blink diff --git a/src/etc/etc.sparc/ttys b/src/etc/etc.sparc/ttys deleted file mode 100644 index e3e1d4ce..00000000 --- a/src/etc/etc.sparc/ttys +++ /dev/null @@ -1,92 +0,0 @@ -# -# $OpenBSD: ttys,v 1.10 2013/05/18 23:28:23 miod Exp $ -# -# name getty type status comments -# -# main console device -console "/usr/libexec/getty std.9600" sun on secure -# graphics console -ttyC0 "/usr/libexec/getty std.9600" sun off secure -# on-board serial lines (ttyc-ttyd on 4/3x0 only) -ttya "/usr/libexec/getty std.9600" unknown off secure -ttyb "/usr/libexec/getty std.9600" unknown off secure -ttyc "/usr/libexec/getty std.9600" unknown off secure -ttyd "/usr/libexec/getty std.9600" unknown off secure -# magma0 -ttym0 "/usr/libexec/getty std.9600" unknown off secure -ttym1 "/usr/libexec/getty std.9600" unknown off secure -ttym2 "/usr/libexec/getty std.9600" unknown off secure -ttym3 "/usr/libexec/getty std.9600" unknown off secure -ttym4 "/usr/libexec/getty std.9600" unknown off secure -ttym5 "/usr/libexec/getty std.9600" unknown off secure -ttym6 "/usr/libexec/getty std.9600" unknown off secure -ttym7 "/usr/libexec/getty std.9600" unknown off secure -ttym8 "/usr/libexec/getty std.9600" unknown off secure -ttym9 "/usr/libexec/getty std.9600" unknown off secure -ttyma "/usr/libexec/getty std.9600" unknown off secure -ttymb "/usr/libexec/getty std.9600" unknown off secure -ttymc "/usr/libexec/getty std.9600" unknown off secure -ttymd "/usr/libexec/getty std.9600" unknown off secure -ttyme "/usr/libexec/getty std.9600" unknown off secure -ttymf "/usr/libexec/getty std.9600" unknown off secure -# magma1 -ttyn0 "/usr/libexec/getty std.9600" unknown off secure -ttyn1 "/usr/libexec/getty std.9600" unknown off secure -ttyn2 "/usr/libexec/getty std.9600" unknown off secure -ttyn3 "/usr/libexec/getty std.9600" unknown off secure -ttyn4 "/usr/libexec/getty std.9600" unknown off secure -ttyn5 "/usr/libexec/getty std.9600" unknown off secure -ttyn6 "/usr/libexec/getty std.9600" unknown off secure -ttyn7 "/usr/libexec/getty std.9600" unknown off secure -ttyn8 "/usr/libexec/getty std.9600" unknown off secure -ttyn9 "/usr/libexec/getty std.9600" unknown off secure -ttyna "/usr/libexec/getty std.9600" unknown off secure -ttynb "/usr/libexec/getty std.9600" unknown off secure -ttync "/usr/libexec/getty std.9600" unknown off secure -ttynd "/usr/libexec/getty std.9600" unknown off secure -ttyne "/usr/libexec/getty std.9600" unknown off secure -ttynf "/usr/libexec/getty std.9600" unknown off secure -# magma2 -ttyo0 "/usr/libexec/getty std.9600" unknown off secure -ttyo1 "/usr/libexec/getty std.9600" unknown off secure -ttyo2 "/usr/libexec/getty std.9600" unknown off secure -ttyo3 "/usr/libexec/getty std.9600" unknown off secure -ttyo4 "/usr/libexec/getty std.9600" unknown off secure -ttyo5 "/usr/libexec/getty std.9600" unknown off secure -ttyo6 "/usr/libexec/getty std.9600" unknown off secure -ttyo7 "/usr/libexec/getty std.9600" unknown off secure -ttyo8 "/usr/libexec/getty std.9600" unknown off secure -ttyo9 "/usr/libexec/getty std.9600" unknown off secure -ttyoa "/usr/libexec/getty std.9600" unknown off secure -ttyob "/usr/libexec/getty std.9600" unknown off secure -ttyoc "/usr/libexec/getty std.9600" unknown off secure -ttyod "/usr/libexec/getty std.9600" unknown off secure -ttyoe "/usr/libexec/getty std.9600" unknown off secure -ttyof "/usr/libexec/getty std.9600" unknown off secure -# spif0 -ttyj0 "/usr/libexec/getty std.9600" unknown off secure -ttyj1 "/usr/libexec/getty std.9600" unknown off secure -ttyj2 "/usr/libexec/getty std.9600" unknown off secure -ttyj3 "/usr/libexec/getty std.9600" unknown off secure -ttyj4 "/usr/libexec/getty std.9600" unknown off secure -ttyj5 "/usr/libexec/getty std.9600" unknown off secure -ttyj6 "/usr/libexec/getty std.9600" unknown off secure -ttyj7 "/usr/libexec/getty std.9600" unknown off secure -# spif1 -ttyk0 "/usr/libexec/getty std.9600" unknown off secure -ttyk1 "/usr/libexec/getty std.9600" unknown off secure -ttyk2 "/usr/libexec/getty std.9600" unknown off secure -ttyk3 "/usr/libexec/getty std.9600" unknown off secure -ttyk4 "/usr/libexec/getty std.9600" unknown off secure -ttyk5 "/usr/libexec/getty std.9600" unknown off secure -ttyk6 "/usr/libexec/getty std.9600" unknown off secure -ttyk7 "/usr/libexec/getty std.9600" unknown off secure -# spif2 -ttyl0 "/usr/libexec/getty std.9600" unknown off secure -ttyl1 "/usr/libexec/getty std.9600" unknown off secure -ttyl2 "/usr/libexec/getty std.9600" unknown off secure -ttyl3 "/usr/libexec/getty std.9600" unknown off secure -ttyl4 "/usr/libexec/getty std.9600" unknown off secure -ttyl5 "/usr/libexec/getty std.9600" unknown off secure -ttyl6 "/usr/libexec/getty std.9600" unknown off secure -ttyl7 "/usr/libexec/getty std.9600" unknown off secure diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist index 8ee41f33..7b63aee3 100644 --- a/src/etc/mtree/4.4BSD.dist +++ b/src/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.284 2016/08/31 22:23:13 florian Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.285 2016/09/01 09:54:17 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -463,8 +463,6 @@ usr .. i386 .. - sparc - .. sparc64 .. .. @@ -519,8 +517,6 @@ usr .. socppc .. - sparc - .. sparc64 .. zaurus @@ -577,8 +573,6 @@ usr .. socppc .. - sparc - .. sparc64 .. zaurus