summaryrefslogtreecommitdiff
path: root/distrib/hppa
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-12 16:05:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-12 16:05:45 +0000
commitf89b83c716f09a18b09f65a6f6b7b2643840a3bc (patch)
tree65b177f8dbab8a00ac7ead31415a4125e95dd30f /distrib/hppa
parent594f48e7d95210421ebfe8c2fd9f4799f1bb961f (diff)
The list + list.local approach is only needed if an architecture builds
multiple bsd.rd. hppa builds one. Fold into one file.
Diffstat (limited to 'distrib/hppa')
-rw-r--r--distrib/hppa/list81
-rw-r--r--distrib/hppa/ramdisk/Makefile4
2 files changed, 2 insertions, 83 deletions
diff --git a/distrib/hppa/list b/distrib/hppa/list
deleted file mode 100644
index d43ed5bdbd5..00000000000
--- a/distrib/hppa/list
+++ /dev/null
@@ -1,81 +0,0 @@
-# $OpenBSD: list,v 1.42 2019/04/29 01:48:39 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
-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/dhclient
-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/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/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/sbin/chroot
-LINK instbin usr/sbin/pwd_mkdb
-LINK instbin usr/sbin/installboot
-
-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
-
-# 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
-
-# for disklabel(8) -B
-COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot
-LINK usr/mdec/sdboot usr/mdec/boot.lif
-
-# 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
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 51d47f14f8c..0bc5ab254f0 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2019/05/03 20:03:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.45 2019/05/12 16:05:44 deraadt Exp $
LIF= lif${OSrev}.fs
CDROM= cd${OSrev}.iso
MTREE= ${UTILS}/mtree.conf
RAMDISK= RAMDISK
-LISTS= ${.CURDIR}/../list ${.CURDIR}/list.local
+LISTS= ${.CURDIR}/list
UTILS= ${.CURDIR}/../../miniroot
MRDISKTYPE= rdroot