From 9ee50544ecc0a1f08b3ea3c3906cfa4c3ccf1687 Mon Sep 17 00:00:00 2001 From: guenther <> Date: Sat, 3 Sep 2016 13:37:41 +0000 Subject: [PATCH] Retire zaurus, as it hasn't made the EABI jump and will be permanently broken shortly when we use the hardware thread register in userland --- src/etc/Makefile | 4 +- src/etc/etc.zaurus/MAKEDEV | 499 -------------------------------- src/etc/etc.zaurus/MAKEDEV.md | 116 -------- src/etc/etc.zaurus/Makefile | 5 - src/etc/etc.zaurus/Makefile.inc | 7 - src/etc/etc.zaurus/disktab | 26 -- src/etc/etc.zaurus/fbtab | 2 - src/etc/etc.zaurus/login.conf | 107 ------- src/etc/etc.zaurus/sysctl.conf | 3 - src/etc/etc.zaurus/ttys | 16 - src/etc/mtree/4.4BSD.dist | 12 +- 11 files changed, 5 insertions(+), 792 deletions(-) delete mode 100644 src/etc/etc.zaurus/MAKEDEV delete mode 100644 src/etc/etc.zaurus/MAKEDEV.md delete mode 100644 src/etc/etc.zaurus/Makefile delete mode 100644 src/etc/etc.zaurus/Makefile.inc delete mode 100644 src/etc/etc.zaurus/disktab delete mode 100644 src/etc/etc.zaurus/fbtab delete mode 100644 src/etc/etc.zaurus/login.conf delete mode 100644 src/etc/etc.zaurus/sysctl.conf delete mode 100644 src/etc/etc.zaurus/ttys diff --git a/src/etc/Makefile b/src/etc/Makefile index 8b38d20b..edd13915 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.429 2016/09/03 11:58:32 pirofti Exp $ +# $OpenBSD: Makefile,v 1.430 2016/09/03 13:37:40 guenther 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.sparc64 etc.zaurus +SUBDIR+= etc.sgi etc.socppc etc.sparc64 .include .include diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV deleted file mode 100644 index 42f3ee03..00000000 --- a/src/etc/etc.zaurus/MAKEDEV +++ /dev/null @@ -1,499 +0,0 @@ -#!/bin/sh - -# -# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. -# generated from: -# -# OpenBSD: etc.zaurus/MAKEDEV.md,v 1.44 2016/09/02 17:06:14 goda Exp -# OpenBSD: MAKEDEV.common,v 1.90 2016/09/02 17:06:13 goda 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 -# ch* SCSI media changers -# rd* "rd" pseudo-disks -# sd* SCSI disks, including flopticals -# vnd* "file" pseudo-disk devices -# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...) -# Tapes: -# st* SCSI tape drives -# Terminal ports: -# tty[0-7][0-9a-f] NS16x50 serial ports -# Pseudo terminals: -# ptm pty master device -# pty* Set of 62 master pseudo terminals -# tty* Set of 62 slave pseudo terminals -# Console ports: -# ttyC-J* wscons display devices -# wscons Minimal wscons devices -# wskbd* wscons keyboards -# wsmouse* wscons mice -# wsmux wscons keyboard/mouse mux devices -# USB devices: -# ttyU* USB serial ports -# uall All USB devices -# ugen* Generic USB devices -# uhid* Generic HID devices -# ulpt* Printer devices -# usb* Bus control devices used by usbd for attach/detach -# Special purpose devices: -# apm Power management device -# audio* Audio devices -# bio ioctl tunnel pseudo-device -# bktr* Video frame grabbers -# bpf Berkeley Packet Filter -# diskmap Disk mapper -# fd fd/* nodes -# fuse Userland Filesystem -# hotplug devices hot plugging -# pf* Packet Filter -# pppx* PPP Multiplexer -# radio* FM tuner devices -# *random In-kernel random data source -# rmidi* Raw MIDI devices -# tun* Network tunnel driver -# tap* Ethernet tunnel driver -# tuner* Tuner devices -# uk* Unknown SCSI devices -# video* Video V4L2 devices -# vscsi* Virtual SCSI controller -# switch* Switch driver -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 wd0 wd1 sd0 tty00 rd0 wsmouse - R st0 ttyC0 wskbd0 apm bio diskmap random - ;; - -std) - M console c 0 0 600 - M tty c 1 0 - M mem c 2 0 640 kmem - M kmem c 2 1 640 kmem - M null c 2 2 - M zero c 2 12 - M stdin c 7 0 - M stdout c 7 1 - M stderr c 7 2 - M ksyms c 8 0 640 kmem - M klog c 6 0 600 - ;; - -switch*) - M switch$U c 105 $U 600 - ;; - -vscsi*) - M vscsi$U c 100 $U 600 - ;; - -video*) - M video$U c 38 $U 600 - MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video" - ;; - -uk*) - M uk$U c 28 $U 640 operator - ;; - -tuner*) - M tuner$U c 75 $(($(($U*2))+16)) 644 - ;; - -tap*) - M tap$U c 104 $U 600 - ;; - -tun*) - M tun$U c 33 $U 600 - ;; - -rmidi*) - M rmidi$U c 57 $U 666 - ;; - -*random) - n=0 - for pre in " " s u a - do - M ${pre}random c 40 $n 644 - n=$(($n+1)) - done - ;; - -radio*) - M radio$U c 97 $U - MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio" - ;; - -pppx*) - M pppx$U c 103 $U 600 - ;; - -pf*) - M pf c 46 0 600 - ;; - -hotplug) - M hotplug c 37 $U 400 - ;; - -fuse) - M fuse$U c 77 $U 600 - ;; - -fd) - RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0 - while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done - MKlist[${#MKlist[*]}]=";chmod 555 fd" - ;; - -diskmap) - M diskmap c 102 0 640 operator - ;; - -bpf) - M bpf c 22 0 600 - M bpf0 c 22 0 600 - ;; - -bktr*) - M bktr$U c 75 $U 644 - ;; - -bio) - M bio c 52 0 600 - ;; - -audio*) - M sound$U c 36 $U - M mixer$U c 36 $(($U+16)) - M audio$U c 36 $(($U+128)) - M audioctl$U c 36 $(($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 34 0 644 - M apmctl c 34 8 644 - ;; - -usb*) - [ "$i" = "usb" ] && u= || u=$U - M usb$u c 64 $U 660 - ;; - -ulpt*) - M ulpt$U c 66 $U 660 - ;; - -uhid*) - M uhid$U c 65 $U 660 - ;; - -ugen*) - n=$(($U*16)) - for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5} - do - M ugen$U.$j c 70 $(($n+10#$j)) 660 - done - ;; - -uall) - R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5 - R ugen6 ugen7 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3 usb0 usb1 - R usb2 usb3 usb4 usb5 usb6 usb7 - ;; - -ttyU[0-9a-zA-Z]) - U=${i#ttyU*} - o=$(alph2d $U) - M ttyU$U c 68 $o 660 dialer uucp - M cuaU$U c 68 $(($o+128)) 660 dialer uucp - ;; - -wsmux|wsmouse|wskbd) - M wsmouse c 63 0 600 - M wskbd c 63 1 600 - ;; - -wsmouse[0-9]*) - M wsmouse$U c 62 $U 600 - ;; - -wskbd[0-9]*) - M wskbd$U c 61 $U 600 - ;; - -wscons) - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 - R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 - R 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 60 $((16#$U+$m)) 600;; - cfg) M tty${n}cfg c 60 $((255+$m)) 600;; - *) echo bad unit $U for $i; exit 1;; - esac - ;; - -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 4 $(($off+$n)) - M pty$nam c 5 $(($off+$n)) - n=$(($n+1)) - done - ;; - -ptm) - M ptm c 98 0 666 - ;; - -tty[0-7][0-9a-f]) - U=${i#tty*} - o=$(h2d $U) - M tty$U c 12 $o 660 dialer uucp - M cua$U c 12 $(($o+128)) 660 dialer uucp - ;; - -st*) - n=$(($U*16)) - for pre in " " n e en - do - M ${pre}st$U b 25 $n 660 operator - M ${pre}rst$U c 25 $n 660 operator - n=$(($n+1)) - done - ;; - -vnd*) - dodisk vnd $U 19 19 $U 0 - ;; - -rd*) - dodisk2 rd $U 18 18 $U 0 - ;; - -ch*) - M ch$U c 27 $U 660 operator - ;; - -cd*) - dodisk2 cd $U 26 26 $U 0 - ;; - -local) - test -s $T.local && sh $T.local - ;; - -all) - R switch0 switch1 switch2 switch3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 - R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 - R tap3 tun0 tun1 tun2 tun3 pty0 bio diskmap vscsi0 ch0 audio0 - R audio1 audio2 bpf fuse pppx hotplug ptm local wscons uall - R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 - R tuner0 radio0 video0 video1 uk0 random tty00 tty01 tty02 - R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf - R wd0 wd1 wd2 wd3 std st0 st1 fd - ;; - -wd*|sd*) - case $i in - wd*) dodisk wd $U 16 16 $U 0;; - sd*) dodisk sd $U 24 24 $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.zaurus/MAKEDEV.md b/src/etc/etc.zaurus/MAKEDEV.md deleted file mode 100644 index 78470387..00000000 --- a/src/etc/etc.zaurus/MAKEDEV.md +++ /dev/null @@ -1,116 +0,0 @@ -define(MACHINE,zaurus)dnl -vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.44 2016/09/02 17:06:14 goda Exp $-}, -etc.MACHINE)dnl -dnl -dnl Copyright (c) 2001-2004 Todd T. Fries -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. The name of the author may not be used to endorse or promote products -dnl derived from this software without specific prior written permission. -dnl -dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -dnl THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -dnl OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl -dnl -__devitem(apm, apm, Power management device)dnl -_TITLE(make) -_DEV(all) -_DEV(ramdisk) -_DEV(std) -_DEV(local) -_TITLE(dis) -_DEV(cd, 26, 26) -_DEV(ch, 27) -_DEV(rd, 18, 18) -_DEV(sd, 24, 24) -_DEV(vnd, 19, 19) -_DEV(wd, 16, 16) -_TITLE(tap) -_DEV(st, 25, 25) -_TITLE(term) -dnl _DEV(com, 12) -dnl _DEV(fcom, 54) -_DEV(com, 12) -_TITLE(pty) -_DEV(ptm, 98) -_DEV(pty, 5) -_DEV(tty, 4) -_TITLE(cons) -_DEV(wsdisp, 60) -_DEV(wscons) -_DEV(wskbd, 61) -_DEV(wsmouse, 62) -_DEV(wsmux, 63) -_TITLE(usb) -_DEV(ttyU, 68) -_DEV(uall) -_DEV(ugen, 70) -_DEV(uhid, 65) -_DEV(ulpt, 66) -_DEV(usb, 64) -_TITLE(spec) -_DEV(apm, 34) -_DEV(au, 36) -_DEV(bio, 52) -_DEV(bktr, 75) -_DEV(bpf, 22) -_DEV(diskmap, 102) -_DEV(fdesc, 7) -_DEV(fuse, 77) -_DEV(hotplug, 37) -_DEV(pf, 46) -_DEV(pppx, 103) -_DEV(radio, 97) -_DEV(rnd, 40) -_DEV(rmidi, 57) -_DEV(tun, 33) -_DEV(tap, 104) -_DEV(tuner, 75) -_DEV(uk, 28) -_DEV(vi, 38) -_DEV(vscsi, 100) -_DEV(switch, 105) -dnl -divert(__mddivert)dnl -dnl -ramdisk) - _recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse - _recurse st0 ttyC0 wskbd0 apm bio diskmap random - ;; - -_std(1, 2, 8, 6) - ;; -dnl -dnl *** zaurus specific targets -dnl -twrget(all, au, audio, 0, 1, 2)dnl -target(all, ch, 0)dnl -target(all, vscsi, 0)dnl -target(all, diskmap)dnl -target(all, bio)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, 5, 6, 7, 8, 9)dnl -target(all, vnd, 0, 1, 2, 3)dnl -target(all, switch, 0, 1, 2, 3)dnl -target(all, ttyC, 0, 1)dnl diff --git a/src/etc/etc.zaurus/Makefile b/src/etc/etc.zaurus/Makefile deleted file mode 100644 index 324bc976..00000000 --- a/src/etc/etc.zaurus/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.zaurus/Makefile.inc b/src/etc/etc.zaurus/Makefile.inc deleted file mode 100644 index 755dea35..00000000 --- a/src/etc/etc.zaurus/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.11 2011/07/22 09:30:54 espie Exp $ - -bootblocks: - cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR} - cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR} - -MDEXT= bsd.rd zboot zbsdmod.o openbsd${OSrev}_arm.ipk Packages diff --git a/src/etc/etc.zaurus/disktab b/src/etc/etc.zaurus/disktab deleted file mode 100644 index a892dfbd..00000000 --- a/src/etc/etc.zaurus/disktab +++ /dev/null @@ -1,26 +0,0 @@ -# $OpenBSD: disktab,v 1.5 2015/08/14 23:45:56 krw Exp $ - -# Leave nc=16; adjust size using: ns -rdroot|ramdiskroot|RAM-disk root FS image:\ - :dt=rdroot:se#512:nc#16:nt#2:ns#256:\ - :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#8192: - - -rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\ - :dt=rdroot:se#512:nc#16:nt#2:ns#160:\ - :oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\ - :ob#0:pb#0:tb=swap:\ - :oc#0:pc#5120: - -# pseudo-geometry taken from rd794 -miniroot:\ - :dt=rdroot:ns#16:nt#7:nc#968:\ - :pa#10240:ba#8192:fa#1024: - -floppy|floppy3|3in|3.5in High Density Floppy:\ - :dt=floppy:se#512:nt#2:ns#18:nc#80:\ - :pa#2880:oa#0:ba#4096:fa#512:\ - :pb#2880:ob#0:\ - :pc#2880:oc#0: - diff --git a/src/etc/etc.zaurus/fbtab b/src/etc/etc.zaurus/fbtab deleted file mode 100644 index d898c1cb..00000000 --- a/src/etc/etc.zaurus/fbtab +++ /dev/null @@ -1,2 +0,0 @@ -/dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg diff --git a/src/etc/etc.zaurus/login.conf b/src/etc/etc.zaurus/login.conf deleted file mode 100644 index 0f98caeb..00000000 --- a/src/etc/etc.zaurus/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.zaurus/sysctl.conf b/src/etc/etc.zaurus/sysctl.conf deleted file mode 100644 index c311d345..00000000 --- a/src/etc/etc.zaurus/sysctl.conf +++ /dev/null @@ -1,3 +0,0 @@ -#machdep.maxspeed=520 # set change maximum processor speed -#machdep.lidsuspend=0 # do not suspend laptop upon lid closing -#hw.setperf=0 # 0=slowest speed, 100=fastest speed diff --git a/src/etc/etc.zaurus/ttys b/src/etc/etc.zaurus/ttys deleted file mode 100644 index d06bc202..00000000 --- a/src/etc/etc.zaurus/ttys +++ /dev/null @@ -1,16 +0,0 @@ -# -# $OpenBSD: ttys,v 1.4 2008/01/09 17:39:42 miod Exp $ -# -# name getty type status comments -# -console "/usr/libexec/getty std.9600" vt220 off secure -ttyC0 "/usr/libexec/getty std.9600" vt220 on secure -ttyC1 "/usr/libexec/getty std.9600" vt220 off secure -tty00 "/usr/libexec/getty std.9600" unknown off secure -tty01 "/usr/libexec/getty std.9600" unknown off secure -tty02 "/usr/libexec/getty std.9600" unknown off -tty03 "/usr/libexec/getty std.9600" unknown off -tty04 "/usr/libexec/getty std.9600" unknown off -tty05 "/usr/libexec/getty std.9600" unknown off -tty06 "/usr/libexec/getty std.9600" unknown off -tty07 "/usr/libexec/getty std.9600" unknown off diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist index 7b63aee3..cb0cc132 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.285 2016/09/01 09:54:17 deraadt Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.286 2016/09/03 13:37:41 guenther Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -473,9 +473,9 @@ usr .. amd64 .. - i386 + armv7 .. - zaurus + i386 .. .. @@ -519,8 +519,6 @@ usr .. sparc64 .. - zaurus - .. .. # ./usr/share/man/man5 @@ -537,8 +535,6 @@ usr .. socppc .. - zaurus - .. .. # ./usr/share/man/man6 @@ -575,8 +571,6 @@ usr .. sparc64 .. - zaurus - .. .. # ./usr/share/man/man9