From owner-svn-src-all@freebsd.org  Sun Oct 22 22:50:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCEABE38C31;
 Sun, 22 Oct 2017 22:50:29 +0000 (UTC) (envelope-from imp@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 mx1.freebsd.org (Postfix) with ESMTPS id 8517A7C6FE;
 Sun, 22 Oct 2017 22:50:29 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MMoSGC001828;
 Sun, 22 Oct 2017 22:50:28 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MMoS5N001825;
 Sun, 22 Oct 2017 22:50:28 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710222250.v9MMoS5N001825@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 22 Oct 2017 22:50:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324881 - in head/sys/boot: geli libsa uboot/lib
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys/boot: geli libsa uboot/lib
X-SVN-Commit-Revision: 324881
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 22:50:30 -0000

Author: imp
Date: Sun Oct 22 22:50:28 2017
New Revision: 324881
URL: https://svnweb.freebsd.org/changeset/base/324881

Log:
  Use SYSDIR instead of ${.CURDIR}/../..<etc>/sys.
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/geli/Makefile
  head/sys/boot/libsa/Makefile
  head/sys/boot/uboot/lib/Makefile

Modified: head/sys/boot/geli/Makefile
==============================================================================
--- head/sys/boot/geli/Makefile	Sun Oct 22 22:50:23 2017	(r324880)
+++ head/sys/boot/geli/Makefile	Sun Oct 22 22:50:28 2017	(r324881)
@@ -5,6 +5,7 @@ MAN=
 
 .include <src.opts.mk>
 MK_SSP=		no
+.include <bsd.init.mk>
 
 LIB=		geliboot
 INTERNALLIB=
@@ -28,7 +29,7 @@ SRCS+=  bcmp.c bcopy.c bzero.c
 SRCS+=  pwgets.c
 
 # sha256 and sha512 from sys/crypto
-.PATH: ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SYSDIR}/crypto/sha2
 CFLAGS+=	-DWEAK_REFS
 SRCS+=		sha256c.c sha512c.c
 
@@ -37,15 +38,15 @@ SRCS+=		sha256c.c sha512c.c
 SRCS+=		md5c.c
 
 # AES implementation from sys/crypto
-.PATH: ${SRCTOP}/sys/crypto/rijndael
-CFLAGS+=	-I${.CURDIR}/../../
+.PATH: ${SYSDIR}/crypto/rijndael
+CFLAGS+=	-I${SYSDIR}
 CFLAGS+=	-I${.CURDIR}/../common/
 # Remove asserts
 CFLAGS+=	-DNDEBUG
 SRCS+=		rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c
 
 # local GELI Implementation
-.PATH: ${SRCTOP}/sys/geom/eli
+.PATH: ${SYSDIR}/geom/eli
 CFLAGS+=	-D_STAND
 SRCS+=		geliboot_crypto.c g_eli_hmac.c g_eli_key.c g_eli_key_cache.c pkcs5v2.c
 

Modified: head/sys/boot/libsa/Makefile
==============================================================================
--- head/sys/boot/libsa/Makefile	Sun Oct 22 22:50:23 2017	(r324880)
+++ head/sys/boot/libsa/Makefile	Sun Oct 22 22:50:28 2017	(r324881)
@@ -154,7 +154,7 @@ SRCS+=	nandfs.c
 .endif
 
 # explicit_bzero
-.PATH: ${SRCTOP}/sys/libkern
+.PATH: ${SYSDIR}/libkern
 SRCS+=  explicit_bzero.c
 
 .include <bsd.stand.mk>

Modified: head/sys/boot/uboot/lib/Makefile
==============================================================================
--- head/sys/boot/uboot/lib/Makefile	Sun Oct 22 22:50:23 2017	(r324880)
+++ head/sys/boot/uboot/lib/Makefile	Sun Oct 22 22:50:28 2017	(r324881)
@@ -28,7 +28,7 @@ CFLAGS+= -DLOADER_FDT_SUPPORT -I${.CURDIR}/../../fdt
 .endif
 
 # Pick up FDT includes
-CFLAGS+=	-I${.CURDIR}/../../../../sys/contrib/libfdt/
+CFLAGS+=	-I${SYSDIR}/contrib/libfdt/
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.