Page MenuHomeFreeBSD
Files F177556333

D39072.1794711730.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D39072.1794711730.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2301,8 +2301,8 @@
# r245440 mtree -N support added
# r313404 requires sha384.h for libnetbsd, added to libmd in r292782
.if ${BOOTSTRAPPING} < 1100093
+_libnetbsd= lib/libnetbsd
_nmtree= lib/libmd \
- lib/libnetbsd \
usr.sbin/nmtree
${_bt}-lib/libnetbsd: ${_bt}-lib/libmd
@@ -2335,9 +2335,22 @@
_bootstrap_tools_links+=crunchgen
.endif
+.if ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no"
+_etdump= usr.bin/etdump
+_makefs= usr.sbin/makefs
+
+.if defined(BOOTSTRAP_ALL_TOOLS)
+_libnetbsd= lib/libnetbsd
+_libsbuf= lib/libsbuf
+${_bt}-usr.sbin/makefs: ${_bt}-lib/libnetbsd
+${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
+.endif
+.endif
+
# 1300102: VHDX support
.if ${BOOTSTRAPPING} < 1201520 || \
- (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102)
+ (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \
+ ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no"
_mkimg= usr.bin/mkimg
.else
_bootstrap_tools_links+=mkimg
@@ -2538,6 +2551,10 @@
${_flua} \
${_crunchide} \
${_crunchgen} \
+ ${_etdump} \
+ ${_libnetbsd} \
+ ${_libsbuf} \
+ ${_makefs} \
${_mkimg} \
${_nmtree} \
${_vtfontcvt} \
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -569,6 +569,13 @@
.Pa /etc/src-env.conf ,
not
.Pa /etc/src.conf .
+.It Va WITH_DISK_IMAGE_TOOLS_BOOTSTRAP
+Build
+.Xr etdump 1 ,
+.Xr makefs 8
+and
+.Xr mkimg 1
+as bootstrap tools.
.It Va WITHOUT_DMAGENT
Do not build dma Mail Transport Agent.
.It Va WITHOUT_DOCCOMPRESS
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -197,6 +197,7 @@
CLANG_EXTRAS \
CLANG_FORMAT \
DETECT_TZ_CHANGES \
+ DISK_IMAGE_TOOLS_BOOTSTRAP \
DTRACE_TESTS \
EXPERIMENTAL \
HESIOD \
diff --git a/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP
@@ -0,0 +1,6 @@
+Build
+.Xr etdump 1 ,
+.Xr makefs 8
+and
+.Xr mkimg 1
+as bootstrap tools.

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 15, 3:02 AM (2 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41736664
Default Alt Text
D39072.1794711730.diff (2 KB)

Event Timeline