Build host tools on non-FreeBSD host with DIRDEPS_BUILD
Add Makefile.depend.options to libnetbsd, mkimg and makefs to ensure libegacy is build if needed. targets/pseudo/stage/Makefile avoid the need for mtree the staging process creates target dirs as needed anyway. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39757
This commit is contained in:
parent
db98bc2c0d
commit
188bf8876f
6
lib/libnetbsd/Makefile.depend.options
Normal file
6
lib/libnetbsd/Makefile.depend.options
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
DIRDEPS_OPTIONS = host_egacy
|
||||||
|
|
||||||
|
DIRDEPS.host_egacy.yes = tools/build
|
||||||
|
|
||||||
|
.include <dirdeps-options.mk>
|
||||||
|
|
1
targets/pseudo/host-tools/Makefile
Normal file
1
targets/pseudo/host-tools/Makefile
Normal file
@ -0,0 +1 @@
|
|||||||
|
.include "../Makefile.inc"
|
7
targets/pseudo/host-tools/Makefile.depend.host
Normal file
7
targets/pseudo/host-tools/Makefile.depend.host
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
DIRDEPS= \
|
||||||
|
usr.bin/mkimg \
|
||||||
|
usr.bin/tar \
|
||||||
|
usr.sbin/makefs \
|
||||||
|
|
||||||
|
.include <dirdeps.mk>
|
||||||
|
|
@ -4,6 +4,7 @@
|
|||||||
# distrib-dirs can be done in STAGE_OBJTOP
|
# distrib-dirs can be done in STAGE_OBJTOP
|
||||||
all:
|
all:
|
||||||
|
|
||||||
|
.if ${.MAKE.OS} == "FreeBSD"
|
||||||
# mtree makes a lot of noise if we are not root,
|
# mtree makes a lot of noise if we are not root,
|
||||||
# we don't need to see it.
|
# we don't need to see it.
|
||||||
stage-distrib-dirs: .META ${META_DEPS}
|
stage-distrib-dirs: .META ${META_DEPS}
|
||||||
@ -11,6 +12,21 @@ stage-distrib-dirs: .META ${META_DEPS}
|
|||||||
INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \
|
INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \
|
||||||
distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP}
|
distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP}
|
||||||
|
|
||||||
|
.else
|
||||||
|
std_dirs= \
|
||||||
|
/bin \
|
||||||
|
/etc \
|
||||||
|
/sbin \
|
||||||
|
/usr/bin \
|
||||||
|
/usr/include/sys \
|
||||||
|
/usr/lib \
|
||||||
|
/usr/sbin \
|
||||||
|
|
||||||
|
stage-distrib-dirs: .META
|
||||||
|
mkdir -p ${std_dirs:@d@${STAGE_OBJTOP}$d@}
|
||||||
|
|
||||||
|
.endif
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
.if ${.MAKE.LEVEL} > 0 && ${MK_STAGING} == "yes"
|
.if ${.MAKE.LEVEL} > 0 && ${MK_STAGING} == "yes"
|
||||||
|
11
usr.bin/mkimg/Makefile.depend.host
Normal file
11
usr.bin/mkimg/Makefile.depend.host
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
# Autogenerated - do NOT edit!
|
||||||
|
|
||||||
|
DIRDEPS = \
|
||||||
|
|
||||||
|
|
||||||
|
.include <dirdeps.mk>
|
||||||
|
|
||||||
|
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||||
|
# local dependencies - needed for -jN in clean tree
|
||||||
|
.endif
|
6
usr.bin/mkimg/Makefile.depend.options
Normal file
6
usr.bin/mkimg/Makefile.depend.options
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
DIRDEPS_OPTIONS = host_egacy
|
||||||
|
|
||||||
|
DIRDEPS.host_egacy.yes = tools/build
|
||||||
|
|
||||||
|
.include <dirdeps-options.mk>
|
||||||
|
|
12
usr.sbin/makefs/Makefile.depend.host
Normal file
12
usr.sbin/makefs/Makefile.depend.host
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
# Autogenerated - do NOT edit!
|
||||||
|
|
||||||
|
DIRDEPS = \
|
||||||
|
lib/libnetbsd \
|
||||||
|
|
||||||
|
|
||||||
|
.include <dirdeps.mk>
|
||||||
|
|
||||||
|
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||||
|
# local dependencies - needed for -jN in clean tree
|
||||||
|
.endif
|
6
usr.sbin/makefs/Makefile.depend.options
Normal file
6
usr.sbin/makefs/Makefile.depend.options
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
DIRDEPS_OPTIONS = host_egacy
|
||||||
|
|
||||||
|
DIRDEPS.host_egacy.yes = tools/build
|
||||||
|
|
||||||
|
.include <dirdeps-options.mk>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user