diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-10 20:00:44 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-10 20:00:44 +0000 |
| commit | 5397ce965184bb34e095e92af054d01e9fbf0a43 (patch) | |
| tree | 42dd4857364af81b959c87cfc23ebf803740156e /distrib | |
| parent | abf5f466f3310ae1418a68542418e60f9967d61e (diff) | |
'fakecdrom' disktab entry no longer needed, nor is mksuncd mangling of
the boot cd image.
ok deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/sparc/cdfs/Makefile | 3 | ||||
| -rw-r--r-- | distrib/sparc/iso/Makefile | 3 | ||||
| -rw-r--r-- | distrib/sparc64/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/iso/Makefile | 6 |
4 files changed, 4 insertions, 14 deletions
diff --git a/distrib/sparc/cdfs/Makefile b/distrib/sparc/cdfs/Makefile index b93fae0baa4..7440eda427d 100644 --- a/distrib/sparc/cdfs/Makefile +++ b/distrib/sparc/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2011/04/10 20:00:43 krw Exp $ TOP= ${.CURDIR}/.. @@ -27,7 +27,6 @@ ${CDROM}: -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f1` \ -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f2` \ /mnt/${OSREV}/sparc/boot /usr/mdec/bootxx /dev/rsvnd0c - disklabel -w svnd0 fakecdrom "OpenBSD/sparc " umount /mnt vnconfig -u svnd0 # XXX Some sparc machines fail to load the kernel correctly if the diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile index 49074263c57..6ebeced6ffb 100644 --- a/distrib/sparc/iso/Makefile +++ b/distrib/sparc/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2011/04/10 20:00:43 krw Exp $ TOP= ${.CURDIR}/.. @@ -45,7 +45,6 @@ ${CDROM}: ${BASE} ${XBASE} -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \ -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \ /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c - disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE} " umount /mnt vnconfig -u svnd0 # XXX Some ${MACHINE} machines fail to load the kernel correctly if the diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile index 9f4ba8ff6ae..a60e302e17f 100644 --- a/distrib/sparc64/cdfs/Makefile +++ b/distrib/sparc64/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/02/26 23:16:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2011/04/10 20:00:43 krw Exp $ TOP= ${.CURDIR}/.. @@ -28,10 +28,6 @@ ${CDROM}: -p "Theo de Raadt <deraadt@openbsd.org>" \ -V "OpenBSD/sparc64 ${OSREV} boot-only CD" \ -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir - vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} - disklabel -w svnd0 fakecdrom "OpenBSD${REV}sparc64" - vnconfig -u svnd0 - mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs .ifdef RELEASEDIR install: diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 14a6e68d04b..257ac8433ff 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2011/04/10 20:00:43 krw Exp $ TOP= ${.CURDIR}/.. @@ -41,10 +41,6 @@ ${CDROM}: ${BASE} ${XBASE} -p "Theo de Raadt <deraadt@openbsd.org>" \ -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \ -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir - vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} - disklabel -w svnd0 fakecdrom "OpenBSD${REV}${MACHINE}" - vnconfig -u svnd0 - mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs install: cp ${CDROM} ${RELDIR}/ |