System build pieces for armish arch.

7 files changed, 344 insertions, 0 deletions

diff --git a/distrib/armish/Makefile b/distrib/armish/Makefile
new file mode 100644
index 00000000000..301e8af6524
--- /dev/null
+++ b/distrib/armish/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile,v 1.1 2006/06/06 00:01:49 drahn Exp $
+
+SUBDIR= ramdisk
+
+.include <bsd.subdir.mk>
diff --git a/distrib/armish/ramdisk/Makefile b/distrib/armish/ramdisk/Makefile
new file mode 100644
index 00000000000..670250626aa
--- /dev/null
+++ b/distrib/armish/ramdisk/Makefile
@@ -0,0 +1,106 @@
+#	$OpenBSD: Makefile,v 1.1 2006/06/06 00:01:49 drahn Exp $
+
+REV=	${OSrev}
+
+TOP=		${.CURDIR}/..
+
+BSD_RD=		bsd.rd
+IMAGE=		mr.fs
+CBIN?=		instbin
+CRUNCHCONF?=	${CBIN}.conf
+CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
+LISTS=		${.CURDIR}/list
+UTILS?=		${.CURDIR}/../../miniroot
+
+MOUNT_POINT=	/mnt
+MTREE=		${UTILS}/mtree.conf
+
+VND?=		svnd0
+VND_DEV=	/dev/${VND}a
+VND_RDEV=	/dev/r${VND}a
+VND_CRDEV=	/dev/r${VND}c
+PID!=		echo $$$$
+
+
+DISKTYPE=       rdroot2.5M
+#NBLKS=		8192
+NBLKS=		5120
+# minfree, opt, b/i  trks, sects, cpg
+NEWFSARGS= -m 0 -o space -c 16 -i 4096
+
+.ifndef DESTDIR
+all ${IMAGE}:
+	@echo setenv DESTDIR before making a ramdisk!
+	@false
+.else
+
+# mix config is not needed.
+all:	${BSD_RD}
+
+${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
+	cp bsd ${BSD_RD}
+	${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
+
+${IMAGE}: rd_setup do_files rd_teardown
+
+.endif
+
+bsd:
+	cd ${TOP}/../../sys/arch/armish/conf && config RAMDISK
+	cd ${TOP}/../../sys/arch/armish/compile/RAMDISK && \
+	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
+	cp ${TOP}/../../sys/arch/armish/compile/RAMDISK/bsd bsd
+
+rd_setup:
+	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
+	vnconfig -v -c ${VND} ${IMAGE}
+	disklabel -w -r ${VND} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${VND_RDEV}
+	fsck ${VND_RDEV}
+	mount ${VND_DEV} ${MOUNT_POINT}
+
+rd_teardown:
+	@df -i ${MOUNT_POINT}
+	-umount ${MOUNT_POINT}
+	-vnconfig -u ${VND}
+
+rdsetroot:	${TOP}/../common/elfrdsetroot.c
+	${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/../common/elfrdsetroot.c
+
+unconfig:
+	-umount -f ${MOUNT_POINT}
+	-vnconfig -u ${VND}
+
+.PRECIOUS:	${IMAGE}
+
+install:
+	cp ${BSD_RD} ${DESTDIR}/snapshot/
+
+${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
+	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
+
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+	${MAKE} -f ${CBIN}.mk all
+
+${CRUNCHCONF}: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+
+do_files:
+	cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${TOP}/../miniroot/runlist.sh ${LISTS}
+	rm ${MOUNT_POINT}/${CBIN}
+
+clean cleandir:
+	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
+	*.o *.lo *.c bsd ${BSD_RD} \
+	rdsetroot
+	rm -f instbin.conf
+	rm -rf cd-dir
+
+beforeinstall:
+	cp ${BSD.RD} ${DESTDIR}/snapshot
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff --git a/distrib/armish/ramdisk/Makefile.inc b/distrib/armish/ramdisk/Makefile.inc
new file mode 100644
index 00000000000..784ace462e3
--- /dev/null
+++ b/distrib/armish/ramdisk/Makefile.inc
@@ -0,0 +1,4 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2006/06/06 00:01:49 drahn Exp $
+
+CRUNCHGENOPTS= -E
+
diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md
new file mode 100644
index 00000000000..114c14d92e6
--- /dev/null
+++ b/distrib/armish/ramdisk/install.md
@@ -0,0 +1,125 @@
+#	$OpenBSD: install.md,v 1.1 2006/06/06 00:01:49 drahn Exp $
+#
+#
+# Copyright (c) 1996 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jason R. Thorpe.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+#
+# machine dependent section of installation/upgrade script.
+#
+
+MDFSTYPE=msdos
+ARCH=ARCH
+
+md_installboot() {
+}
+
+# $1 is the disk to check
+md_checkfordisklabel() {
+	local rval=0
+
+	disklabel -r $1 >/dev/null 2>/tmp/checkfordisklabel
+
+	if grep "disk label corrupted" /tmp/checkfordisklabel; then
+		rval=2
+	fi >/dev/null 2>&1
+
+	rm -f /tmp/checkfordisklabel
+	return $rval
+}
+
+md_prep_fdisk() {
+	local _disk=$1
+
+	ask_yn "Do you want to use *all* of $_disk for OpenBSD?"
+	if [[ $resp == y ]]; then
+		echo -n "Putting all of $_disk into an active OpenBSD MBR partition (type 'A6')..."
+		fdisk -e ${_disk} <<__EOT >/dev/null
+reinit
+update
+write
+quit
+__EOT
+		echo "done."
+		return
+	fi
+
+	# Manually configure the MBR.
+	cat <<__EOT
+
+You will now create a single MBR partition to contain your OpenBSD data. This
+partition must have an id of 'A6'; must *NOT* overlap other partitions; and
+must be marked as the only active partition.
+
+The 'manual' command describes all the fdisk commands in detail.
+
+$(fdisk ${_disk})
+__EOT
+	fdisk -e ${_disk}
+
+	cat <<__EOT
+Here is the partition information you chose:
+
+$(fdisk ${_disk})
+__EOT
+}
+
+md_prep_disklabel() {
+	local _disk=$1
+
+	md_prep_fdisk $_disk
+
+	cat <<__EOT
+
+You will now create an OpenBSD disklabel inside the OpenBSD MBR
+partition. The disklabel defines how OpenBSD splits up the MBR partition
+into OpenBSD partitions in which filesystems and swap space are created.
+
+The offsets used in the disklabel are ABSOLUTE, i.e. relative to the
+start of the disk, NOT the start of the OpenBSD MBR partition.
+
+__EOT
+
+	md_checkfordisklabel $_disk
+	case $? in
+	2)	echo "WARNING: Label on disk $_disk is corrupted. You will be repairing it.\n"
+		;;
+	esac
+
+	disklabel -W $_disk >/dev/null 2>&1
+	disklabel -f /tmp/fstab.$_disk -E $_disk
+}
+
+md_congrats() {
+}
diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list
new file mode 100644
index 00000000000..05743208d55
--- /dev/null
+++ b/distrib/armish/ramdisk/list
@@ -0,0 +1,83 @@
+#	$OpenBSD: list,v 1.1 2006/06/06 00:01:49 drahn Exp $
+
+SRCDIRS distrib/special
+SRCDIRS usr.bin bin sbin usr.sbin
+
+# copy the crunched binary, link to it, and kill it
+COPY	${OBJDIR}/instbin			instbin
+LINK	instbin					bin/cat
+LINK	instbin					bin/chmod bin/chgrp sbin/chown
+LINK	instbin					bin/cp
+LINK	instbin					bin/dd
+LINK	instbin					bin/df
+LINK	instbin					bin/ed
+LINK	instbin					bin/expr
+LINK	instbin					bin/hostname
+LINK	instbin					bin/ksh bin/sh
+ARGVLINK ksh					-sh
+LINK	instbin					bin/ln
+LINK	instbin					bin/ls
+LINK	instbin					bin/mkdir
+LINK	instbin					bin/mt bin/eject
+LINK	instbin					bin/mv
+LINK	instbin					bin/pax bin/tar bin/cpio
+LINK	instbin					bin/rm
+LINK	instbin					bin/stty
+LINK	instbin					bin/sync
+LINK	instbin					sbin/dhclient
+LINK	instbin					sbin/disklabel
+LINK	instbin					sbin/dmesg
+LINK	instbin					sbin/fdisk
+LINK	instbin					sbin/fsck
+LINK	instbin					sbin/fsck_ext2fs
+LINK	instbin					sbin/fsck_ffs
+LINK	instbin					sbin/ifconfig
+LINK	instbin					sbin/init
+LINK	instbin					sbin/mknod
+LINK	instbin					sbin/mount
+LINK	instbin					sbin/mount_cd9660
+LINK	instbin					sbin/mount_ext2fs
+LINK	instbin					sbin/mount_ffs
+LINK	instbin					sbin/mount_msdos
+LINK	instbin					sbin/mount_nfs
+LINK	instbin					sbin/newfs
+LINK	instbin					sbin/newfs_msdos
+LINK	instbin					sbin/ping
+LINK	instbin					sbin/ping6
+LINK	instbin					sbin/reboot sbin/halt
+LINK	instbin					sbin/route
+LINK	instbin					sbin/rtsol
+LINK	instbin					sbin/umount
+#LINK	instbin					sbin/wicontrol
+LINK	instbin					usr/bin/ftp
+LINK	instbin					usr/bin/grep usr/bin/fgrep usr/bin/egrep
+LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/sed
+LINK	instbin					bin/sleep
+
+# copy the MAKEDEV script and make some devices
+SCRIPT	${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
+SPECIAL	cd dev; sh MAKEDEV ramdisk
+
+# various files that we need in /etc for the install
+COPY	${DESTDIR}/etc/group			etc/group
+COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
+COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
+COPY	${CURDIR}/../../miniroot/services	etc/services
+SYMLINK	/tmp/disktab.shadow			etc/disktab
+SYMLINK	/tmp/fstab.shadow			etc/fstab
+SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
+SYMLINK	/tmp/hosts				etc/hosts
+TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
+
+# dhcp things
+SCRIPT    ${DESTDIR}/sbin/dhclient-script	sbin/dhclient-script
+
+# and the installation tools
+SCRIPT	${CURDIR}/../../miniroot/dot.profile	.profile
+SCRIPT	${CURDIR}/install.md			install.md
+SCRIPT	${CURDIR}/../../miniroot/upgrade.sh	upgrade
+SCRIPT	${CURDIR}/../../miniroot/install.sh	install
+SCRIPT	${CURDIR}/../../miniroot/install.sub	install.sub
+SPECIAL	chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 423002d2ce8..381b3dbe47d 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1830,6 +1830,8 @@
 ./usr/share/man/cat2/amd64/amd64_set_ioperm.0
 ./usr/share/man/cat2/amd64/amd64_set_ldt.0
 ./usr/share/man/cat2/amd64/amd64_set_mtrr.0
+./usr/share/man/cat2/armish/arm_drain_writebuf.0
+./usr/share/man/cat2/armish/arm_sync_icache.0
 ./usr/share/man/cat2/bind.0
 ./usr/share/man/cat2/brk.0
 ./usr/share/man/cat2/cats/arm_drain_writebuf.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 1a7b323f203..7e14723690b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -150,6 +150,7 @@
 ./usr/share/man/cat1/apply.0
 ./usr/share/man/cat1/apropos.0
 ./usr/share/man/cat1/arch.0
+./usr/share/man/cat1/armish
 ./usr/share/man/cat1/at.0
 ./usr/share/man/cat1/atq.0
 ./usr/share/man/cat1/atrm.0
@@ -690,12 +691,14 @@
 ./usr/share/man/cat2
 ./usr/share/man/cat2/alpha
 ./usr/share/man/cat2/amd64
+./usr/share/man/cat2/armish
 ./usr/share/man/cat2/cats
 ./usr/share/man/cat2/i386
 ./usr/share/man/cat2/zaurus
 ./usr/share/man/cat3
 ./usr/share/man/cat3/alpha
 ./usr/share/man/cat3/amd64
+./usr/share/man/cat3/armish
 ./usr/share/man/cat3/aviion
 ./usr/share/man/cat3/cats
 ./usr/share/man/cat3/hp300
@@ -1137,6 +1140,7 @@
 ./usr/share/man/cat4/aps.0
 ./usr/share/man/cat4/arandom.0
 ./usr/share/man/cat4/aria.0
+./usr/share/man/cat4/armish
 ./usr/share/man/cat4/arp.0
 ./usr/share/man/cat4/art.0
 ./usr/share/man/cat4/asbtm.0
@@ -1843,6 +1847,7 @@
 ./usr/share/man/cat5/alpha
 ./usr/share/man/cat5/amd64
 ./usr/share/man/cat5/ar.0
+./usr/share/man/cat5/armish
 ./usr/share/man/cat5/aviion
 ./usr/share/man/cat5/bgpd.conf.0
 ./usr/share/man/cat5/bootparams.0
@@ -2055,6 +2060,9 @@
 ./usr/share/man/cat8/amq.0
 ./usr/share/man/cat8/apachectl.0
 ./usr/share/man/cat8/apxs.0
+./usr/share/man/cat8/armish
+./usr/share/man/cat8/armish/MAKEDEV.0
+./usr/share/man/cat8/armish/hotplugd.0
 ./usr/share/man/cat8/arp.0
 ./usr/share/man/cat8/atactl.0
 ./usr/share/man/cat8/authpf.0
@@ -2523,6 +2531,7 @@
 ./usr/share/man/cat9
 ./usr/share/man/cat9/alpha
 ./usr/share/man/cat9/amd64
+./usr/share/man/cat9/armish
 ./usr/share/man/cat9/aviion
 ./usr/share/man/cat9/cats
 ./usr/share/man/cat9/hp300
@@ -2548,6 +2557,7 @@
 ./usr/share/man/man1
 ./usr/share/man/man1/alpha
 ./usr/share/man/man1/amd64
+./usr/share/man/man1/armish
 ./usr/share/man/man1/aviion
 ./usr/share/man/man1/cats
 ./usr/share/man/man1/hp300
@@ -2571,6 +2581,7 @@
 ./usr/share/man/man4
 ./usr/share/man/man4/alpha
 ./usr/share/man/man4/amd64
+./usr/share/man/man4/armish
 ./usr/share/man/man4/aviion
 ./usr/share/man/man4/cats
 ./usr/share/man/man4/hp300
@@ -2594,6 +2605,7 @@
 ./usr/share/man/man8
 ./usr/share/man/man8/alpha
 ./usr/share/man/man8/amd64
+./usr/share/man/man8/armish
 ./usr/share/man/man8/aviion
 ./usr/share/man/man8/cats
 ./usr/share/man/man8/hp300
@@ -2615,6 +2627,7 @@
 ./usr/share/man/ps1
 ./usr/share/man/ps1/alpha
 ./usr/share/man/ps1/amd64
+./usr/share/man/ps1/armish
 ./usr/share/man/ps1/aviion
 ./usr/share/man/ps1/cats
 ./usr/share/man/ps1/hp300
@@ -2635,6 +2648,7 @@
 ./usr/share/man/ps2
 ./usr/share/man/ps2/alpha
 ./usr/share/man/ps2/amd64
+./usr/share/man/ps2/armish
 ./usr/share/man/ps2/aviion
 ./usr/share/man/ps2/cats
 ./usr/share/man/ps2/i386
@@ -2642,6 +2656,7 @@
 ./usr/share/man/ps3
 ./usr/share/man/ps3/alpha
 ./usr/share/man/ps3/amd64
+./usr/share/man/ps3/armish
 ./usr/share/man/ps3/aviion
 ./usr/share/man/ps3/cats
 ./usr/share/man/ps3/hp300
@@ -2663,6 +2678,7 @@
 ./usr/share/man/ps4
 ./usr/share/man/ps4/alpha
 ./usr/share/man/ps4/amd64
+./usr/share/man/ps4/armish
 ./usr/share/man/ps4/aviion
 ./usr/share/man/ps4/cats
 ./usr/share/man/ps4/hp300
@@ -2683,6 +2699,7 @@
 ./usr/share/man/ps5
 ./usr/share/man/ps5/alpha
 ./usr/share/man/ps5/amd64
+./usr/share/man/ps5/armish
 ./usr/share/man/ps5/aviion
 ./usr/share/man/ps5/cats
 ./usr/share/man/ps5/hp300
@@ -2705,6 +2722,7 @@
 ./usr/share/man/ps8
 ./usr/share/man/ps8/alpha
 ./usr/share/man/ps8/amd64
+./usr/share/man/ps8/armish
 ./usr/share/man/ps8/aviion
 ./usr/share/man/ps8/cats
 ./usr/share/man/ps8/hp300
@@ -2725,6 +2743,7 @@
 ./usr/share/man/ps9
 ./usr/share/man/ps9/alpha
 ./usr/share/man/ps9/amd64
+./usr/share/man/ps9/armish
 ./usr/share/man/ps9/aviion
 ./usr/share/man/ps9/cats
 ./usr/share/man/ps9/hp300