Module Name: src
Committed By: martin
Date: Mon Dec 4 09:44:33 UTC 2017
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/conf: Makefile.kern.inc
Log Message:
We use .BEGIN for our own cleanup and won't ever need DTS support - so
avoid inclusion of dts.mk by defining _SKIP_DTS
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.260 -r1.261 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.82 src/sys/arch/sparc64/conf/Makefile.sparc64:1.83
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.82 Sat Mar 19 18:50:25 2016
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Mon Dec 4 09:44:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.82 2016/03/19 18:50:25 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.83 2017/12/04 09:44:33 martin Exp $
#=========================================================================
#
@@ -162,6 +162,7 @@ cpu_in_cksum.o lock_stubs.o: assym.h
##
## (9) port independent kernel machinery
##
+_SKIP_DTS=yes
.include "$S/conf/Makefile.kern.inc"
##
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.260 src/sys/conf/Makefile.kern.inc:1.261
--- src/sys/conf/Makefile.kern.inc:1.260 Sat Jul 15 15:20:52 2017
+++ src/sys/conf/Makefile.kern.inc Mon Dec 4 09:44:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.260 2017/07/15 15:20:52 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.261 2017/12/04 09:44:33 martin Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -321,7 +321,9 @@ ${_s:T:R}.o: ${_s}
.include "${S}/conf/cscope.mk"
.include "${S}/conf/gdbinit.mk"
.include "${S}/conf/ssp.mk"
+.if "${_SKIP_DTS}" != "yes"
.include "${S}/conf/dts.mk"
+.endif
##
## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
