diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-10-12 14:07:47 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-10-12 14:07:47 +0000 |
| commit | 55cef35a66141a0725a968d7e7c55d018d656ff6 (patch) | |
| tree | 4732ed7d9ae36e5fb33340d123fd6375bc0c57c8 | |
| parent | edac74b98ea452a953e2d8ef01bc7e73d3f98807 (diff) | |
Use fdboot for amd64 floppy disk media.
ok deraadt@
| -rw-r--r-- | distrib/amd64/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/amd64/common/list | 5 | ||||
| -rw-r--r-- | distrib/amd64/ramdiskA/Makefile | 5 | ||||
| -rw-r--r-- | distrib/amd64/ramdiskA/list.local | 4 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/list.local | 4 |
5 files changed, 14 insertions, 8 deletions
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index bc373f16e6f..c29bc9364a6 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.18 2011/07/09 00:42:48 drahn Exp $ +# $OpenBSD: Makefile.inc,v 1.19 2012/10/12 14:07:46 jsing Exp $ TOP= ${.CURDIR}/.. @@ -20,7 +20,7 @@ VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c PID!= echo $$$$ REALIMAGE!= echo /var/tmp/image.${PID} -BOOT= ${DESTDIR}/usr/mdec/boot +BOOT?= ${DESTDIR}/usr/mdec/boot FLOPPYSIZE?= 2880 FLOPPYTYPE?= floppy3 diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list index 15f28c5e2ce..39c9e64a15d 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/common/list @@ -1,8 +1,8 @@ -# $OpenBSD: list,v 1.24 2010/10/18 04:07:49 deraadt Exp $ +# $OpenBSD: list,v 1.25 2012/10/12 14:07:46 jsing Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin SRCDIRS sys/arch/amd64/stand +SRCDIRS bin sbin usr.bin usr.sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -60,7 +60,6 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # we need the contents of /usr/mdec COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr -COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index 03e0a7e0498..7d90840943e 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,7 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2004/02/22 00:24:44 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2012/10/12 14:07:46 jsing Exp $ .PATH: ${.CURDIR}/../ramdiskA +BOOT=${DESTDIR}/usr/mdec/fdboot RAMDISK=RAMDISK NOBSDRD=1 .include "${.CURDIR}/../common/Makefile.inc" + +LISTS+= ${.CURDIR}/list.local diff --git a/distrib/amd64/ramdiskA/list.local b/distrib/amd64/ramdiskA/list.local index f80e8c257f0..ce56e8a28cc 100644 --- a/distrib/amd64/ramdiskA/list.local +++ b/distrib/amd64/ramdiskA/list.local @@ -1,3 +1,5 @@ -# $OpenBSD: list.local,v 1.1 2010/10/18 04:07:50 deraadt Exp $ +# $OpenBSD: list.local,v 1.2 2012/10/12 14:07:46 jsing Exp $ TZ + +COPY ${DESTDIR}/usr/mdec/fdboot usr/mdec/boot diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local index 8ec3616fa41..29e5b3b95ff 100644 --- a/distrib/amd64/ramdisk_cd/list.local +++ b/distrib/amd64/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.19 2011/05/16 12:10:28 sthen Exp $ +# $OpenBSD: list.local,v 1.20 2012/10/12 14:07:46 jsing Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin bin/sha256 @@ -13,6 +13,8 @@ LINK instbin sbin/mount_ext2fs LINK instbin sbin/mount_msdos LINK instbin sbin/mount_udf +COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot + COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06 |