svn commit: r212066 - in head/sys/boot/i386: efi loader zfsloader

[Alexander Best]

On Tue Aug 31 10, Xin LI wrote:
> 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

thanks a lot. :)

i hope at some point in the feature sys/boot/i386 can be renamed to
sys/boot/x86 to indicate the boot code is being shared between i386 and amd64.

cheers.
alex

-- 
a13x