From b07b69cc6340d9f552f9d13990f1f02612769c6c Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 23 Mar 2004 17:21:09 +0000
Subject: [PATCH] Add hexdump and kill to the bootstrap list.  Correct the
 tools path used during a buildkernel.  There may still be other issues.

---
 Makefile.inc1 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 329defc477..6c41f5888e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.24 2004/03/22 23:49:05 dillon Exp $
+# $DragonFly: src/Makefile.inc1,v 1.25 2004/03/23 17:21:09 dillon Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -263,13 +263,14 @@ WMAKEENV=	${CROSSENV} \
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1
 
 # install stage
+#
 IMAKEENV=	${CROSSENV} \
 		PATH=${STRICTTMPPATH}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1
 
 # kernel stage
-KMAKEENV=	${WMAKEENV} \
-		OBJFORMAT_PATH=${WORLDDEST}:${OBJFORMAT_PATH}
+#
+KMAKEENV=	${WMAKEENV}
 
 # buildworld
 #
@@ -628,7 +629,7 @@ bootstrap-tools:
 .for _tool in ${_strfile} \
     bin/chmod bin/cp bin/dd bin/mkdir bin/rm bin/echo bin/test \
     bin/cat bin/date bin/ln bin/mv bin/csh bin/expr bin/sh bin/ls \
-    bin/hostname \
+    bin/hostname bin/kill \
     sbin/sysctl \
     usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \
     usr.bin/m4 usr.bin/rpcgen usr.bin/make gnu/usr.bin/awk usr.bin/file \
@@ -636,7 +637,7 @@ bootstrap-tools:
     usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \
     usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \
     usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \
-    usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et \
+    usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et usr.bin/hexdump \
     usr.bin/vi usr.bin/cap_mkdb usr.bin/vgrind usr.bin/true usr.bin/false \
     usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \
     usr.sbin/chown usr.sbin/mtree usr.sbin/config \
-- 
2.41.0