Browse Source

Beagle has been replaced by armv7.

ok rapha@
OPENBSD_5_5
patrick 10 years ago
parent
commit
2a67dd7af6
10 changed files with 13 additions and 536 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +3
    -3
      src/etc/etc.armv7/MAKEDEV.md
  3. +5
    -0
      src/etc/etc.armv7/Makefile
  4. +1
    -1
      src/etc/etc.armv7/Makefile.inc
  5. +1
    -1
      src/etc/etc.armv7/disktab
  6. +0
    -0
      src/etc/etc.armv7/fbtab
  7. +0
    -0
      src/etc/etc.armv7/sysctl.conf
  8. +1
    -1
      src/etc/etc.armv7/ttys
  9. +0
    -523
      src/etc/etc.beagle/MAKEDEV
  10. +0
    -5
      src/etc/etc.beagle/Makefile

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.334 2013/08/09 16:24:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.335 2013/09/04 16:53:38 patrick Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@ -349,7 +349,7 @@ moduli.8192:
bootblocks ${ALL_KERNELS}
SUBDIR+= etc.alpha etc.amd64 etc.armish etc.aviion etc.beagle etc.hp300
SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 etc.aviion etc.hp300
SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k
SUBDIR+= etc.macppc etc.mvme68k etc.mvme88k etc.octeon
SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.vax etc.zaurus


src/etc/etc.beagle/MAKEDEV.md → src/etc/etc.armv7/MAKEDEV.md View File

@ -1,6 +1,6 @@
define(MACHINE,beagle)dnl
define(MACHINE,armv7)dnl
vers(__file__,
{-$OpenBSD: MAKEDEV.md,v 1.6 2013/08/21 15:12:47 ajacoutot Exp $-},
{-$OpenBSD: MAKEDEV.md,v 1.1 2013/09/04 16:53:40 patrick Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@ -100,7 +100,7 @@ ramdisk)
_std(1, 2, 8, 6)
;;
dnl
dnl *** beagle specific targets
dnl *** armv7 specific targets
dnl
target(all, ch, 0)dnl
target(all, vscsi, 0)dnl

+ 5
- 0
src/etc/etc.armv7/Makefile View File

@ -0,0 +1,5 @@
# $OpenBSD: Makefile,v 1.1 2013/09/04 16:53:40 patrick Exp $
all: MAKEDEV
.include <bsd.prog.mk>

src/etc/etc.beagle/Makefile.inc → src/etc/etc.armv7/Makefile.inc View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.3 2013/06/22 10:12:11 florian Exp $
# $OpenBSD: Makefile.inc,v 1.1 2013/09/04 16:53:40 patrick Exp $
bootblocks:

src/etc/etc.beagle/disktab → src/etc/etc.armv7/disktab View File

@ -1,4 +1,4 @@
# $OpenBSD: disktab,v 1.1 2011/10/19 02:24:31 uwe Exp $
# $OpenBSD: disktab,v 1.1 2013/09/04 16:53:40 patrick Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\

src/etc/etc.beagle/fbtab → src/etc/etc.armv7/fbtab View File


src/etc/etc.beagle/sysctl.conf → src/etc/etc.armv7/sysctl.conf View File


src/etc/etc.beagle/ttys → src/etc/etc.armv7/ttys View File

@ -1,5 +1,5 @@
#
# $OpenBSD: ttys,v 1.1 2011/10/19 02:24:31 uwe Exp $
# $OpenBSD: ttys,v 1.1 2013/09/04 16:53:40 patrick Exp $
#
# name getty type status comments
#

+ 0
- 523
src/etc/etc.beagle/MAKEDEV View File

@ -1,523 +0,0 @@
#!/bin/sh -
#
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
# OpenBSD: etc.beagle/MAKEDEV.md,v 1.5 2013/06/03 17:34:15 tedu Exp
# OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp
# OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp
# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
#
# 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
# urio* Diamond Multimedia Rio 500
# 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
# bthub* Bluetooth Hubs
# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# iop* I2O controller devices
# lkm Loadable kernel modules interface
# pci* PCI bus devices
# pf* Packet Filter
# pppx* PPP Multiplexer
# radio* FM tuner devices
# *random In-kernel random data source
# rmidi* Raw MIDI devices
# tun* Network tunnel driver
# uk* Unknown SCSI devices
# systrace* System call tracing device
# tuner* Tuner devices
# video* Video V4L2 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[${#mklist[*]}]=";mknod -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 bpf0 wd0 wd1 sd0 tty00 rd0 wsmouse
R st0 ttyC0 wskbd0 apm bio diskmap
;;
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
;;
vscsi*)
M vscsi$U c 100 $U 600
;;
video*)
M video$U c 38 $U
MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
;;
tuner*)
M tuner$U c 75 $(($(($U*2))+16)) 644
;;
systrace)
M systrace c 50 0 644
;;
uk*)
M uk$U c 28 $U 640 operator
;;
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
;;
pci*)
M pci$U c 88 $U 600
MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
;;
lkm)
M lkm c 35 0 640 _lkm
;;
iop*)
M iop$U c 73 $U 660
;;
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
;;
crypto)
M crypto c 47 0
;;
bthub*)
M bthub$U c 101 $U
;;
bpf*)
M bpf$U c 22 $U 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
;;
urio*)
M urio$U c 67 $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 ulpt0 ulpt1 uhid0 uhid1
R uhid2 uhid3 urio0 usb0 usb1 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 bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
R diskmap vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0
R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
R random lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07
R tty08 tty09 tty0a tty0b apm crypto pf systrace wd0 wd1 wd2
R 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

+ 0
- 5
src/etc/etc.beagle/Makefile View File

@ -1,5 +0,0 @@
# $OpenBSD: Makefile,v 1.1 2011/10/19 02:24:31 uwe Exp $
all: MAKEDEV
.include <bsd.prog.mk>

Loading…
Cancel
Save