summaryrefslogtreecommitdiff
path: root/distrib/macppc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-06-07 14:39:58 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-06-07 14:39:58 +0000
commit1c258cbf5b65adaba3ea3afff84dc443c8f2a19c (patch)
tree69e45d9015cddf61e99b7b51dff108a37f3e9747 /distrib/macppc
parentc3660e2042eca935478e0c9490a82c2f413e37bb (diff)
eliminate differences between all the list files as much as
possible, and remove the failed previous attempts at sharing in ./miniroot and ./ramdisk. maybe now that differences are eliminated we can start a new sharing effort? i dunno..
Diffstat (limited to 'distrib/macppc')
-rw-r--r--distrib/macppc/ramdisk/list33
1 files changed, 17 insertions, 16 deletions
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index f00365a48be..72e7c40cb47 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.71 2019/05/13 23:18:22 naddy Exp $
+# $OpenBSD: list,v 1.72 2019/06/07 14:39:57 deraadt Exp $
SRCDIRS distrib/special
@@ -14,11 +14,9 @@ LINK instbin bin/df
LINK instbin bin/ed
LINK instbin bin/hostname
LINK instbin bin/ksh bin/sh
-ARGVLINK ksh -sh
LINK instbin bin/ln
LINK instbin bin/ls
LINK instbin bin/md5 bin/sha256 bin/sha512
-SPECIAL rm bin/md5
LINK instbin bin/mkdir
LINK instbin bin/mt bin/eject
LINK instbin bin/mv
@@ -63,18 +61,28 @@ LINK instbin usr/bin/signify
LINK instbin usr/bin/tee
LINK instbin usr/sbin/chroot
LINK instbin usr/sbin/pwd_mkdb
+ARGVLINK ksh -sh
+SPECIAL rm bin/md5
SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem
LINK instbin usr/bin/ftp-ssl usr/bin/ftp
SPECIAL rm usr/bin/ftp-ssl
-# copy the MAKEDEV script and make some devices
-SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk
+# firmware we might need
+#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1
+#COPY ${DESTDIR}/etc/firmware/tigon2 etc/firmware/tigon2
+COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue
+COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573
+COPY ${DESTDIR}/etc/firmware/run-rt2870 etc/firmware/run-rt2870
+COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071
# for fdisk(8)
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+# 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 ${CURDIR}/../../miniroot/group etc/group
COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd
@@ -82,23 +90,16 @@ SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
COPY ${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub etc/signify/openbsd-${OSrev}-base.pub
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
+TERMCAP vt100,vt220,dumb usr/share/misc/termcap
+
SYMLINK /tmp/i/fstab.shadow etc/fstab
SYMLINK /tmp/i/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/i/hosts etc/hosts
-TERMCAP vt100,vt220,dumb usr/share/misc/termcap
-
-# firmware we might need
-#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1
-#COPY ${DESTDIR}/etc/firmware/tigon2 etc/firmware/tigon2
-COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue
-COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573
-COPY ${DESTDIR}/etc/firmware/run-rt2870 etc/firmware/run-rt2870
-COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
-SCRIPT ${CURDIR}/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
+SCRIPT ${CURDIR}/install.md install.md
SPECIAL chmod 755 install.sub
SYMLINK install.sub autoinstall
SYMLINK install.sub install