svn commit: r324881 - in head/sys/boot: geli libsa uboot/lib

[Warner Losh]

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.