diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 18:40:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 18:40:44 +0000 |
| commit | 4b8312b0d1979ecf033be8a3607fe52e95221790 (patch) | |
| tree | c65eebaf43468fe583c67b7d1ffd7348a174c09e | |
| parent | 20cba98d5e706d428e59cc2eaf7155ff3a9efb87 (diff) | |
common directory is pointless now
| -rw-r--r-- | distrib/alpha/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/alpha/miniroot/install.md (renamed from distrib/alpha/common/install.md) | 2 | ||||
| -rw-r--r-- | distrib/alpha/miniroot/list (renamed from distrib/alpha/common/list) | 18 | ||||
| -rw-r--r-- | distrib/alpha/miniroot/list.local | 14 |
4 files changed, 19 insertions, 19 deletions
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile index 6f496bd1134..e5b59e3cc03 100644 --- a/distrib/alpha/miniroot/Makefile +++ b/distrib/alpha/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2019/04/30 17:46:03 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2019/04/30 18:40:43 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 5760 @@ -7,7 +7,7 @@ CDROM= cd${OSrev}.iso MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf -LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local +LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot STRIPOPTS= -R .eh_frame -R .SUNW_ctf -R .shstrtab diff --git a/distrib/alpha/common/install.md b/distrib/alpha/miniroot/install.md index a9916cdebd7..49975cb6993 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/miniroot/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.45 2017/11/02 14:04:24 mpi Exp $ +# $OpenBSD: install.md,v 1.1 2019/04/30 18:40:43 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. diff --git a/distrib/alpha/common/list b/distrib/alpha/miniroot/list index f1b45090d5b..9e2db49c0e1 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.50 2019/04/29 01:48:39 deraadt Exp $ +# $OpenBSD: list,v 1.1 2019/04/30 18:40:43 deraadt Exp $ SRCDIRS distrib/special @@ -69,8 +69,22 @@ SYMLINK /tmp/i/resolv.conf.shadow etc/resolv.conf # and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub -SCRIPT ${CURDIR}/../common/install.md install.md +SCRIPT ${CURDIR}/install.md install.md 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/alpha/miniroot/list.local b/distrib/alpha/miniroot/list.local deleted file mode 100644 index c8d52363fe5..00000000000 --- a/distrib/alpha/miniroot/list.local +++ /dev/null @@ -1,14 +0,0 @@ -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 |