From owner-svn-src-all@freebsd.org Mon Nov 19 18:59:09 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 ACB371123B1D; Mon, 19 Nov 2018 18:59:09 +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 5450587195; Mon, 19 Nov 2018 18:59:09 +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 35EAD26039; Mon, 19 Nov 2018 18:59:09 +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 wAJIx9P5010086; Mon, 19 Nov 2018 18:59:09 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJIx7l3010077; Mon, 19 Nov 2018 18:59:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811191859.wAJIx7l3010077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 19 Nov 2018 18:59:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r340646 - in stable/12/sys/dts: . arm arm/overlays arm64 arm64/overlays mips powerpc X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/12/sys/dts: . arm arm/overlays arm64 arm64/overlays mips powerpc X-SVN-Commit-Revision: 340646 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5450587195 X-Spamd-Result: default: False [0.43 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.00)[-0.002,0]; NEURAL_SPAM_SHORT(0.44)[0.436,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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, 19 Nov 2018 18:59:09 -0000 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