aboutsummaryrefslogtreecommitdiff
path: root/targets
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 /targets
parent6eac7115560381ce5c9e2939ab3fce82bb9b6a95 (diff)
downloadsrc-ca987d4641cdcd7f27e153db17c5bf064934faf5.tar.gz
src-ca987d4641cdcd7f27e153db17c5bf064934faf5.zip
Move sys/boot to stand. Fix all references to new location
Sponsored by: Netflix
Notes
Notes: svn path=/head/; revision=325834
Diffstat (limited to 'targets')
-rw-r--r--targets/pseudo/userland/lib/Makefile.depend2
-rw-r--r--targets/pseudo/userland/misc/Makefile.depend66
-rw-r--r--targets/pseudo/userland/share/Makefile.depend2
3 files changed, 35 insertions, 35 deletions
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index c9a880aec3aa..7410751c77b4 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -196,7 +196,7 @@ DIRDEPS+= \
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
${MACHINE_CPUARCH} == "powerpc"
-DIRDEPS+= sys/boot/libsa32
+DIRDEPS+= stand/libsa32
.endif
.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index 6d473ea1f88c..7b4700a5d201 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -6,12 +6,12 @@
.include <src.opts.mk>
.endif
-_sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1
+_sys_boot_efi= stand/efi/loader stand/efi/boot1
.if ${MK_FDT} != "no"
-_sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt
+_sys_boot_fdt= stand/fdt stand/efi/fdt
.endif
.if ${MK_ZFS} != "no"
-_sys_boot_zfs= sys/boot/zfs
+_sys_boot_zfs= stand/zfs
.endif
DIRDEPS = \
@@ -22,40 +22,40 @@ DIRDEPS = \
rescue/rescue \
.if ${MK_BOOT} != "no"
-DIRDEPS+= sys/boot/common
+DIRDEPS+= stand/common
.if ${MK_FORTH} != "no"
DIRDEPS+= \
- sys/boot/ficl \
- sys/boot/forth \
+ stand/ficl \
+ stand/forth \
.endif
DIRDEPS.x86sys= \
- sys/boot/efi/libefi \
- sys/boot/geli \
- sys/boot/i386/boot0 \
- sys/boot/i386/boot0sio \
- sys/boot/i386/boot2 \
- sys/boot/i386/btx/btx \
- sys/boot/i386/btx/btxldr \
- sys/boot/i386/btx/lib \
- sys/boot/i386/cdboot \
- sys/boot/i386/gptboot \
- sys/boot/i386/libfirewire \
- sys/boot/i386/libi386 \
- sys/boot/i386/loader \
- sys/boot/i386/mbr \
- sys/boot/i386/pmbr \
- sys/boot/i386/pxeldr \
- sys/boot/libsa32 \
+ stand/efi/libefi \
+ stand/geli \
+ stand/i386/boot0 \
+ stand/i386/boot0sio \
+ stand/i386/boot2 \
+ stand/i386/btx/btx \
+ stand/i386/btx/btxldr \
+ stand/i386/btx/lib \
+ stand/i386/cdboot \
+ stand/i386/gptboot \
+ stand/i386/libfirewire \
+ stand/i386/libi386 \
+ stand/i386/loader \
+ stand/i386/mbr \
+ stand/i386/pmbr \
+ stand/i386/pxeldr \
+ stand/libsa32 \
${_sys_boot_zfs} \
.if ${MK_ZFS} != "no"
DIRDEPS.x86sys+= \
- sys/boot/i386/gptzfsboot \
- sys/boot/i386/zfsboot \
- sys/boot/i386/zfsloader \
+ stand/i386/gptzfsboot \
+ stand/i386/zfsboot \
+ stand/i386/zfsloader \
DIRDEPS+= \
sbin/zfsbootcfg \
@@ -65,13 +65,13 @@ DIRDEPS+= \
DIRDEPS.amd64= \
${DIRDEPS.x86sys} \
${_sys_boot_efi} \
- sys/boot/ficl32 \
- sys/boot/userboot/test \
- sys/boot/userboot/userboot \
+ stand/ficl32 \
+ stand/userboot/test \
+ stand/userboot/userboot \
.if ${MK_ZFS} != "no"
DIRDEPS.amd64+= \
- sys/boot/zfs32 \
+ stand/zfs32 \
.endif
@@ -83,9 +83,9 @@ DIRDEPS+= \
DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
-DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} sys/boot/i386/kgzldr
-DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libsa32 sys/boot/ofw sys/boot/uboot
-DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs}
+DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} stand/i386/kgzldr
+DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot
+DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs}
.endif
DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend
index 3bac4b78d4a8..9946a8370552 100644
--- a/targets/pseudo/userland/share/Makefile.depend
+++ b/targets/pseudo/userland/share/Makefile.depend
@@ -91,7 +91,7 @@ DIRDEPS = \
share/xml/atf \
share/xsl/atf \
share/zoneinfo \
- sys/boot/man \
+ stand/man \
.include <dirdeps.mk>