From 03d4f68c12736215ab9a11296c5dc2513711628a Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 7 Mar 2007 21:59:15 +0000 Subject: [PATCH] Remove sgimips from multi-cd sets where EXTFILES.sgimips is defined. A bootable sgimips has a volume header prepended, and so is useless for anything but sgimips. The issue was not found before because the logic to make an ISO bootable on sgimips was broken, and has been fixed by tsutsui@ on 2007/03/04. --- distrib/cdrom/3.0.1.conf | 4 ++-- distrib/cdrom/3.0.2.conf | 4 ++-- distrib/cdrom/3.0.conf | 4 ++-- distrib/cdrom/3.1.conf | 4 ++-- distrib/cdrom/4.0.conf | 4 ++-- distrib/cdrom/current.conf | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/distrib/cdrom/3.0.1.conf b/distrib/cdrom/3.0.1.conf index b778ba49449c..84c7d8f9a205 100644 --- a/distrib/cdrom/3.0.1.conf +++ b/distrib/cdrom/3.0.1.conf @@ -1,4 +1,4 @@ -# $NetBSD: 3.0.1.conf,v 1.1 2006/06/21 21:27:20 tron Exp $ +# $NetBSD: 3.0.1.conf,v 1.2 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -149,7 +149,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips + cobalt hpcmips pmax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 diff --git a/distrib/cdrom/3.0.2.conf b/distrib/cdrom/3.0.2.conf index bf36fe043764..36082ed8f764 100644 --- a/distrib/cdrom/3.0.2.conf +++ b/distrib/cdrom/3.0.2.conf @@ -1,4 +1,4 @@ -# $NetBSD: 3.0.2.conf,v 1.2 2007/03/04 04:16:15 tsutsui Exp $ +# $NetBSD: 3.0.2.conf,v 1.3 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -153,7 +153,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips + cobalt hpcmips pmax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 diff --git a/distrib/cdrom/3.0.conf b/distrib/cdrom/3.0.conf index d866550e4c73..dd54c738b994 100644 --- a/distrib/cdrom/3.0.conf +++ b/distrib/cdrom/3.0.conf @@ -1,4 +1,4 @@ -# $NetBSD: 3.0.conf,v 1.1 2005/12/08 21:13:28 riz Exp $ +# $NetBSD: 3.0.conf,v 1.2 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -149,7 +149,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips vax + cobalt hpcmips pmax vax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 diff --git a/distrib/cdrom/3.1.conf b/distrib/cdrom/3.1.conf index 5e1bcc2a75fa..acfe75e3ae69 100644 --- a/distrib/cdrom/3.1.conf +++ b/distrib/cdrom/3.1.conf @@ -1,4 +1,4 @@ -# $NetBSD: 3.1.conf,v 1.2 2007/03/04 04:16:15 tsutsui Exp $ +# $NetBSD: 3.1.conf,v 1.3 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -153,7 +153,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips + cobalt hpcmips pmax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 diff --git a/distrib/cdrom/4.0.conf b/distrib/cdrom/4.0.conf index d5f4106182af..ac49260d4e09 100644 --- a/distrib/cdrom/4.0.conf +++ b/distrib/cdrom/4.0.conf @@ -1,4 +1,4 @@ -# $NetBSD: 4.0.conf,v 1.2 2007/03/04 04:16:15 tsutsui Exp $ +# $NetBSD: 4.0.conf,v 1.3 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -156,7 +156,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips vax + cobalt hpcmips pmax vax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 diff --git a/distrib/cdrom/current.conf b/distrib/cdrom/current.conf index c7218dae80ea..08aaa50d2d15 100644 --- a/distrib/cdrom/current.conf +++ b/distrib/cdrom/current.conf @@ -1,4 +1,4 @@ -# $NetBSD: current.conf,v 1.5 2007/03/04 04:16:15 tsutsui Exp $ +# $NetBSD: current.conf,v 1.6 2007/03/07 21:59:15 bouyer Exp $ # # Makefile fragment for CD sets; includes config information. @@ -156,7 +156,7 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ amiga atari mac68k next68k sun3 BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \ - cobalt hpcmips pmax sgimips vax + cobalt hpcmips pmax vax BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32