diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-06 02:35:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-06 02:35:13 +0000 |
| commit | 9307925ca842ca13b554f0dca98da7b6c383e471 (patch) | |
| tree | 015b09c7129b2a96b377017198df6607c0c8fc38 /distrib/amd64 | |
| parent | 5ae0f0cdb8d47831ed2bfc9804fe730c7f462b90 (diff) | |
uhm, kill the right file, resurrect the other
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/cdfs/Makefile (renamed from distrib/amd64/cdfs-emu/Makefile) | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/distrib/amd64/cdfs-emu/Makefile b/distrib/amd64/cdfs/Makefile index 24e776ade46..837336f7148 100644 --- a/distrib/amd64/cdfs-emu/Makefile +++ b/distrib/amd64/cdfs/Makefile @@ -1,24 +1,28 @@ -# $OpenBSD: Makefile,v 1.5 2011/07/27 14:53:33 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2014/03/06 02:35:12 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -CDFS= cdrom${REV}.fs -CDROM= cdemu${REV}.iso +BSDRD= bsd.rd +CDROM= cd${REV}.iso all: ${CDROM} ${CDROM}: -rm -rf ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64 - cp ${.OBJDIR}/../ramdisk_cd/${CDFS} ${.OBJDIR}/cd-dir/${OSREV}/amd64 - mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \ + mkdir -p ${.OBJDIR}/cd-dir/etc + echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf + cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/amd64 + cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64 + cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot + mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \ -A "OpenBSD ${OSREV} amd64 bootonly CD" \ -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \ -p "Theo de Raadt <deraadt@openbsd.org>" \ -V "OpenBSD/amd64 ${OSREV} boot-only CD" \ - -b ${OSREV}/amd64/${CDFS} -c ${OSREV}/amd64/boot.catalog \ + -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \ ${.OBJDIR}/cd-dir .ifdef RELEASEDIR |