cdemu dies

3 files changed, 1 insertions, 80 deletions

diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
deleted file mode 100644
index 18b68f81792..00000000000
--- a/distrib/amd64/cdfs/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#	$OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-
-BSDRD=	bsd.rd
-CDROM=	cd${REV}.iso
-
-all: ${CDROM}
-
-${CDROM}:
-	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	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/cdbr -c ${OSREV}/amd64/boot.catalog \
-	    ${.OBJDIR}/cd-dir
-
-.ifdef RELEASEDIR
-install:
-	cp ${CDROM} ${RELEASEDIR}
-.endif
-
-clean cleandir:
-	/bin/rm -f ${CDROM}
-	rm -rf cd-dir
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/i386/cdfs-emu/Makefile b/distrib/i386/cdfs-emu/Makefile
deleted file mode 100644
index 870c0444653..00000000000
--- a/distrib/i386/cdfs-emu/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#	$OpenBSD: Makefile,v 1.4 2009/04/17 15:59:48 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-
-CDFS=	cdrom${REV}.fs
-CDROM=	cdemu${REV}.iso
-
-all: ${CDROM}
-
-${CDROM}:
-	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386
-	cp ${.OBJDIR}/../ramdisk_cd/${CDFS} ${.OBJDIR}/cd-dir/${OSREV}/i386
-	mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-	    -A "OpenBSD ${OSREV} i386 bootonly CD" \
-	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/i386    ${OSREV} boot-only CD" \
-	    -b ${OSREV}/i386/${CDFS} -c ${OSREV}/i386/boot.catalog \
-	    ${.OBJDIR}/cd-dir
-
-.ifdef RELEASEDIR
-install:
-	cp ${CDROM} ${RELEASEDIR}
-.endif	# RELEASEDIR
-
-clean cleandir:
-	/bin/rm -f ${CDROM}
-	rm -rf cd-dir
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 80015de2660..67b27ce1ebb 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.71 2014/02/28 21:37:59 miod Exp $
+dnl	$OpenBSD: contents,v 1.72 2014/03/06 02:28:25 deraadt Exp $
 TopPart
 
 OpenBSDfloppy
@@ -38,13 +38,6 @@ OpenBSDcd
 			This file is included in the cd{:--:}OSrev.iso image, and is
 			provided as a convenience, but will rarely be needed.
 
-	cdemu{:--:}OSrev.iso	Another bootable CD-ROM image, for older systems
-			where the BIOS only supports the ``large floppy
-			emulation'' mode for bootable CD-ROMs, and which
-			are therefore unable to boot cd{:--:}OSrev.iso.  This image
-			is provided as a convenience, but should rarely be
-			needed.
-
 Additionally, you may be interested in
 
 .../OSREV/tools/