Module Name: src
Committed By: rin
Date: Thu May 6 13:23:36 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
src/sys/arch/mvme68k/stand: Makefile Makefile.booters
src/sys/arch/mvme68k/stand/wrtvid: Makefile wrtvid.c
src/tools: Makefile
Added Files:
src/tools/mvme68k-wrtvid: Makefile
Log Message:
PR port-mvme68k/56146
Build wrtvid as tools.
To generate a diff of this commit:
cvs rdiff -u -r1.1246 -r1.1247 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvme68k/stand/Makefile
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvme68k/stand/wrtvid/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c
cvs rdiff -u -r1.208 -r1.209 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/mvme68k-wrtvid/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1246 src/share/mk/bsd.own.mk:1.1247
--- src/share/mk/bsd.own.mk:1.1246 Sun Apr 25 21:55:58 2021
+++ src/share/mk/bsd.own.mk Thu May 6 13:23:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1246 2021/04/25 21:55:58 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1247 2021/05/06 13:23:36 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -492,6 +492,7 @@ TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOO
TOOL_ELFTOSB= ${TOOLDIR}/bin/${_TOOL_PREFIX}elftosb
TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
+TOOL_MVME68KWRTVID= ${TOOLDIR}/bin/${_TOOL_PREFIX}mvme68k-wrtvid
TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}perf
TOOL_NCDCS= ${TOOLDIR}/bin/${_TOOL_PREFIX}ibmnws-ncdcs
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
@@ -606,6 +607,7 @@ TOOL_MKUBOOTIMAGE= mkubootimage
TOOL_ELFTOSB= elftosb
TOOL_MSGC= msgc
TOOL_MTREE= mtree
+TOOL_MVME68KWRTVID= wrtvid
TOOL_NBPERF= nbperf
TOOL_NCDCS= ncdcs
TOOL_PAX= pax
Index: src/sys/arch/mvme68k/stand/Makefile
diff -u src/sys/arch/mvme68k/stand/Makefile:1.6 src/sys/arch/mvme68k/stand/Makefile:1.7
--- src/sys/arch/mvme68k/stand/Makefile:1.6 Mon Jan 19 23:09:16 2009
+++ src/sys/arch/mvme68k/stand/Makefile Thu May 6 13:23:36 2021
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/01/19 23:09:16 he Exp $
+# $NetBSD: Makefile,v 1.7 2021/05/06 13:23:36 rin Exp $
SUBDIR= libbug libsa .WAIT sboot netboot bootxx bootsd bootst \
installboot
-.ifmake !install
-SUBDIR+= wrtvid
-.endif
-
.include <bsd.subdir.mk>
Index: src/sys/arch/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.27 src/sys/arch/mvme68k/stand/Makefile.booters:1.28
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.27 Thu Apr 15 01:54:39 2021
+++ src/sys/arch/mvme68k/stand/Makefile.booters Thu May 6 13:23:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.27 2021/04/15 01:54:39 mrg Exp $
+# $NetBSD: Makefile.booters,v 1.28 2021/05/06 13:23:36 rin Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -73,13 +73,6 @@ $(BUGCRT):
@echo making sure the bugcrt is up to date...
@(cd ${LIB_BUG_DIR}; ${MAKE} bugstart.o)
-WRTVID_BOOT_DIR= ${.CURDIR}/../wrtvid
-WRTVID_DIR!= cd ${WRTVID_BOOT_DIR} && ${PRINTOBJDIR}
-WRTVID=${WRTVID_DIR}/wrtvid
-
-.PHONY: ${WRTVID}
-${WRTVID}:
- @echo making sure the wrtvid is up to date...
- @(cd ${WRTVID_BOOT_DIR}; ${MAKE} dependall)
+WRTVID= ${TOOL_MVME68KWRTVID}
.endif
Index: src/sys/arch/mvme68k/stand/wrtvid/Makefile
diff -u src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.12 src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.13
--- src/sys/arch/mvme68k/stand/wrtvid/Makefile:1.12 Tue May 1 19:59:45 2018
+++ src/sys/arch/mvme68k/stand/wrtvid/Makefile Thu May 6 13:23:36 2021
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2018/05/01 19:59:45 christos Exp $
+# $NetBSD: Makefile,v 1.13 2021/05/06 13:23:36 rin Exp $
-S=${.CURDIR}/../../../../
+.include <bsd.init.mk>
-.include <bsd.hostinit.mk>
+PROG= wrtvid
+MKMAN= no
-HOSTPROG= wrtvid
-
-# only needed during build
-proginstall::
-
-.include <bsd.hostprog.mk>
+.include <bsd.prog.mk>
Index: src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c
diff -u src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.9 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.10
--- src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.9 Tue Jan 8 00:00:53 2019
+++ src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c Thu May 6 13:23:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wrtvid.c,v 1.9 2019/01/08 00:00:53 rin Exp $ */
+/* $NetBSD: wrtvid.c,v 1.10 2021/05/06 13:23:36 rin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,6 +29,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.208 src/tools/Makefile:1.209
--- src/tools/Makefile:1.208 Sun Apr 25 15:11:28 2021
+++ src/tools/Makefile Thu May 6 13:23:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.208 2021/04/25 15:11:28 christos Exp $
+# $NetBSD: Makefile,v 1.209 2021/05/06 13:23:36 rin Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -219,6 +219,10 @@ SUBDIR+= libfdt .WAIT
SUBDIR+= dtc
.endif
+.if ${MACHINE} == "mvme68k"
+SUBDIR+= mvme68k-wrtvid
+.endif
+
.if ${MKX11} != "no"
SUBDIR+= makestrs
SUBDIR+= makekeys
Added files:
Index: src/tools/mvme68k-wrtvid/Makefile
diff -u /dev/null src/tools/mvme68k-wrtvid/Makefile:1.1
--- /dev/null Thu May 6 13:23:36 2021
+++ src/tools/mvme68k-wrtvid/Makefile Thu May 6 13:23:36 2021
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2021/05/06 13:23:36 rin Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}mvme68k-wrtvid
+HOST_SRCDIR= sys/arch/mvme68k/stand/wrtvid
+
+.include "${.CURDIR}/../Makefile.host"
