git: a68ba2d2ce55 - main - __FreeBSD_version: Bump for mkimg -f vmdks
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 03 Oct 2026 15:42:45 UTC
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=a68ba2d2ce55f7c76174239c1f678379caec5348
commit a68ba2d2ce55f7c76174239c1f678379caec5348
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-09-29 19:44:41 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-03 15:42:20 +0000
__FreeBSD_version: Bump for mkimg -f vmdks
Also, adjust bootstrap tools code in Makefile.inc1 to reflect this; in
addition to rebuilding mkimg if it is out of date, we now need to build
libz, which was not previously needed by mkimg.
Reviewed by: kevans
MFC after: 2 weeks
Sponsored by: Amazon
Differential Revision: https://reviews.freebsd.org/D60153
---
Makefile.inc1 | 7 ++++---
sys/sys/param.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index b457a46febfe..1c2ea853dc91 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2660,11 +2660,12 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
.endif
.endif
-# 1300102: VHDX support
-.if ${BOOTSTRAPPING} < 1201520 || \
- (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \
+# 1600027: vmdks support
+.if ${BOOTSTRAPPING} < 1600027 || \
${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no"
_mkimg= usr.bin/mkimg
+${_bt}-usr.bin/mkimg: ${_bt}-lib/libz
+_other_bootstrap_tools+=lib/libz
.else
_bootstrap_tools_links+=mkimg
.endif
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 5b14612a228a..73efc74c8307 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -74,7 +74,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1600026
+#define __FreeBSD_version 1600027
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,