Date: Mon, 30 Aug 2010 15:22:10 -0700 From: Xin LI <delphij@delphij.net> To: John Baldwin <jhb@freebsd.org> Cc: FreeBSD Current <freebsd-current@freebsd.org>, d@delphij.net Subject: Re: [PATCH] Use MACHINE_ARCH for boot loader Message-ID: <4C7C2F12.5010304@delphij.net> In-Reply-To: <201008270934.56323.jhb@freebsd.org> References: <4C770BB9.2070900@delphij.net> <201008270934.56323.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <delphij@delphij.net> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C7C2F12.5010304>