Date: Tue, 16 Apr 2024 02:34:34 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b5cd844a564a - stable/14 - loader: add target for dirdeps build Message-ID: <202404160234.43G2YYR0037214@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b5cd844a564a8c9199a193caa89bd7984a53850b commit b5cd844a564a8c9199a193caa89bd7984a53850b Author: Stephen J. Kiernan <stevek@FreeBSD.org> AuthorDate: 2023-11-02 23:33:45 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-04-16 02:32:03 +0000 loader: add target for dirdeps build Update dependencies for the loader variations used for each architecture. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D39741 (cherry picked from commit 2008043f386721d58158e37e0d7e50df8095942d) --- share/mk/local.dirdeps-options.mk | 2 ++ share/mk/local.dirdeps.mk | 4 ++++ stand/efi/fdt/Makefile.depend | 3 +-- stand/efi/libefi/Makefile.depend | 1 + stand/efi/loader/Makefile.depend | 3 ++- stand/efi/loader/Makefile.depend.arm | 1 - stand/efi/loader/Makefile.depend.arm64 | 1 - stand/efi/loader/Makefile.depend.options | 7 +++++++ stand/efi/loader/Makefile.depend.riscv | 16 ++++++++++++++++ stand/fdt/Makefile.depend | 3 +-- stand/ficl/Makefile.depend | 1 + stand/i386/libi386/Makefile.depend | 3 ++- stand/i386/loader/Makefile.depend | 1 - stand/i386/loader/Makefile.depend.options | 10 ++++++++++ stand/i386/loader_lua/Makefile.depend | 11 +++++++++++ stand/lua/Makefile.depend | 10 ++++++++++ stand/powerpc/ofw/Makefile.depend | 12 ++++++++++++ stand/uboot/Makefile.depend.options | 9 +++++++++ targets/pseudo/loader/Makefile | 1 + targets/pseudo/loader/Makefile.depend.amd64 | 7 +++++++ targets/pseudo/loader/Makefile.depend.arm | 8 ++++++++ targets/pseudo/loader/Makefile.depend.arm64 | 7 +++++++ targets/pseudo/loader/Makefile.depend.i386 | 7 +++++++ targets/pseudo/loader/Makefile.depend.powerpc | 7 +++++++ targets/pseudo/loader/Makefile.depend.riscv | 7 +++++++ 25 files changed, 133 insertions(+), 9 deletions(-) diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk index 9e7f7bbd963c..4eef5311375e 100644 --- a/share/mk/local.dirdeps-options.mk +++ b/share/mk/local.dirdeps-options.mk @@ -24,4 +24,6 @@ DIRDEPS.OPENSSL.no+= lib/libmd DIRDEPS.PAM_SUPPORT.yes+= lib/libpam/libpam DIRDEPS.TCP_WRAPPERS.yes+= lib/libwrap +MK_FDT.${DEP_MACHINE} ?= yes + .-include <site.dirdeps-options.mk> diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 7b4a1fdf426d..76860920a3f1 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -5,6 +5,10 @@ .include "${SRCTOP}/share/mk/src.opts.mk" .endif +# Machine-specific MK settings needed for Makefile.dirdeps.options usage +MK_FDT.i386 = no +MK_FDT.amd64 = no + # making universe is special .if defined(UNIVERSE_GUARD) # these should be done by now diff --git a/stand/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend index 15a1f9c07f7c..18537add9fe3 100644 --- a/stand/efi/fdt/Makefile.depend +++ b/stand/efi/fdt/Makefile.depend @@ -1,8 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ + stand/libsa \ .include <dirdeps.mk> diff --git a/stand/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend index 18537add9fe3..8a29d17bb768 100644 --- a/stand/efi/libefi/Makefile.depend +++ b/stand/efi/libefi/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ stand/libsa \ + usr.bin/awk.host \ .include <dirdeps.mk> diff --git a/stand/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend index 96a148bee2d7..ae9e6b6efaa4 100644 --- a/stand/efi/loader/Makefile.depend +++ b/stand/efi/loader/Makefile.depend @@ -1,9 +1,10 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ stand/efi/libefi \ - stand/ficl \ stand/libsa \ + usr.bin/awk.host \ .include <dirdeps.mk> diff --git a/stand/efi/loader/Makefile.depend.arm b/stand/efi/loader/Makefile.depend.arm index 8eb92e94c6e0..4ba1445d8a5f 100644 --- a/stand/efi/loader/Makefile.depend.arm +++ b/stand/efi/loader/Makefile.depend.arm @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/stand/efi/loader/Makefile.depend.arm64 b/stand/efi/loader/Makefile.depend.arm64 index 8eb92e94c6e0..4ba1445d8a5f 100644 --- a/stand/efi/loader/Makefile.depend.arm64 +++ b/stand/efi/loader/Makefile.depend.arm64 @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/stand/efi/loader/Makefile.depend.options b/stand/efi/loader/Makefile.depend.options new file mode 100644 index 000000000000..20292bab9bcd --- /dev/null +++ b/stand/efi/loader/Makefile.depend.options @@ -0,0 +1,7 @@ +# options that impact our dependencies +DIRDEPS_OPTIONS = LOADER_LUA + +DIRDEPS.LOADER_LUA.yes += \ + stand/liblua \ + +.include <dirdeps-options.mk> diff --git a/stand/efi/loader/Makefile.depend.riscv b/stand/efi/loader/Makefile.depend.riscv new file mode 100644 index 000000000000..4ba1445d8a5f --- /dev/null +++ b/stand/efi/loader/Makefile.depend.riscv @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + bin/sh.host \ + stand/efi/fdt \ + stand/efi/libefi \ + stand/fdt \ + stand/libsa \ + usr.bin/awk.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/fdt/Makefile.depend b/stand/fdt/Makefile.depend index 15a1f9c07f7c..18537add9fe3 100644 --- a/stand/fdt/Makefile.depend +++ b/stand/fdt/Makefile.depend @@ -1,8 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ + stand/libsa \ .include <dirdeps.mk> diff --git a/stand/ficl/Makefile.depend b/stand/ficl/Makefile.depend index 18537add9fe3..8a29d17bb768 100644 --- a/stand/ficl/Makefile.depend +++ b/stand/ficl/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ stand/libsa \ + usr.bin/awk.host \ .include <dirdeps.mk> diff --git a/stand/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend index 18537add9fe3..15a1f9c07f7c 100644 --- a/stand/i386/libi386/Makefile.depend +++ b/stand/i386/libi386/Makefile.depend @@ -1,7 +1,8 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - stand/libsa \ + include \ + include/xlocale \ .include <dirdeps.mk> diff --git a/stand/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend index 9262a05207b6..c687ef93d84e 100644 --- a/stand/i386/loader/Makefile.depend +++ b/stand/i386/loader/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - stand/ficl \ stand/i386/btx/btx \ stand/i386/btx/btxldr \ stand/i386/btx/lib \ diff --git a/stand/i386/loader/Makefile.depend.options b/stand/i386/loader/Makefile.depend.options new file mode 100644 index 000000000000..7527fa4bda17 --- /dev/null +++ b/stand/i386/loader/Makefile.depend.options @@ -0,0 +1,10 @@ +DIRDEPS_OPTIONS = FORTH LOADER_LUA + +DIRDEPS.FORTH.yes += \ + stand/ficl \ + +DIRDEPS.LOADER_LUA.yes += \ + stand/liblua \ + stand/lua \ + +.include <dirdeps-options.mk> diff --git a/stand/i386/loader_lua/Makefile.depend b/stand/i386/loader_lua/Makefile.depend new file mode 100644 index 000000000000..993ab0638f4a --- /dev/null +++ b/stand/i386/loader_lua/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/lua/Makefile.depend b/stand/lua/Makefile.depend new file mode 100644 index 000000000000..11aba52f82cf --- /dev/null +++ b/stand/lua/Makefile.depend @@ -0,0 +1,10 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/powerpc/ofw/Makefile.depend b/stand/powerpc/ofw/Makefile.depend new file mode 100644 index 000000000000..15a1f9c07f7c --- /dev/null +++ b/stand/powerpc/ofw/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/uboot/Makefile.depend.options b/stand/uboot/Makefile.depend.options new file mode 100644 index 000000000000..d70bc7edd168 --- /dev/null +++ b/stand/uboot/Makefile.depend.options @@ -0,0 +1,9 @@ +DIRDEPS_OPTIONS = FORTH LOADER_LUA + +DIRDEPS.FORTH.yes += \ + stand/ficl \ + +DIRDEPS.LOADER_LUA.yes += \ + stand/lua \ + +.include <dirdeps-options.mk> diff --git a/targets/pseudo/loader/Makefile b/targets/pseudo/loader/Makefile new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/targets/pseudo/loader/Makefile @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/targets/pseudo/loader/Makefile.depend.amd64 b/targets/pseudo/loader/Makefile.depend.amd64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.amd64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.arm b/targets/pseudo/loader/Makefile.depend.arm new file mode 100644 index 000000000000..d23148b537fe --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm @@ -0,0 +1,8 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + stand/uboot \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.arm64 b/targets/pseudo/loader/Makefile.depend.arm64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.i386 b/targets/pseudo/loader/Makefile.depend.i386 new file mode 100644 index 000000000000..29a2092b8203 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.i386 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/i386/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.powerpc b/targets/pseudo/loader/Makefile.depend.powerpc new file mode 100644 index 000000000000..6c481c73d253 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.powerpc @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/uboot \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.riscv b/targets/pseudo/loader/Makefile.depend.riscv new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.riscv @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404160234.43G2YYR0037214>