From nobody@FreeBSD.org  Thu May 27 07:55:02 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D7401065679
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 27 May 2010 07:55:02 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id F0A648FC26
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 27 May 2010 07:55:01 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4R7t1NR010151
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 27 May 2010 07:55:01 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o4R7t1CC010139;
	Thu, 27 May 2010 07:55:01 GMT
	(envelope-from nobody)
Message-Id: <201005270755.o4R7t1CC010139@www.freebsd.org>
Date: Thu, 27 May 2010 07:55:01 GMT
From: Alexander Best <alexbestms@wwu.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [loader] [patch] consistently use 'x86' keyword in loader(8)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147120
>Category:       i386
>Synopsis:       [loader] [patch] consistently use 'x86' keyword in loader(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 27 08:00:07 UTC 2010
>Closed-Date:    Thu Oct 14 22:33:39 UTC 2010
>Last-Modified:  Thu Oct 14 22:33:39 UTC 2010
>Originator:     Alexander Best
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD otaku 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r207931M: Tue May 11 21:43:46 CEST 2010     root@otaku:/usr/obj/usr/src/sys/ARUNDEL  amd64
>Description:
it was decided that the keyword 'x86' should be used for code that's being shared between i386 and amd64. [1] [2]

cheers.

[1] r205662
[2] http://www.mail-archive.com/freebsd-hackers@freebsd.org/msg70613.html
>How-To-Repeat:

>Fix:
apply the attached patch.

Patch attached with submission follows:

Index: sys/boot/i386/zfsloader/Makefile
===================================================================
--- sys/boot/i386/zfsloader/Makefile	(revision 208580)
+++ sys/boot/i386/zfsloader/Makefile	(working copy)
@@ -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
Index: sys/boot/i386/efi/Makefile
===================================================================
--- sys/boot/i386/efi/Makefile	(revision 208580)
+++ sys/boot/i386/efi/Makefile	(working copy)
@@ -42,7 +42,7 @@
 
 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}
Index: sys/boot/i386/loader/Makefile
===================================================================
--- sys/boot/i386/loader/Makefile	(revision 208580)
+++ sys/boot/i386/loader/Makefile	(working copy)
@@ -6,7 +6,7 @@
 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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: arundel 
State-Changed-When: Tue Aug 31 19:44:16 UTC 2010 
State-Changed-Why:  
Patched in HEAD (r212066). 


Responsible-Changed-From-To: freebsd-i386->delphij 
Responsible-Changed-By: arundel 
Responsible-Changed-When: Tue Aug 31 19:44:16 UTC 2010 
Responsible-Changed-Why:  
Assign to committer as MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147120 
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Thu Oct 14 22:31:43 UTC 2010 
State-Changed-Why:  
Patched in RELENG_8 as r212301. 

Thanks for your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147120 
>Unformatted:
