From owner-svn-src-all@freebsd.org Sat Oct 19 07:16:21 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 921A715BB90; Sat, 19 Oct 2019 07:16:21 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46wDj13PT2z3P11; Sat, 19 Oct 2019 07:16:21 +0000 (UTC) (envelope-from avg@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 53E1A1EF0B; Sat, 19 Oct 2019 07:16:21 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9J7GLOC058825; Sat, 19 Oct 2019 07:16:21 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9J7GL03058824; Sat, 19 Oct 2019 07:16:21 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201910190716.x9J7GL03058824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 19 Oct 2019 07:16:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353749 - head X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 353749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 19 Oct 2019 07:16:21 -0000 Author: avg Date: Sat Oct 19 07:16:20 2019 New Revision: 353749 URL: https://svnweb.freebsd.org/changeset/base/353749 Log: buildkernel: always add standard kernel configuration include path This should change nothing for kernel configurations at the standard locations in the source tree. However, if KERNCONFDIR is used to specify a custom location for a kernel configuration file (e.g., out of tree), then both the custom location and the standard location, in this order, will be used as include paths for config(8). This will allow the kernel configuration to include files from both locations. Reviewed by: bdrewery MFC after: 16 days Differential Revision: https://reviews.freebsd.org/D22057 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Oct 19 07:13:15 2019 (r353748) +++ head/Makefile.inc1 Sat Oct 19 07:16:20 2019 (r353749) @@ -1653,7 +1653,8 @@ buildkernel: .MAKE .PHONY cd ${KRNLCONFDIR}; \ PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ - -I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}' + -I '${KERNCONFDIR}' -I '${KRNLCONFDIR}' \ + '${KERNCONFDIR}/${_kernel}' .endif .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo