From owner-svn-src-head@FreeBSD.ORG  Tue Aug 31 19:01:12 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D10D210656BD;
	Tue, 31 Aug 2010 19:01:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 63C768FC21;
	Tue, 31 Aug 2010 19:01:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7VJ1CnP038984;
	Tue, 31 Aug 2010 19:01:12 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7VJ1CKx038980;
	Tue, 31 Aug 2010 19:01:12 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201008311901.o7VJ1CKx038980@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 31 Aug 2010 19:01:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212066 - in head/sys/boot/i386: efi loader zfsloader
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Aug 2010 19:01:13 -0000

Author: delphij
Date: Tue Aug 31 19:01:12 2010
New Revision: 212066
URL: http://svn.freebsd.org/changeset/base/212066

Log:
  For consistency, change all 'i386' and MACHINE_ARCH to x86.
  
  Reviewed by:	jhb
  MFC after:	1 week

Modified:
  head/sys/boot/i386/efi/Makefile
  head/sys/boot/i386/loader/Makefile
  head/sys/boot/i386/zfsloader/Makefile

Modified: head/sys/boot/i386/efi/Makefile
==============================================================================
--- head/sys/boot/i386/efi/Makefile	Tue Aug 31 18:48:09 2010	(r212065)
+++ head/sys/boot/i386/efi/Makefile	Tue Aug 31 19:01:12 2010	(r212066)
@@ -42,7 +42,7 @@ ${PROG}:	${LDSCRIPT}
 
 CLEANFILES=	vers.c loader.efi
 
-NEWVERSWHAT=	"EFI loader" ${MACHINE_ARCH}
+NEWVERSWHAT=	"EFI loader" x86
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Tue Aug 31 18:48:09 2010	(r212065)
+++ head/sys/boot/i386/loader/Makefile	Tue Aug 31 19:01:12 2010	(r212066)
@@ -6,7 +6,7 @@ MK_SSP=		no
 LOADER?=	loader
 PROG=		${LOADER}.sym
 INTERNALPROG=
-NEWVERSWHAT?=	"bootstrap loader" i386
+NEWVERSWHAT?=	"bootstrap loader" x86
 
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c

Modified: head/sys/boot/i386/zfsloader/Makefile
==============================================================================
--- head/sys/boot/i386/zfsloader/Makefile	Tue Aug 31 18:48:09 2010	(r212065)
+++ head/sys/boot/i386/zfsloader/Makefile	Tue Aug 31 19:01:12 2010	(r212066)
@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../loader
 
 LOADER=		zfsloader
-NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
+NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
 LOADER_ZFS_SUPPORT=yes
 LOADER_ONLY=	yes
 NO_MAN=		yes