From owner-p4-projects@FreeBSD.ORG  Sun Jun  1 00:15:03 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B390A37B404; Sun,  1 Jun 2003 00:15:02 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4E18737B401
	for <perforce@freebsd.org>; Sun,  1 Jun 2003 00:15:02 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB77C43F85
	for <perforce@freebsd.org>; Sun,  1 Jun 2003 00:15:01 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h517F10U000760
	for <perforce@freebsd.org>; Sun, 1 Jun 2003 00:15:01 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h517F1EX000757
	for perforce@freebsd.org; Sun, 1 Jun 2003 00:15:01 -0700 (PDT)
Date: Sun, 1 Jun 2003 00:15:01 -0700 (PDT)
Message-Id: <200306010715.h517F1EX000757@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 32276 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2003 07:15:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=32276

Change 32276 by peter@peter_hammer on 2003/06/01 00:14:26

	Dont build a fixit floppy for amd64.
	Sorry David, the chroot ${CHROOTDIR} vs ${_MK} thing
	doesn't work.   "chroot home scratch mk" isn't valid here.

Affected files ...

.. //depot/projects/hammer/release/Makefile#25 edit

Differences ...

==== //depot/projects/hammer/release/Makefile#25 (text+ko) ====

@@ -272,6 +272,9 @@
 FIXIT_TARGET=
 .elif ${TARGET} == "pc98"
 CRUNCH_TARGETS=	boot fixit fixit-small
+.elif ${TARGET_ARCH} == "amd64"
+CRUNCH_TARGETS= boot
+FIXIT_TARGET=
 .endif
 
 .if !defined(CRUNCH_TARGETS)
@@ -480,7 +483,7 @@
 	chmod 755 ${_MK}
 	# Ensure md.ko is loaded if md(4) is not statically compiled into the kernel
 	-mdconfig 2>/dev/null
-	env -i /usr/sbin/chroot ${_MK:S/\// /g}
+	env -i /usr/sbin/chroot ${CHROOTDIR} /mk
 
 clean:
 	rm -rf boot_crunch release.[0-9]