svn commit: r340646 - in stable/12/sys/dts: . arm arm/overlays arm64 arm64/overlays mips powerpc

[Kyle Evans]

Author: kevans
Date: Mon Nov 19 18:59:06 2018
New Revision: 340646
URL: https://svnweb.freebsd.org/changeset/base/340646

Log:
  MFC r340390: Fix test-dts{,o} targets
  
  There were two main problems here:
  
  1.) sys/dts/Makefile.inc is not included from various */overlays directories
      by default, only ../Makefile.inc
  2.) When shelling out for DTS/DTSO, cwd != .CURDIR, so enumeration always
      failed
  
  These changes allow make test-dts and make test-dtso to function in their
  respective directories.

Added:
  stable/12/sys/dts/arm/Makefile.inc
     - copied unchanged from r340390, head/sys/dts/arm/Makefile.inc
  stable/12/sys/dts/arm64/Makefile.inc
     - copied unchanged from r340390, head/sys/dts/arm64/Makefile.inc
Modified:
  stable/12/sys/dts/Makefile.inc
  stable/12/sys/dts/arm/Makefile
  stable/12/sys/dts/arm/overlays/Makefile
  stable/12/sys/dts/arm64/Makefile
  stable/12/sys/dts/arm64/overlays/Makefile
  stable/12/sys/dts/mips/Makefile
  stable/12/sys/dts/powerpc/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dts/Makefile.inc
==============================================================================
--- stable/12/sys/dts/Makefile.inc	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/Makefile.inc	Mon Nov 19 18:59:06 2018	(r340646)
@@ -5,9 +5,9 @@ SYSDIR?=${SRCTOP}/sys
 test-dts:
 .for dts in ${DTS}
 	@env MACHINE=`basename ${.CURDIR}` ${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${dts} /tmp
+.endfor
 
 test-dtso:
 .for dtso in ${DTSO}
 	@env MACHINE=`basename ${.CURDIR}` ${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} ${dtso} /tmp
-
 .endfor

Modified: stable/12/sys/dts/arm/Makefile
==============================================================================
--- stable/12/sys/dts/arm/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/arm/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTS!=ls *.dts
+DTS!=ls ${.CURDIR}/*.dts
 
 all: test-dts
 

Copied: stable/12/sys/dts/arm/Makefile.inc (from r340390, head/sys/dts/arm/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/sys/dts/arm/Makefile.inc	Mon Nov 19 18:59:06 2018	(r340646, copy of r340390, head/sys/dts/arm/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: stable/12/sys/dts/arm/overlays/Makefile
==============================================================================
--- stable/12/sys/dts/arm/overlays/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/arm/overlays/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTSO!=ls *.dtso
+DTSO!=ls ${.CURDIR}/*.dtso
 
 all: test-dtso
 

Modified: stable/12/sys/dts/arm64/Makefile
==============================================================================
--- stable/12/sys/dts/arm64/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/arm64/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTS!=ls *.dts
+DTS!=ls ${.CURDIR}/*.dts
 
 all: test-dts
 

Copied: stable/12/sys/dts/arm64/Makefile.inc (from r340390, head/sys/dts/arm64/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/sys/dts/arm64/Makefile.inc	Mon Nov 19 18:59:06 2018	(r340646, copy of r340390, head/sys/dts/arm64/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: stable/12/sys/dts/arm64/overlays/Makefile
==============================================================================
--- stable/12/sys/dts/arm64/overlays/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/arm64/overlays/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTSO!=ls *.dtso
+DTSO!=ls ${.CURDIR}/*.dtso
 
 all: test-dtso
 

Modified: stable/12/sys/dts/mips/Makefile
==============================================================================
--- stable/12/sys/dts/mips/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/mips/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTS!=ls *.dts
+DTS!=ls ${.CURDIR}/*.dts
 
 all: test-dts
 

Modified: stable/12/sys/dts/powerpc/Makefile
==============================================================================
--- stable/12/sys/dts/powerpc/Makefile	Mon Nov 19 18:58:34 2018	(r340645)
+++ stable/12/sys/dts/powerpc/Makefile	Mon Nov 19 18:59:06 2018	(r340646)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DTS!=ls *.dts
+DTS!=ls ${.CURDIR}/*.dts
 
 all: test-dts