git: aa59f16dae9c - stable/15 - __FreeBSD_version: Bump for mkimg -f vmdks

The branch stable/15 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=aa59f16dae9ce8166a2b11160af08c6fa099e79e

commit aa59f16dae9ce8166a2b11160af08c6fa099e79e
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-09-29 19:44:41 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-17 17:02:27 +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
    X-Cherry-Pick:  Logic in Makefile.inc1 was adjusted for new __FreeBSD_version
    
    (cherry picked from commit a68ba2d2ce55f7c76174239c1f678379caec5348)
---
 Makefile.inc1   | 8 +++++---
 sys/sys/param.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 162951157c2d..c6501016729a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2652,11 +2652,13 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
 .endif
 .endif
 
-# 1300102: VHDX support
-.if ${BOOTSTRAPPING} < 1201520 || \
-	(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \
+# 1600027, 1501504: vmdks support
+.if ${BOOTSTRAPPING} < 1501504 || \
+	(${BOOTSTRAPPING} > 1600000 && ${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 4e0454a0f432..c4297ff9e577 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 1501503
+#define __FreeBSD_version 1501504
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,