From owner-freebsd-current@FreeBSD.ORG Mon Aug 30 22:22:22 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81CC610656B3; Mon, 30 Aug 2010 22:22:22 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [IPv6:2001:470:a803::1]) by mx1.freebsd.org (Postfix) with ESMTP id 150248FC0A; Mon, 30 Aug 2010 22:22:22 +0000 (UTC) Received: from mail.geekcn.org (tarsier.geekcn.org [211.166.10.233]) by tarsier.geekcn.org (Postfix) with ESMTP id 184F9A59812; Tue, 31 Aug 2010 06:22:21 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([211.166.10.233]) by mail.geekcn.org (mail.geekcn.org [211.166.10.233]) (amavisd-new, port 10024) with LMTP id yH1yreECf5dh; Tue, 31 Aug 2010 06:22:15 +0800 (CST) Received: from delta.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id E0A12A56A60; Tue, 31 Aug 2010 06:22:13 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:references:in-reply-to: x-enigmail-version:openpgp:content-type; b=S1OpJr+dEqmUSvNUlja5J7N6yJs+0nNlIgZ8Fcn66DjczHHjlWZVbHouJu6aITkBQ 3gQJeJFescB2dVnNcACTQ== Message-ID: <4C7C2F12.5010304@delphij.net> Date: Mon, 30 Aug 2010 15:22:10 -0700 From: Xin LI Organization: The Geek China Organization User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.11) Gecko/20100721 Thunderbird/3.0.6 ThunderBrowse/3.3.2 MIME-Version: 1.0 To: John Baldwin References: <4C770BB9.2070900@delphij.net> <201008270934.56323.jhb@freebsd.org> In-Reply-To: <201008270934.56323.jhb@freebsd.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=3FCA37C1; url=http://www.delphij.net/delphij.asc Content-Type: multipart/mixed; boundary="------------010009050507070302080303" Cc: FreeBSD Current , d@delphij.net Subject: Re: [PATCH] Use MACHINE_ARCH for boot loader X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2010 22:22:22 -0000 This is a multi-part message in MIME format. --------------010009050507070302080303 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 2010/08/27 06:34, John Baldwin wrote: > On Thursday, August 26, 2010 8:50:01 pm Xin LI wrote: >> Hi, >> >> The attached patch changes FreeBSD/x86 back to FreeBSD/i386 on i386 and >> FreeBSD/amd64 on amd64. >> >> Comments welcome! I'll commit it in by the weekend if there is no >> objection on this. > > As others have noted, the 'x86' is on purpose, and I would rather it continue > to do that rather than this change. What about this one? It changes the 'NEWVERSWHAT' variables from (i386|${MACHINE_ARCH}) to x86 for consistency. Cheers, - -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iQEcBAEBCAAGBQJMfC8RAAoJEATO+BI/yjfB6uIH/1XHiZd0U+Hojbh1GuiVCi7X TKQJ6j6hYC1JS0cdgDcGVgqV+12b3lsvT7uFU38sV+tSALVzPltPRexqjQQ2ltcQ EWlXRZXas/z9K/9SeLVZvVq1ZoF8vjWHvGjMjy7MRnRsSIDy9K5QEAlWbh4SkE7p a3whNOB2o3Gn5FxWS4j3OYVyh9CLgpaiGcPrWOWQygLmY1bwRjnpC3vbby2PD7hX 9Mw1jAYJ2vdqbshZbSb4xmitUfeF4Rm7qRBxvIU4qUsVef+xabciUx74bsZlPQyi jfvVvuuar1ToazVxxwaXlTdD5kPCtkxDSmduCx8aPh5n2w6MdRVrYTpANlamFpM= =XeJ4 -----END PGP SIGNATURE----- --------------010009050507070302080303 Content-Type: text/plain; name="boot.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="boot.diff" Index: sys/boot/i386/zfsloader/Makefile =================================================================== --- sys/boot/i386/zfsloader/Makefile (revision 212022) +++ 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 212022) +++ sys/boot/i386/efi/Makefile (working copy) @@ -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} Index: sys/boot/i386/loader/Makefile =================================================================== --- sys/boot/i386/loader/Makefile (revision 212022) +++ sys/boot/i386/loader/Makefile (working copy) @@ -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 --------------010009050507070302080303--