Module Name: src
Committed By: jmcneill
Date: Fri Jun 18 18:57:28 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: mi
src/tools: Makefile
src/usr.bin: Makefile
Added Files:
src/tools/mkubootimage: Makefile
Log Message:
hook mkubootimage into the build
To generate a diff of this commit:
cvs rdiff -u -r1.1468 -r1.1469 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.138 -r1.139 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/mkubootimage/Makefile
cvs rdiff -u -r1.187 -r1.188 src/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1468 src/distrib/sets/lists/comp/mi:1.1469
--- src/distrib/sets/lists/comp/mi:1.1468 Fri Jun 18 16:29:01 2010
+++ src/distrib/sets/lists/comp/mi Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1468 2010/06/18 16:29:01 hannken Exp $
+# $NetBSD: mi,v 1.1469 2010/06/18 18:57:27 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -47,6 +47,7 @@
./usr/bin/lorder comp-util-bin
./usr/bin/menuc comp-c-bin
./usr/bin/mkstr comp-c-bin
+./usr/bin/mkubootimage comp-util-bin
./usr/bin/msgattrib comp-c-bin
./usr/bin/msgc comp-c-bin
./usr/bin/msgcat comp-c-bin
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.138 src/tools/Makefile:1.139
--- src/tools/Makefile:1.138 Fri Jun 4 08:34:35 2010
+++ src/tools/Makefile Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2010/06/04 08:34:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.139 2010/06/18 18:57:27 jmcneill Exp $
.include <bsd.own.mk>
@@ -115,6 +115,10 @@
SUBDIR+= hp300-mkboot
.endif
+.if ${MACHINE} == "evbarm"
+SUBDIR+= mkubootimage
+.endif
+
check_MKTOOLS: .PHONY .NOTMAIN
.if ${MKTOOLS:Uyes} == "no"
@echo '*** WARNING: "MKTOOLS" is set to "no"; this will prevent building and'
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.187 src/usr.bin/Makefile:1.188
--- src/usr.bin/Makefile:1.187 Thu Jun 17 06:29:16 2010
+++ src/usr.bin/Makefile Fri Jun 18 18:57:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.187 2010/06/17 06:29:16 mrg Exp $
+# $NetBSD: Makefile,v 1.188 2010/06/18 18:57:27 jmcneill Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@@ -16,7 +16,8 @@
kdump ktrace ktruss lam last lastcomm ldd leave less \
locale locate lock logger login logname look lorder m4 \
machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
- mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
+ mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage moduli \
+ msgc msgs \
nbperf netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
pagesize passwd paste patch pathchk pkill pmap pmc pr \
printenv printf progress pwhash qsubst quota radioctl rdist \
Added files:
Index: src/tools/mkubootimage/Makefile
diff -u /dev/null src/tools/mkubootimage/Makefile:1.1
--- /dev/null Fri Jun 18 18:57:29 2010
+++ src/tools/mkubootimage/Makefile Fri Jun 18 18:57:28 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/06/18 18:57:28 jmcneill Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}mkubootimage
+HOST_SRCDIR= usr.bin/mkubootimage
+
+HOST_CPPFLAGS+= -I${.CURDIR}
+
+.include "${.CURDIR}/../Makefile.host"
