From owner-svn-src-head@freebsd.org Wed Mar 28 16:28:23 2018 Return-Path: Delivered-To: svn-src-head@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 00A76F6B477; Wed, 28 Mar 2018 16:28:23 +0000 (UTC) (envelope-from bdrewery@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 1E7DC74C6B; Wed, 28 Mar 2018 16:28:22 +0000 (UTC) (envelope-from bdrewery@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 13E8056BF; Wed, 28 Mar 2018 16:28:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2SGSKE6056661; Wed, 28 Mar 2018 16:28:20 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2SGSKPa056658; Wed, 28 Mar 2018 16:28:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201803281628.w2SGSKPa056658@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 28 Mar 2018 16:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331682 - in head: share/mk sys/conf X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: share/mk sys/conf X-SVN-Commit-Revision: 331682 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 16:28:23 -0000 Author: bdrewery Date: Wed Mar 28 16:28:20 2018 New Revision: 331682 URL: https://svnweb.freebsd.org/changeset/base/331682 Log: Avoid upwards directory walk in kernel build for finding known SYSDIR. Sponsored by: Dell EMC Modified: head/share/mk/bsd.dtb.mk head/share/mk/bsd.kmod.mk head/sys/conf/kmod.mk Modified: head/share/mk/bsd.dtb.mk ============================================================================== --- head/share/mk/bsd.dtb.mk Wed Mar 28 16:24:56 2018 (r331681) +++ head/share/mk/bsd.dtb.mk Wed Mar 28 16:28:20 2018 (r331682) @@ -1,6 +1,7 @@ # $FreeBSD$ # Search for kernel source tree in standard places. +.if empty(KERNBUILDDIR) .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \ ${.CURDIR}/../../../../.. /sys /usr/src/sys .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk) @@ -10,6 +11,7 @@ SYSDIR= ${_dir} .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \ !exists(${SYSDIR}/conf/kmod.mk) .error Unable to locate the kernel source tree. Set SYSDIR to override. +.endif .endif .include "${SYSDIR}/conf/dtb.mk" Modified: head/share/mk/bsd.kmod.mk ============================================================================== --- head/share/mk/bsd.kmod.mk Wed Mar 28 16:24:56 2018 (r331681) +++ head/share/mk/bsd.kmod.mk Wed Mar 28 16:28:20 2018 (r331682) @@ -1,6 +1,7 @@ # $FreeBSD$ # Search for kernel source tree in standard places. +.if empty(KERNBUILDDIR) .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \ ${.CURDIR}/../../../../.. /sys /usr/src/sys .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk) @@ -10,6 +11,7 @@ SYSDIR= ${_dir:tA} .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \ !exists(${SYSDIR}/conf/kmod.mk) .error Unable to locate the kernel source tree. Set SYSDIR to override. +.endif .endif .include "${SYSDIR}/conf/kmod.mk" Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Wed Mar 28 16:24:56 2018 (r331681) +++ head/sys/conf/kmod.mk Wed Mar 28 16:28:20 2018 (r331682) @@ -81,6 +81,7 @@ OBJCOPY?= objcopy .include "config.mk" # Search for kernel source tree in standard places. +.if empty(KERNBUILDDIR) .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys .if !defined(SYSDIR) && exists(${_dir}/kern/) SYSDIR= ${_dir:tA} @@ -88,6 +89,7 @@ SYSDIR= ${_dir:tA} .endfor .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) .error "can't find kernel source tree" +.endif .endif .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .m