From owner-svn-src-all@freebsd.org Mon Nov 12 22:18:14 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69C9B1125374; Mon, 12 Nov 2018 22:18:14 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB62B87592; Mon, 12 Nov 2018 22:18:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC56E26D36; Mon, 12 Nov 2018 22:18:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wACMID3s005328; Mon, 12 Nov 2018 22:18:13 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wACMICML005320; Mon, 12 Nov 2018 22:18:12 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811122218.wACMICML005320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 12 Nov 2018 22:18:12 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/sys/dts: . arm arm/overlays arm64 arm64/overlays mips powerpc X-SVN-Commit-Revision: 340390 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB62B87592 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2018 22:18:14 -0000 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