From owner-freebsd-stable@FreeBSD.ORG  Fri May 29 12:37:59 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 843981065675;
	Fri, 29 May 2009 12:37:59 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 91B358FC23;
	Fri, 29 May 2009 12:37:58 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua
	[212.40.38.101])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id PAA22205;
	Fri, 29 May 2009 15:37:57 +0300 (EEST)
	(envelope-from avg@freebsd.org)
Message-ID: <4A1FD724.4000503@freebsd.org>
Date: Fri, 29 May 2009 15:37:56 +0300
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Thunderbird 2.0.0.21 (X11/20090406)
MIME-Version: 1.0
To: freebsd-stable@freebsd.org, Kip Macy <kmacy@freebsd.org>,
	Doug Rabson <dfr@rabson.org>
References: <4A1D4A13.7030702@icyb.net.ua>
	<46B3333A-835A-4C88-A540-EEE70585F537@verweg.com>
	<4A1D5540.2050504@icyb.net.ua> <4A1D6DA3.40005@freebsd.org>
In-Reply-To: <4A1D6DA3.40005@freebsd.org>
X-Enigmail-Version: 0.95.7
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: 
Subject: Re: on 'btxld: zfsboot.ldr: Invalid argument' again
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2009 12:37:59 -0000


So anybody else feels that the below should be committed?
Most probably modulo __FreeBSD_version bump because it has just got bumped in
stable/7 for a different reason.

on 27/05/2009 19:43 Andriy Gapon said the following:
> on 27/05/2009 17:59 Andriy Gapon said the following:
>> Yes, it should be able, but not automagically.
>> As des@ explained to me, for this to happen the following is needed:
>> 1. bump FreeBSD_version in sys/param.h
>> 2. add/update _btxld BOOTSTRAPPING check in Makefile.inc1
>> If the above is done then btxld is built as a faux-cross-tool if/when necessary.
> 
> And the patch.
> The patch is only strictly necessary for those who define LOADER_ZFS_SUPPORT but
> won't hurt everybody else.
> Commit message should explain that version bump is for r192697:
> "merge 177933. Allow for a zero length 'loader'."
> This is necessary because btxld is a build tool as well as a cross-build tool.
> 
> 
> 
> diff --git a/Makefile.inc1 b/Makefile.inc1
> index 119ba09..5071065 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> @@ -985,7 +985,7 @@ build-tools:
>  #
>  # cross-tools: Build cross-building tools
>  #
> -.if ${TARGET_ARCH} != ${MACHINE_ARCH}
> +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102
>  .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
>  _btxld=		usr.sbin/btxld
>  .endif
> diff --git a/sys/sys/param.h b/sys/sys/param.h
> index 74960a8..6af6a4e 100644
> --- a/sys/sys/param.h
> +++ b/sys/sys/param.h
> @@ -57,7 +57,7 @@
>   *		is created, otherwise 1.
>   */
>  #undef __FreeBSD_version
> -#define __FreeBSD_version 702101	/* Master, propagated to newvers */
> +#define __FreeBSD_version 702102	/* Master, propagated to newvers */
> 
>  #ifndef LOCORE
>  #include <sys/types.h>
> 
> 


-- 
Andriy Gapon