diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 23:25:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 23:25:20 +0000 |
| commit | 6879612b7d7e67eb54977949544e3092c4c2c71d (patch) | |
| tree | f7d586fa6b8fb028d8e2b43939b709e9d85903a6 /distrib/amd64 | |
| parent | 0f12bba78f77a96e40be5f828ab6d636a53ee25e (diff) | |
repair more trivial differences
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/ramdiskA/Makefile | 10 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/Makefile | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index 142e0335324..60171d11600 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/04/30 21:14:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2019/04/30 23:25:19 deraadt Exp $ FS= floppy${OSrev}.fs FSSIZE= 2880 @@ -11,9 +11,9 @@ UTILS= ${.CURDIR}/../../miniroot EFIBOOT= ${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI -all: ${FS} +all: ${FS} -${FS}: bsd.gz +${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v ${FS} > vnd disklabel -w `cat vnd` ${FSDISKTYPE} @@ -75,8 +75,8 @@ unconfig: .ifdef RELEASEDIR install: - cp ${FS} ${RELEASEDIR}/${FS} -.endif # RELEASEDIR + cp ${FS} ${RELEASEDIR} +.endif clean cleandir: rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index c5d8fd53d18..1620649c708 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2019/04/30 21:14:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2019/04/30 23:25:19 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 9600 @@ -12,9 +12,9 @@ UTILS= ${.CURDIR}/../../miniroot EFIBOOT= ${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI -all: ${FS} ${CDROM} +all: ${FS} ${CDROM} -${FS}: bsd.gz +${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v ${FS} > vnd fdisk -yi -l ${FSSIZE} -b 960 -f ${DESTDIR}/usr/mdec/mbr `cat vnd` @@ -100,7 +100,8 @@ unconfig: install: cp bsd.rd ${RELEASEDIR}/bsd.rd chmod a+r ${RELEASEDIR}/bsd.rd - cp ${FS} ${CDROM} ${RELEASEDIR} + cp ${FS} ${RELEASEDIR} + cp ${CDROM} ${RELEASEDIR} .endif clean cleandir: |