on 'btxld: zfsboot.ldr: Invalid argument' again

[Andriy Gapon]

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