Date: Mon, 12 Nov 2018 22:18:12 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340390 - in head/sys/dts: . arm arm/overlays arm64 arm64/overlays mips powerpc Message-ID: <201811122218.wACMICML005320@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Mon Nov 12 22:18:11 2018 New Revision: 340390 URL: https://svnweb.freebsd.org/changeset/base/340390 Log: 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. Reviewed by: manu MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17961 Added: head/sys/dts/arm/Makefile.inc (contents, props changed) head/sys/dts/arm64/Makefile.inc (contents, props changed) Modified: head/sys/dts/Makefile.inc head/sys/dts/arm/Makefile head/sys/dts/arm/overlays/Makefile head/sys/dts/arm64/Makefile head/sys/dts/arm64/overlays/Makefile head/sys/dts/mips/Makefile head/sys/dts/powerpc/Makefile Modified: head/sys/dts/Makefile.inc ============================================================================== --- head/sys/dts/Makefile.inc Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/Makefile.inc Mon Nov 12 22:18:11 2018 (r340390) @@ -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: head/sys/dts/arm/Makefile ============================================================================== --- head/sys/dts/arm/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/arm/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTS!=ls *.dts +DTS!=ls ${.CURDIR}/*.dts all: test-dts Added: head/sys/dts/arm/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dts/arm/Makefile.inc Mon Nov 12 22:18:11 2018 (r340390) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Modified: head/sys/dts/arm/overlays/Makefile ============================================================================== --- head/sys/dts/arm/overlays/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/arm/overlays/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTSO!=ls *.dtso +DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso Modified: head/sys/dts/arm64/Makefile ============================================================================== --- head/sys/dts/arm64/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/arm64/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTS!=ls *.dts +DTS!=ls ${.CURDIR}/*.dts all: test-dts Added: head/sys/dts/arm64/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dts/arm64/Makefile.inc Mon Nov 12 22:18:11 2018 (r340390) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Modified: head/sys/dts/arm64/overlays/Makefile ============================================================================== --- head/sys/dts/arm64/overlays/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/arm64/overlays/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTSO!=ls *.dtso +DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso Modified: head/sys/dts/mips/Makefile ============================================================================== --- head/sys/dts/mips/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/mips/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTS!=ls *.dts +DTS!=ls ${.CURDIR}/*.dts all: test-dts Modified: head/sys/dts/powerpc/Makefile ============================================================================== --- head/sys/dts/powerpc/Makefile Mon Nov 12 21:53:47 2018 (r340389) +++ head/sys/dts/powerpc/Makefile Mon Nov 12 22:18:11 2018 (r340390) @@ -1,6 +1,6 @@ # $FreeBSD$ -DTS!=ls *.dts +DTS!=ls ${.CURDIR}/*.dts all: test-dts
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811122218.wACMICML005320>