git: 7ccf9ae50ce4 - main - Makefile.inc1: Adjust mkimg bootstrap versions

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Sat, 17 Oct 2026 17:16:23 UTC

The branch main has been updated by cperciva:

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

commit 7ccf9ae50ce4e3df8ec2acd1e36aa4f6390629d1
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-10-17 17:09:41 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-17 17:09:41 +0000

    Makefile.inc1: Adjust mkimg bootstrap versions
    
    Stream-optimized VMDK support was merged to stable/15 with
    __FreeBSD_version 1501504.
    
    Sponsored by:   Amazon
---
 Makefile.inc1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 813630a372ac..fa5cfc433214 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2695,8 +2695,9 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
 .endif
 .endif
 
-# 1600027: vmdks support
-.if ${BOOTSTRAPPING} < 1600027 || \
+# 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