diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-06-07 14:39:58 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-06-07 14:39:58 +0000 |
| commit | 1c258cbf5b65adaba3ea3afff84dc443c8f2a19c (patch) | |
| tree | 69e45d9015cddf61e99b7b51dff108a37f3e9747 /distrib/sparc64 | |
| parent | c3660e2042eca935478e0c9490a82c2f413e37bb (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/sparc64')
| -rw-r--r-- | distrib/sparc64/miniroot/list | 46 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/list | 12 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/list | 12 |
3 files changed, 36 insertions, 34 deletions
diff --git a/distrib/sparc64/miniroot/list b/distrib/sparc64/miniroot/list index 7e7442b8e84..1659abcc4bb 100644 --- a/distrib/sparc64/miniroot/list +++ b/distrib/sparc64/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.5 2019/05/13 23:18:22 naddy Exp $ +# $OpenBSD: list,v 1.6 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 @@ -59,9 +57,27 @@ LINK instbin usr/bin/sed LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot -LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/installboot +LINK instbin usr/sbin/pwd_mkdb +ARGVLINK ksh -sh +SPECIAL rm bin/md5 + +COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06 +COPY ${DESTDIR}/etc/firmware/bnx-b09 etc/firmware/bnx-b09 +COPY ${DESTDIR}/etc/firmware/bnx-rv2p etc/firmware/bnx-rv2p +COPY ${DESTDIR}/etc/firmware/bnx-xi-rv2p etc/firmware/bnx-xi-rv2p +COPY ${DESTDIR}/etc/firmware/bnx-xi90-rv2p etc/firmware/bnx-xi90-rv2p + +COPY ${DESTDIR}/etc/firmware/ral-rt2561 etc/firmware/ral-rt2561 +COPY ${DESTDIR}/etc/firmware/ral-rt2561s etc/firmware/ral-rt2561s +COPY ${DESTDIR}/etc/firmware/ral-rt2661 etc/firmware/ral-rt2661 +COPY ${DESTDIR}/etc/firmware/ral-rt2860 etc/firmware/ral-rt2860 +COPY ${DESTDIR}/etc/firmware/ral-rt3290 etc/firmware/ral-rt3290 +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 +# copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk @@ -72,33 +88,19 @@ 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,sun 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,sun usr/share/misc/termcap -# and the installation scripts +# and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/../common/install.md install.md SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub +SCRIPT ${CURDIR}/../common/install.md install.md SPECIAL chmod 755 install.sub SYMLINK install.sub autoinstall SYMLINK install.sub install SYMLINK install.sub upgrade -COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06 -COPY ${DESTDIR}/etc/firmware/bnx-b09 etc/firmware/bnx-b09 -COPY ${DESTDIR}/etc/firmware/bnx-rv2p etc/firmware/bnx-rv2p -COPY ${DESTDIR}/etc/firmware/bnx-xi-rv2p etc/firmware/bnx-xi-rv2p -COPY ${DESTDIR}/etc/firmware/bnx-xi90-rv2p etc/firmware/bnx-xi90-rv2p - -COPY ${DESTDIR}/etc/firmware/ral-rt2561 etc/firmware/ral-rt2561 -COPY ${DESTDIR}/etc/firmware/ral-rt2561s etc/firmware/ral-rt2561s -COPY ${DESTDIR}/etc/firmware/ral-rt2661 etc/firmware/ral-rt2661 -COPY ${DESTDIR}/etc/firmware/ral-rt2860 etc/firmware/ral-rt2860 -COPY ${DESTDIR}/etc/firmware/ral-rt3290 etc/firmware/ral-rt3290 -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 - TZ diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index 70ad9d31db2..2baeaaadfab 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,10 +1,9 @@ -# $OpenBSD: list,v 1.63 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.64 2019/06/07 14:39:57 deraadt Exp $ SRCDIRS distrib/special # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin -#LINK instbin sbin/mount_cd9660 LINK instbin bin/arch LINK instbin bin/cat LINK instbin bin/chmod bin/chgrp sbin/chown @@ -15,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 @@ -54,9 +51,12 @@ LINK instbin usr/bin/sed LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot -LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/installboot +LINK instbin usr/sbin/pwd_mkdb +ARGVLINK ksh -sh +SPECIAL rm bin/md5 +# copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk @@ -75,8 +75,8 @@ SYMLINK /tmp/i/hosts etc/hosts # and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/../common/install.md install.md SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub +SCRIPT ${CURDIR}/../common/install.md install.md SPECIAL chmod 755 install.sub SYMLINK install.sub autoinstall SYMLINK install.sub install diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index fee7ec28b2d..3d9affc6c92 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,10 +1,9 @@ -# $OpenBSD: list,v 1.53 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.54 2019/06/07 14:39:57 deraadt Exp $ SRCDIRS distrib/special # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin -#LINK instbin sbin/mount_cd9660 LINK instbin bin/arch LINK instbin bin/cat LINK instbin bin/chmod bin/chgrp sbin/chown @@ -15,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 @@ -53,9 +50,12 @@ LINK instbin usr/bin/sed LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot -LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/installboot +LINK instbin usr/sbin/pwd_mkdb +ARGVLINK ksh -sh +SPECIAL rm bin/md5 +# copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk @@ -74,8 +74,8 @@ SYMLINK /tmp/i/hosts etc/hosts # and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/../common/install.md install.md SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub +SCRIPT ${CURDIR}/../common/install.md install.md SPECIAL chmod 755 install.sub SYMLINK install.sub autoinstall SYMLINK install.sub install |