Module Name: src
Committed By: snj
Date: Tue Jul 18 17:32:50 UTC 2017
Modified Files:
src/distrib/sets [netbsd-8]: mkvars.mk
src/distrib/sets/lists/comp [netbsd-8]: mi
src/distrib/sets/lists/debug [netbsd-8]: mi
src/external/gpl2 [netbsd-8]: Makefile
src/share/mk [netbsd-8]: bsd.own.mk
src/tools [netbsd-8]: Makefile
Added Files:
src/tools/dtc [netbsd-8]: Makefile
src/tools/libfdt [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #114):
distrib/sets/lists/comp/mi: revision 1.2139
distrib/sets/lists/debug/mi: revision 1.217
distrib/sets/mkvars.mk: revision 1.32
external/gpl2/Makefile: revision 1.14
share/mk/bsd.own.mk: revision 1.1010
tools/Makefile: revisions 1.188, 1.189
tools/dtc/Makefile: revisions 1.1, 1.2
tools/libfdt/Makefile: revisions 1.1, 1.2
Add libfdt
--
New libfdt location
--
tools build glue.
--
Add dtc
--
add MKDTC
--
Add dtc
--
add DTC
--
add DTC
--
No need to set dtc twice.
--
Update for new libfdt location
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.4.1 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.2138 -r1.2138.2.1 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.216 -r1.216.2.1 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.13 -r1.13.8.1 src/external/gpl2/Makefile
cvs rdiff -u -r1.1009 -r1.1009.2.1 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.187 -r1.187.6.1 src/tools/Makefile
cvs rdiff -u -r0 -r1.2.4.2 src/tools/dtc/Makefile
cvs rdiff -u -r0 -r1.2.4.2 src/tools/libfdt/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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.31 src/distrib/sets/mkvars.mk:1.31.4.1
--- src/distrib/sets/mkvars.mk:1.31 Fri Apr 21 22:46:26 2017
+++ src/distrib/sets/mkvars.mk Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.31 2017/04/21 22:46:26 christos Exp $
+# $NetBSD: mkvars.mk,v 1.31.4.1 2017/07/18 17:32:50 snj Exp $
MKEXTRAVARS= \
MACHINE \
@@ -18,6 +18,7 @@ MKEXTRAVARS= \
MKCOMPAT \
MKCOMPATTESTS \
MKCOMPATMODULES \
+ MKDTC \
MKDYNAMICROOT \
MKMANPAGES \
MKSLJIT \
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2138 src/distrib/sets/lists/comp/mi:1.2138.2.1
--- src/distrib/sets/lists/comp/mi:1.2138 Sat May 27 21:02:54 2017
+++ src/distrib/sets/lists/comp/mi Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2138 2017/05/27 21:02:54 bouyer Exp $
+# $NetBSD: mi,v 1.2138.2.1 2017/07/18 17:32:50 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -26,6 +26,7 @@
./usr/bin/cvs comp-cvs-bin cvs
./usr/bin/cvsbug comp-cvs-bin cvs
./usr/bin/cvslatest comp-cvs-bin
+./usr/bin/dtc comp-util-bin dtc
./usr/bin/elfedit comp-util-bin binutils
./usr/bin/f77 comp-obsolete obsolete
./usr/bin/fgen comp-util-bin
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.216 src/distrib/sets/lists/debug/mi:1.216.2.1
--- src/distrib/sets/lists/debug/mi:1.216 Thu Jun 1 15:45:02 2017
+++ src/distrib/sets/lists/debug/mi Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.216 2017/06/01 15:45:02 perseant Exp $
+# $NetBSD: mi,v 1.216.2.1 2017/07/18 17:32:50 snj Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -510,6 +510,7 @@
./usr/libdata/debug/usr/bin/dig.debug comp-netutil-debug debug
./usr/libdata/debug/usr/bin/dirname.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/dns-sd.debug comp-mdns-debug mdns,debug
+./usr/libdata/debug/usr/bin/dtc.debug comp-dtc-debug dtc,debug
./usr/libdata/debug/usr/bin/du.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/eject.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/ekermit.debug comp-util-debug debug
Index: src/external/gpl2/Makefile
diff -u src/external/gpl2/Makefile:1.13 src/external/gpl2/Makefile:1.13.8.1
--- src/external/gpl2/Makefile:1.13 Thu Jan 14 21:13:54 2016
+++ src/external/gpl2/Makefile Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/01/14 21:13:54 christos Exp $
+# $NetBSD: Makefile,v 1.13.8.1 2017/07/18 17:32:50 snj Exp $
.include <bsd.own.mk>
@@ -17,6 +17,10 @@ SUBDIR+= grep
SUBDIR+= groff
.endif
+.if ${MKDTC} != "no"
+SUBDIR+= dtc
+.endif
+
SUBDIR+= gettext diffutils texinfo rcs send-pr
.include <bsd.subdir.mk>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1009 src/share/mk/bsd.own.mk:1.1009.2.1
--- src/share/mk/bsd.own.mk:1.1009 Sun May 21 15:28:42 2017
+++ src/share/mk/bsd.own.mk Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1009 2017/05/21 15:28:42 riastradh Exp $
+# $NetBSD: bsd.own.mk,v 1.1009.2.1 2017/07/18 17:32:50 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -352,6 +352,7 @@ TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_P
TOOL_CVSLATEST= ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
TOOL_DISKLABEL= ${TOOLDIR}/bin/nbdisklabel
+TOOL_DTC= ${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
TOOL_EQN= ${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
TOOL_FDISK= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
TOOL_FGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}fgen
@@ -1035,7 +1036,7 @@ _MKVARS.yes= \
MKATF \
MKBINUTILS \
MKCOMPLEX MKCVS MKCXX \
- MKDOC \
+ MKDOC MKDTC \
MKDYNAMICROOT \
MKGCC MKGDB MKGROFF \
MKHESIOD MKHTML \
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.187 src/tools/Makefile:1.187.6.1
--- src/tools/Makefile:1.187 Wed Jan 11 12:08:34 2017
+++ src/tools/Makefile Tue Jul 18 17:32:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.187 2017/01/11 12:08:34 joerg Exp $
+# $NetBSD: Makefile,v 1.187.6.1 2017/07/18 17:32:50 snj Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -210,6 +210,8 @@ SUBDIR+= elftosb
.if ${MACHINE} == "evbarm" || ${MACHINE} == "evbmips" || \
${MACHINE} == "evbppc" || ${MACHINE} == "sandpoint"
SUBDIR+= mkubootimage
+SUBDIR+= libfdt .WAIT
+SUBDIR+= dtc
.endif
.if ${MKX11} != "no"
Added files:
Index: src/tools/dtc/Makefile
diff -u /dev/null src/tools/dtc/Makefile:1.2.4.2
--- /dev/null Tue Jul 18 17:32:51 2017
+++ src/tools/dtc/Makefile Tue Jul 18 17:32:50 2017
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2.4.2 2017/07/18 17:32:50 snj Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
+HOST_CPPFLAGS+= -I${LIBFDT_DIR}
+
+HOSTPROGNAME= ${_TOOL_PREFIX}dtc
+HOST_SRCDIR= external/gpl2/dtc/usr.bin/dtc
+
+FDTOBJ!= cd ${.CURDIR}/../libfdt && ${PRINTOBJDIR}
+LDADD+= -L${FDTOBJ} -lfdt
+
+.include "${.CURDIR}/../Makefile.nbincludes"
+.include "${.CURDIR}/../Makefile.host"
Index: src/tools/libfdt/Makefile
diff -u /dev/null src/tools/libfdt/Makefile:1.2.4.2
--- /dev/null Tue Jul 18 17:32:51 2017
+++ src/tools/libfdt/Makefile Tue Jul 18 17:32:50 2017
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.2.4.2 2017/07/18 17:32:50 snj Exp $
+
+HOSTLIB= fdt
+
+.include <bsd.own.mk>
+
+LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
+
+.include "${LIBFDT_DIR}/Makefile.libfdt"
+
+SRCS= ${LIBFDT_SRCS}
+
+CPPFLAGS+= -I${.CURDIR}/../compat -I${LIBFDT_DIR}
+CPPFLAGS+= -I${TOOLDIR}/include/nbinclude
+
+.PATH: ${LIBFDT_DIR}
+
+CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
+
+HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
+CPPFLAGS:= # empty
+
+.include "${.CURDIR}/../Makefile.nbincludes"
+.include <bsd.hostlib.mk>
