svn commit: r325170 - in head/sys/boot/userboot: ficl test userboot zfs
Warner Losh
imp at FreeBSD.org
Mon Oct 30 23:14:24 UTC 2017
Author: imp
Date: Mon Oct 30 23:14:22 2017
New Revision: 325170
URL: https://svnweb.freebsd.org/changeset/base/325170
Log:
Use defs.mk values for userboot
Sponsored by: Netflix
Modified:
head/sys/boot/userboot/ficl/Makefile
head/sys/boot/userboot/test/Makefile
head/sys/boot/userboot/userboot/Makefile
head/sys/boot/userboot/zfs/Makefile
Modified: head/sys/boot/userboot/ficl/Makefile
==============================================================================
--- head/sys/boot/userboot/ficl/Makefile Mon Oct 30 21:26:23 2017 (r325169)
+++ head/sys/boot/userboot/ficl/Makefile Mon Oct 30 23:14:22 2017 (r325170)
@@ -1,10 +1,10 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MK_SSP= no
-.PATH: ${.CURDIR}/../../ficl
-.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
+.include "${BOOTSRC}/ficl.mk"
+
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
prefix.c search.c stack.c tools.c vm.c words.c
@@ -29,7 +29,7 @@ INTERNALLIB=
.endif
# Standard softwords
-.PATH: ${.CURDIR}/../../ficl/softwords
+.PATH: ${BOOTSRC}/ficl/softwords
SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
ifbrack.fr
# Optional OO extension softwords
@@ -43,12 +43,8 @@ SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr
CFLAGS+= -m32 -mcpu=powerpc -I.
.endif
-CFLAGS+= -I${.CURDIR}/../../ficl
-CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
-CFLAGS+= -I${.CURDIR}/../../common
-
softcore.c: ${SOFTWORDS} softcore.awk
- (cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
+ (cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \
| awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
#.if ${MACHINE_CPUARCH} == "amd64"
Modified: head/sys/boot/userboot/test/Makefile
==============================================================================
--- head/sys/boot/userboot/test/Makefile Mon Oct 30 21:26:23 2017 (r325169)
+++ head/sys/boot/userboot/test/Makefile Mon Oct 30 23:14:22 2017 (r325170)
@@ -3,13 +3,13 @@
MAN=
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MK_SSP= no
PROG= test
INTERNALPROG=
-CFLAGS+= -I${.CURDIR}/..
-CFLAGS+= -I${.CURDIR}/../../..
+CFLAGS+= -I${BOOTSRC}/userboot
+CFLAGS+= -I${SYSDIR}
.include <bsd.prog.mk>
Modified: head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile Mon Oct 30 21:26:23 2017 (r325169)
+++ head/sys/boot/userboot/userboot/Makefile Mon Oct 30 23:14:22 2017 (r325170)
@@ -2,7 +2,8 @@
MAN=
-.include <src.opts.mk>
+.include <bsd.init.mk>
+
MK_SSP= no
LOADER_MSDOS_SUPPORT?= yes
@@ -34,8 +35,8 @@ SRCS+= userboot_disk.c
SRCS+= vers.c
CFLAGS+= -Wall
-CFLAGS+= -I${.CURDIR}/..
-CFLAGS+= -I${.CURDIR}/../../..
+CFLAGS+= -I${BOOTSRC}/userboot
+CFLAGS+= -I${SYSDIR}
CFLAGS+= -ffreestanding -I.
CWARNFLAGS.main.c += -Wno-implicit-function-declaration
@@ -46,11 +47,11 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUARCH}
.if ${MK_ZFS} != "no"
CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
-LIBZFSBOOT= ${.OBJDIR}/../zfs/libzfsboot.a
+LIBZFSBOOT= ${BOOTOBJ}/userboot/zfs/libzfsboot.a
.endif
# Always add MI sources
-.include "../../loader.mk"
+.include "${BOOTSRC}/loader.mk"
CFLAGS+= -I.
DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
Modified: head/sys/boot/userboot/zfs/Makefile
==============================================================================
--- head/sys/boot/userboot/zfs/Makefile Mon Oct 30 21:26:23 2017 (r325169)
+++ head/sys/boot/userboot/zfs/Makefile Mon Oct 30 23:14:22 2017 (r325170)
@@ -1,8 +1,8 @@
# $FreeBSD$
-S= ${.CURDIR}/../../zfs
+.include <bsd.init.mk>
-.PATH: ${S} ${.CURDIR}/../../../crypto/skein
+.PATH: ${BOOTSRC}/zfs ${SYSDIR}/crypto/skein
LIB= zfsboot
INTERNALLIB=
@@ -11,10 +11,10 @@ SRCS+= zfs.c skein.c skein_block.c
# Do not unroll skein loops, reduce code size
CFLAGS+= -DSKEIN_LOOP=111
-CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
+CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I.
CFLAGS+= -I${SASRC}
-CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs
-CFLAGS+= -I${.CURDIR}/../../../crypto/skein
+CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
+CFLAGS+= -I${SYSDIR}/crypto/skein
CFLAGS+= -ffreestanding -fPIC
CFLAGS+= -Wformat -Wall
More information about the svn-src-all
mailing list