diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-06-07 14:39:54 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-06-07 14:39:54 +0000 |
| commit | b2c5e89128f704fe66b98fa4377ed2230842ee4d (patch) | |
| tree | 3a59dd8f644f42ea1f523930f8a3d320c9d328d9 /distrib | |
| parent | Add -lz to the library list, since one architecture (armv7) needs it and (diff) | |
| download | wireguard-openbsd-b2c5e89128f704fe66b98fa4377ed2230842ee4d.tar.xz wireguard-openbsd-b2c5e89128f704fe66b98fa4377ed2230842ee4d.zip | |
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')
26 files changed, 491 insertions, 404 deletions
diff --git a/distrib/alpha/miniroot/list b/distrib/alpha/miniroot/list index b660bde0aab..0f4728cd920 100644 --- a/distrib/alpha/miniroot/list +++ b/distrib/alpha/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.3 2019/06/07 14:39:54 deraadt Exp $ SRCDIRS distrib/special @@ -14,30 +14,35 @@ 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 LINK instbin bin/pax bin/tar LINK instbin bin/rm LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync +LINK instbin sbin/bioctl +LINK instbin sbin/dhclient LINK instbin sbin/disklabel LINK instbin sbin/dmesg LINK instbin sbin/fsck LINK instbin sbin/fsck_ffs +LINK instbin sbin/growfs 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_ffs LINK instbin sbin/newfs +LINK instbin sbin/ping sbin/ping6 LINK instbin sbin/reboot sbin/halt LINK instbin sbin/route +LINK instbin sbin/slaacd LINK instbin sbin/sysctl LINK instbin sbin/umount LINK instbin usr/bin/doas @@ -51,6 +56,14 @@ 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 + +# 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/3c990 etc/firmware/3c990 # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV @@ -65,7 +78,9 @@ 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 # and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile @@ -75,17 +90,5 @@ SPECIAL chmod 755 install.sub SYMLINK install.sub autoinstall SYMLINK install.sub install SYMLINK install.sub upgrade -LINK instbin sbin/growfs -LINK instbin sbin/mount_cd9660 -LINK instbin sbin/dhclient -LINK instbin bin/mt bin/eject -LINK instbin sbin/bioctl -LINK instbin sbin/slaacd - -# 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/3c990 etc/firmware/3c990 TZ diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index fd0de7b0b2d..e7a6bb23bee 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2019/06/07 14:39:56 deraadt Exp $ FS= floppy${OSrev}.fs FSSIZE= 2880 @@ -7,7 +7,7 @@ MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf RAMDISK= RAMDISK -LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local +LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot EFIBOOT= ${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI diff --git a/distrib/amd64/common/list b/distrib/amd64/ramdiskA/list index b7830fac50a..b8dac707cfc 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/ramdiskA/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.47 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.1 2019/06/07 14:39:56 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 @@ -48,6 +46,7 @@ LINK instbin sbin/sysctl LINK instbin sbin/umount LINK instbin usr/bin/doas LINK instbin usr/bin/encrypt +LINK instbin usr/bin/ftp LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/more usr/bin/less @@ -55,16 +54,18 @@ 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 + +# 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 -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # various files that we need in /etc for the install COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -80,9 +81,11 @@ 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 SYMLINK install.sub upgrade + +#TZ # this does not fit on the floppy diff --git a/distrib/amd64/ramdiskA/list.local b/distrib/amd64/ramdiskA/list.local deleted file mode 100644 index 9d3efd2fdab..00000000000 --- a/distrib/amd64/ramdiskA/list.local +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: list.local,v 1.5 2016/12/30 22:32:25 deraadt Exp $ - -LINK instbin usr/bin/ftp - -#TZ # this does not fit on the floppy diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index 10c989576c2..aad730de7f5 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2019/06/07 14:39:56 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 9600 @@ -8,7 +8,7 @@ MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf RAMDISK= RAMDISK_CD -LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local +LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot EFIBOOT= ${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI diff --git a/distrib/amd64/ramdisk_cd/list b/distrib/amd64/ramdisk_cd/list new file mode 100644 index 00000000000..11dad21b9a6 --- /dev/null +++ b/distrib/amd64/ramdisk_cd/list @@ -0,0 +1,123 @@ +# $OpenBSD: list,v 1.1 2019/06/07 14:39:56 deraadt Exp $ + +SRCDIRS distrib/special + +# copy the crunched binary, link to it, and kill it +COPY ${OBJDIR}/instbin instbin +LINK instbin bin/arch +LINK instbin bin/cat +LINK instbin bin/chmod bin/chgrp sbin/chown +LINK instbin bin/cp +LINK instbin bin/date +LINK instbin bin/dd +LINK instbin bin/df +LINK instbin bin/ed +LINK instbin bin/hostname +LINK instbin bin/ksh bin/sh +LINK instbin bin/ln +LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 +LINK instbin bin/mkdir +LINK instbin bin/mt bin/eject +LINK instbin bin/mv +LINK instbin bin/pax bin/tar +LINK instbin bin/rm +LINK instbin bin/sleep +LINK instbin bin/stty +LINK instbin bin/sync +LINK instbin sbin/bioctl +LINK instbin sbin/dhclient +LINK instbin sbin/disklabel +LINK instbin sbin/dmesg +LINK instbin sbin/fdisk +LINK instbin sbin/fsck +LINK instbin sbin/fsck_ffs +LINK instbin sbin/fsck_msdos +LINK instbin sbin/growfs +LINK instbin sbin/ifconfig +LINK instbin sbin/init +LINK instbin sbin/kbd +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_udf +LINK instbin sbin/newfs +LINK instbin sbin/newfs_msdos +LINK instbin sbin/ping sbin/ping6 +LINK instbin sbin/reboot sbin/halt +LINK instbin sbin/restore +LINK instbin sbin/route +LINK instbin sbin/slaacd +LINK instbin sbin/sysctl +LINK instbin sbin/umount +LINK instbin usr/bin/doas +LINK instbin usr/bin/encrypt +LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep +LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +LINK instbin usr/bin/more usr/bin/less +LINK instbin usr/bin/sed +LINK instbin usr/bin/signify +LINK instbin usr/bin/tee +LINK instbin usr/sbin/chroot +LINK instbin usr/sbin/installboot +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 ${DESTDIR}/etc/firmware/kue etc/firmware/kue + +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 ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211 +COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b + +# 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 +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 + +# and the installation tools +SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile +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 + +TZ diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local deleted file mode 100644 index 95983de3337..00000000000 --- a/distrib/amd64/ramdisk_cd/list.local +++ /dev/null @@ -1,39 +0,0 @@ -# $OpenBSD: list.local,v 1.32 2018/10/07 01:16:40 jsg Exp $ - -# add local links; use bin/sh since instbin has already been unlinked -LINK instbin sbin/dhclient -LINK instbin sbin/bioctl - -LINK instbin sbin/mount_ext2fs -LINK instbin sbin/mount_msdos -LINK instbin sbin/mount_udf -LINK instbin sbin/newfs_msdos -LINK instbin sbin/fsck_msdos -LINK instbin sbin/growfs -LINK instbin sbin/slaacd - -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 ${DESTDIR}/etc/firmware/kue etc/firmware/kue - -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 ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211 -COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b - -TZ diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list index 8f9617ac618..f41c13ffa4f 100644 --- a/distrib/arm64/ramdisk/list +++ b/distrib/arm64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.10 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.11 2019/06/07 14:39:56 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 @@ -64,6 +62,8 @@ 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 @@ -91,8 +91,15 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int -# this is the list from distrib/miniroot/makeconf.awk with -lz added. -LIBS -lstubs -lutil -lm -lc -ltls -lssl -lcrypto -levent -lz +COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b.dtb usr/mdec/rpi/bcm2710-rpi-3-b.dtb +COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b-plus.dtb usr/mdec/rpi/bcm2710-rpi-3-b-plus.dtb +COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-cm3.dtb usr/mdec/rpi/bcm2710-rpi-cm3.dtb +COPY /usr/local/share/raspberrypi-firmware/boot/bootcode.bin usr/mdec/rpi/bootcode.bin +COPY /usr/local/share/raspberrypi-firmware/boot/start.elf usr/mdec/rpi/start.elf +COPY /usr/local/share/raspberrypi-firmware/boot/fixup.dat usr/mdec/rpi/fixup.dat +COPY /usr/local/share/u-boot/rpi_3/u-boot.bin usr/mdec/rpi/u-boot.bin + +COPY /usr/local/share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin usr/mdec/pine64/u-boot-sunxi-with-spl.bin # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV @@ -105,28 +112,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 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 # 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 SYMLINK install.sub upgrade -COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b.dtb usr/mdec/rpi/bcm2710-rpi-3-b.dtb -COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-3-b-plus.dtb usr/mdec/rpi/bcm2710-rpi-3-b-plus.dtb -COPY /usr/local/share/raspberrypi-firmware/boot/bcm2710-rpi-cm3.dtb usr/mdec/rpi/bcm2710-rpi-cm3.dtb -COPY /usr/local/share/raspberrypi-firmware/boot/bootcode.bin usr/mdec/rpi/bootcode.bin -COPY /usr/local/share/raspberrypi-firmware/boot/start.elf usr/mdec/rpi/start.elf -COPY /usr/local/share/raspberrypi-firmware/boot/fixup.dat usr/mdec/rpi/fixup.dat -COPY /usr/local/share/u-boot/rpi_3/u-boot.bin usr/mdec/rpi/u-boot.bin - -COPY /usr/local/share/u-boot/pine64_plus/u-boot-sunxi-with-spl.bin usr/mdec/pine64/u-boot-sunxi-with-spl.bin - TZ diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index e37f4d37c0d..7850ec289bf 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.42 2019/06/07 14:39:56 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,8 +61,10 @@ 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/mkuboot +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 @@ -92,34 +92,6 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int -# this is the list from distrib/miniroot/makeconf.awk with -lz added. -LIBS -lstubs -lutil -lm -lc -ltls -lssl -lcrypto -levent -lz - -# 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 -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 -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 - -# and the installation tools -SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/install.md install.md -SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub -SPECIAL chmod 755 install.sub -SYMLINK install.sub autoinstall -SYMLINK install.sub install -SYMLINK install.sub upgrade - # u-boot and dtbs MKDIR usr/mdec/am335x COPY /usr/local/share/u-boot/am335x_evm/MLO usr/mdec/am335x/MLO @@ -188,4 +160,30 @@ COPY /usr/local/share/dtb/arm/imx6q-wandboard-revb1.dtb usr/mdec/wandboard/imx6q COPY /usr/local/share/dtb/arm/imx6q-wandboard-revd1.dtb usr/mdec/wandboard/imx6q-wandboard-revd1.dtb COPY /usr/local/share/dtb/arm/imx6qp-wandboard-revd1.dtb usr/mdec/wandboard/imx6qp-wandboard-revd1.dtb +# 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 +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 + +# and the installation tools +SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile +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 +SYMLINK install.sub upgrade + TZ diff --git a/distrib/hppa/ramdisk/list b/distrib/hppa/ramdisk/list index 843c05c8259..20d5bebab68 100644 --- a/distrib/hppa/ramdisk/list +++ b/distrib/hppa/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.15 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.16 2019/06/07 14:39:56 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 @@ -27,11 +25,13 @@ LINK instbin bin/rm LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync -LINK instbin sbin/disklabel +LINK instbin sbin/bioctl LINK instbin sbin/dhclient +LINK instbin sbin/disklabel LINK instbin sbin/dmesg LINK instbin sbin/fsck LINK instbin sbin/fsck_ffs +LINK instbin sbin/growfs LINK instbin sbin/ifconfig LINK instbin sbin/init LINK instbin sbin/mknod @@ -43,6 +43,7 @@ LINK instbin sbin/newfs LINK instbin sbin/ping sbin/ping6 LINK instbin sbin/reboot sbin/halt LINK instbin sbin/route +LINK instbin sbin/slaacd LINK instbin sbin/sysctl LINK instbin sbin/umount LINK instbin usr/bin/doas @@ -54,13 +55,23 @@ 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 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 +# for disklabel(8) -B +COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot +LINK usr/mdec/sdboot usr/mdec/boot.lif + +# 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 @@ -68,37 +79,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,hp2392,hpansi,hpsub,hpex,hp700-wy,hp70092 usr/share/misc/termcap -# for disklabel(8) -B -COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot -LINK usr/mdec/sdboot usr/mdec/boot.lif +SYMLINK /tmp/i/fstab.shadow etc/fstab +SYMLINK /tmp/i/resolv.conf.shadow etc/resolv.conf +SYMLINK /tmp/i/hosts etc/hosts -# and the installation scripts +# and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile 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 SYMLINK install.sub upgrade -# hppa extra's -LINK instbin sbin/disklabel -LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep -LINK instbin usr/bin/more usr/bin/less -LINK instbin sbin/bioctl -LINK instbin sbin/growfs -LINK instbin sbin/slaacd - -# 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 -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,hp2392,hpansi,hpsub,hpex,hp700-wy,hp70092 usr/share/misc/termcap - -# and the installation tools (no upgrade from to 3.3) -SCRIPT ${CURDIR}/../install.md install.md TZ diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index 685e2eab39b..0af2eeaec0a 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2019/06/07 14:39:57 deraadt Exp $ FS= floppy${OSrev}.fs FSSIZE= 2880 @@ -7,7 +7,7 @@ MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf RAMDISK= RAMDISK -LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local +LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot all: ${FS} diff --git a/distrib/i386/common/list b/distrib/i386/ramdisk/list index 404fb0c57cb..35a4d21de8b 100644 --- a/distrib/i386/common/list +++ b/distrib/i386/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.50 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.1 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 @@ -33,6 +31,7 @@ LINK instbin sbin/dmesg LINK instbin sbin/fdisk LINK instbin sbin/fsck LINK instbin sbin/fsck_ffs +LINK instbin sbin/fsck_msdos LINK instbin sbin/ifconfig LINK instbin sbin/init LINK instbin sbin/kbd @@ -40,6 +39,7 @@ LINK instbin sbin/mknod LINK instbin sbin/mount LINK instbin sbin/mount_cd9660 LINK instbin sbin/mount_ffs +LINK instbin sbin/mount_msdos LINK instbin sbin/newfs LINK instbin sbin/ping sbin/ping6 LINK instbin sbin/reboot sbin/halt @@ -48,6 +48,7 @@ LINK instbin sbin/sysctl LINK instbin sbin/umount LINK instbin usr/bin/doas LINK instbin usr/bin/encrypt +LINK instbin usr/bin/ftp LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/more usr/bin/less @@ -55,16 +56,18 @@ 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 + +# 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 -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # various files that we need in /etc for the install COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -80,9 +83,11 @@ 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 SYMLINK install.sub upgrade + +#TZ # this does not fit on the floppy diff --git a/distrib/i386/ramdisk/list.local b/distrib/i386/ramdisk/list.local deleted file mode 100644 index 2c5f988b338..00000000000 --- a/distrib/i386/ramdisk/list.local +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: list.local,v 1.3 2019/04/30 17:46:04 deraadt Exp $ - -LINK instbin sbin/fsck_msdos -LINK instbin sbin/mount_msdos - -LINK instbin usr/bin/ftp - -#TZ # this does not fit on the floppy diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index 1023939731a..5cf68a2919b 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2019/06/07 14:39:57 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 7936 @@ -8,7 +8,7 @@ MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf RAMDISK= RAMDISK_CD -LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local +LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot LBA=1 diff --git a/distrib/i386/ramdisk_cd/list b/distrib/i386/ramdisk_cd/list new file mode 100644 index 00000000000..2a49275ebcb --- /dev/null +++ b/distrib/i386/ramdisk_cd/list @@ -0,0 +1,142 @@ +# $OpenBSD: list,v 1.1 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 bin/arch +LINK instbin bin/cat +LINK instbin bin/chmod bin/chgrp sbin/chown +LINK instbin bin/cp +LINK instbin bin/date +LINK instbin bin/dd +LINK instbin bin/df +LINK instbin bin/ed +LINK instbin bin/hostname +LINK instbin bin/ksh bin/sh +LINK instbin bin/ln +LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 +LINK instbin bin/mkdir +LINK instbin bin/mt bin/eject +LINK instbin bin/mv +LINK instbin bin/pax bin/tar +LINK instbin bin/rm +LINK instbin bin/sleep +LINK instbin bin/stty +LINK instbin bin/sync +LINK instbin sbin/bioctl +LINK instbin sbin/dhclient +LINK instbin sbin/disklabel +LINK instbin sbin/dmesg +LINK instbin sbin/fdisk +LINK instbin sbin/fsck +LINK instbin sbin/fsck_ffs +LINK instbin sbin/growfs +LINK instbin sbin/ifconfig +LINK instbin sbin/init +LINK instbin sbin/kbd +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_udf +LINK instbin sbin/newfs +LINK instbin sbin/ping sbin/ping6 +LINK instbin sbin/reboot sbin/halt +LINK instbin sbin/restore +LINK instbin sbin/route +LINK instbin sbin/slaacd +LINK instbin sbin/sysctl +LINK instbin sbin/umount +LINK instbin usr/bin/doas +LINK instbin usr/bin/encrypt +LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep +LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +LINK instbin usr/bin/more usr/bin/less +LINK instbin usr/bin/sed +LINK instbin usr/bin/signify +LINK instbin usr/bin/tee +LINK instbin usr/sbin/chroot +LINK instbin usr/sbin/installboot +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 + +# 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/3c990 etc/firmware/3c990 + +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 ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211 +COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b + +# copy the atmel firmwares most likely used +#COPY ${DESTDIR}/etc/firmware/atu-at76c503-i3863-ext etc/firmware/atu-at76c503-i3863-ext +#COPY ${DESTDIR}/etc/firmware/atu-at76c503-i3863-int etc/firmware/atu-at76c503-i3863-int +#COPY ${DESTDIR}/etc/firmware/atu-at76c503-rfmd-acc-ext etc/firmware/atu-at76c503-rfmd-acc-ext +#COPY ${DESTDIR}/etc/firmware/atu-at76c503-rfmd-acc-int etc/firmware/atu-at76c503-rfmd-acc-int +#COPY ${DESTDIR}/etc/firmware/atu-at76c505-rfmd-ext etc/firmware/atu-at76c505-rfmd-ext +#COPY ${DESTDIR}/etc/firmware/atu-at76c505-rfmd-int etc/firmware/atu-at76c505-rfmd-int +#COPY ${DESTDIR}/etc/firmware/atu-intersil-ext etc/firmware/atu-intersil-ext +#COPY ${DESTDIR}/etc/firmware/atu-intersil-int etc/firmware/atu-intersil-int +#COPY ${DESTDIR}/etc/firmware/atu-license etc/firmware/atu-license +#COPY ${DESTDIR}/etc/firmware/atu-rfmd-ext etc/firmware/atu-rfmd-ext +#COPY ${DESTDIR}/etc/firmware/atu-rfmd-int etc/firmware/atu-rfmd-int +#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-ext etc/firmware/atu-rfmd2958-ext +#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int +#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext +#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int + +# 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 +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 + +# and the installation tools +SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile +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 + +TZ diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local deleted file mode 100644 index cd60fa841ac..00000000000 --- a/distrib/i386/ramdisk_cd/list.local +++ /dev/null @@ -1,57 +0,0 @@ -# $OpenBSD: list.local,v 1.42 2018/10/07 01:16:40 jsg Exp $ - -# add local links; use bin/sh since instbin has already been unlinked -LINK instbin sbin/growfs -LINK instbin sbin/mount_ext2fs -LINK instbin sbin/mount_msdos -LINK instbin sbin/mount_udf -LINK instbin sbin/restore -LINK instbin sbin/bioctl -LINK instbin sbin/slaacd - -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 - -# 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/3c990 etc/firmware/3c990 - -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 ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211 -COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b - -# copy the atmel firmwares most likely used -#COPY ${DESTDIR}/etc/firmware/atu-at76c503-i3863-ext etc/firmware/atu-at76c503-i3863-ext -#COPY ${DESTDIR}/etc/firmware/atu-at76c503-i3863-int etc/firmware/atu-at76c503-i3863-int -#COPY ${DESTDIR}/etc/firmware/atu-at76c503-rfmd-acc-ext etc/firmware/atu-at76c503-rfmd-acc-ext -#COPY ${DESTDIR}/etc/firmware/atu-at76c503-rfmd-acc-int etc/firmware/atu-at76c503-rfmd-acc-int -#COPY ${DESTDIR}/etc/firmware/atu-at76c505-rfmd-ext etc/firmware/atu-at76c505-rfmd-ext -#COPY ${DESTDIR}/etc/firmware/atu-at76c505-rfmd-int etc/firmware/atu-at76c505-rfmd-int -#COPY ${DESTDIR}/etc/firmware/atu-intersil-ext etc/firmware/atu-intersil-ext -#COPY ${DESTDIR}/etc/firmware/atu-intersil-int etc/firmware/atu-intersil-int -#COPY ${DESTDIR}/etc/firmware/atu-license etc/firmware/atu-license -#COPY ${DESTDIR}/etc/firmware/atu-rfmd-ext etc/firmware/atu-rfmd-ext -#COPY ${DESTDIR}/etc/firmware/atu-rfmd-int etc/firmware/atu-rfmd-int -#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-ext etc/firmware/atu-rfmd2958-ext -#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int -#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext -#COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int - -TZ diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 5347e314309..b7ddb8d6959 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.49 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.50 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 @@ -62,8 +60,10 @@ 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 # firmware we might need COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue @@ -88,13 +88,13 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int +# 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 -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # various files that we need in /etc for the install COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -110,8 +110,8 @@ SYMLINK /tmp/i/hosts etc/hosts # 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 diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index 7b23260f3cc..744ec387529 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.33 2019/05/13 23:18:21 naddy Exp $ +# $OpenBSD: list,v 1.34 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 @@ -65,26 +63,12 @@ LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot LINK instbin usr/sbin/pwd_mkdb - -# copy the MAKEDEV script and make some devices -SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV -SPECIAL cd dev; sh MAKEDEV ramdisk +ARGVLINK ksh -sh +SPECIAL rm bin/md5 # for fdisk(8) COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr -# various files that we need in /etc for the install -COPY ${CURDIR}/../../miniroot/group etc/group -COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd -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 -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/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573 @@ -107,10 +91,27 @@ 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 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 +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 + # 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 diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list index e7acae56e97..d1bb3df30ac 100644 --- a/distrib/luna88k/ramdisk/list +++ b/distrib/luna88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.42 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.43 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 @@ -58,6 +56,8 @@ 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 # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV @@ -76,11 +76,13 @@ SYMLINK /tmp/i/fstab.shadow etc/fstab SYMLINK /tmp/i/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/i/hosts etc/hosts +# and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile 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 SYMLINK install.sub upgrade + +TZ 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 diff --git a/distrib/miniroot/list b/distrib/miniroot/list deleted file mode 100644 index 90a87cac3f5..00000000000 --- a/distrib/miniroot/list +++ /dev/null @@ -1,76 +0,0 @@ -# $OpenBSD: list,v 1.72 2019/05/13 23:18:22 naddy Exp $ - -SRCDIRS distrib/special - -# copy the crunched binary, link to it, and kill it -COPY ${OBJDIR}/instbin instbin -LINK instbin bin/arch -LINK instbin bin/cat -LINK instbin bin/chmod bin/chgrp sbin/chown -LINK instbin bin/cp -LINK instbin bin/date -LINK instbin bin/dd -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 -LINK instbin bin/pax bin/tar -LINK instbin bin/rm -LINK instbin bin/sleep -LINK instbin bin/stty -LINK instbin bin/sync -LINK instbin sbin/disklabel -LINK instbin sbin/dmesg -LINK instbin sbin/fsck -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_ffs -LINK instbin sbin/mount_nfs -LINK instbin sbin/mount_udf -LINK instbin sbin/newfs -LINK instbin sbin/ping sbin/ping6 -LINK instbin sbin/reboot sbin/halt -LINK instbin sbin/route -LINK instbin sbin/sysctl -LINK instbin sbin/umount -LINK instbin usr/bin/doas -LINK instbin usr/bin/encrypt -LINK instbin usr/bin/ftp -LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep -LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat -LINK instbin usr/bin/more usr/bin/less -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 - -# various files that we need in /etc for the install -COPY ${CURDIR}/../../miniroot/group etc/group -COPY ${CURDIR}/../miniroot/master.passwd etc/master.passwd -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 - -# and the installation scripts -SCRIPT ${CURDIR}/../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/../miniroot/install.sub install.sub -SPECIAL chmod 755 install.sub -SYMLINK install.sub autoinstall -SYMLINK install.sub install -SYMLINK install.sub upgrade - -TZ diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list index dcc544f3d07..f2b5f48821c 100644 --- a/distrib/octeon/ramdisk/list +++ b/distrib/octeon/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.26 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.27 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 @@ -62,6 +60,8 @@ 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 # firmware we might need # ...none yet untill USB works. @@ -85,8 +85,8 @@ SYMLINK /tmp/i/hosts etc/hosts # 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 diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index 18d83d3576f..3d918bf398f 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.58 2019/05/13 23:18:22 naddy Exp $ +# $OpenBSD: list,v 1.59 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 @@ -60,13 +58,24 @@ 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 + +# firmware we might need +#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1 +#COPY ${DESTDIR}/etc/firmware/tigon2 etc/firmware/tigon2 +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}/usr/mdec/sgivol usr/mdec/sgivol # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -COPY ${DESTDIR}/usr/mdec/sgivol usr/mdec/sgivol - # various files that we need in /etc for the install COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -74,24 +83,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/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 # 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 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 |