aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-11-14 23:02:19 +0000
committerWarner Losh <imp@FreeBSD.org>2017-11-14 23:02:19 +0000
commitca987d4641cdcd7f27e153db17c5bf064934faf5 (patch)
tree6c3860e3ba8949be9528d644fbb7fa88d8bbbb79 /tools
parent6eac7115560381ce5c9e2939ab3fce82bb9b6a95 (diff)
Notes
Diffstat (limited to 'tools')
-rwxr-xr-xtools/boot/universe.sh6
-rw-r--r--tools/tools/bootparttest/Makefile4
-rw-r--r--tools/tools/zfsboottest/Makefile4
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh
index 3b607b4c4a1a2..495e84b1ebaa2 100755
--- a/tools/boot/universe.sh
+++ b/tools/boot/universe.sh
@@ -11,8 +11,8 @@
# powerpc/powerpc powerpc/powerpc64 powerpc/powerpcspe \
# riscv/riscv64 riscv/riscv64sf
#
-# This script is expected to be run in sys/boot (though you could run it anywhere
-# in the tree). It does a full clean build. For sys/boot you can do all the archs in
+# This script is expected to be run in stand (though you could run it anywhere
+# in the tree). It does a full clean build. For stand you can do all the archs in
# about a minute or two on a fast machine. It's also possible that you need a full
# make universe for this to work completely.
#
@@ -40,7 +40,7 @@ dobuild()
}
top=$(make -V SRCTOP)
-cd $top/sys/boot
+cd $top/stand
# Default build for a goodly selection of architectures
for i in \
diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile
index 026f83ea647de..7d54dfca04275 100644
--- a/tools/tools/bootparttest/Makefile
+++ b/tools/tools/bootparttest/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${SRCTOP}/sys/boot/common
+.PATH: ${SRCTOP}/stand/common
BINDIR?= /usr/bin
@@ -9,7 +9,7 @@ MAN=
SRCS= bootparttest.c crc32.c stub.c part.c disk.c
-CFLAGS= -I${SRCTOP}/sys/boot/common \
+CFLAGS= -I${SRCTOP}/stand/common \
-DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \
-DDISK_DEBUG
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index 1f6084effa0a3..acb510de70a90 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${SRCTOP}/sys/boot/zfs ${SRCTOP}/sys/cddl/boot/zfs
+.PATH: ${SRCTOP}/stand/zfs ${SRCTOP}/sys/cddl/boot/zfs
BINDIR?= /usr/bin
SCRIPTSDIR?= /usr/bin
@@ -11,7 +11,7 @@ SCRIPTSNAME= zfsboottest.sh
MAN=
CFLAGS= -O1 \
- -I${SRCTOP}/sys/boot/zfs \
+ -I${SRCTOP}/stand/zfs \
-I${SRCTOP}/sys/cddl/boot/zfs \
-I. \
-fdiagnostics-show-option \