git: 4b656ded9248 - main - Refactor pre-commit CI

The branch main has been updated by bofh:

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

commit 4b656ded9248840ebc7afb8aba2384c8b0a2afb3
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2025-05-07 20:23:57 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2025-05-07 20:25:18 +0000

    Refactor pre-commit CI
    
    Currently our test mechanism is not fit for building without
    cross-toolchain as we are not allowing EXTRA_MAKE_FLAGS. Also we are not
    allowing to build and test other KERNCONF. So allow these variables to
    be overridden in command line.
    
    Approved by:    lwhsu
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D50220
---
 tests/ci/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Makefile b/tests/ci/Makefile
index e51c97fa2b83..e6464e8392e6 100644
--- a/tests/ci/Makefile
+++ b/tests/ci/Makefile
@@ -27,6 +27,7 @@ PARALLEL_JOBS!=sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null
 TOTAL_MEMORY!=expr ${_MEMORY} / 1073741824
 KERNCONF?=	GENERIC
 LOCALBASE?=	/usr/local
+EXTRA_MAKE_FLAGS?=
 
 .if !defined(TARGET) || empty(TARGET)
 TARGET=		${MACHINE}
@@ -167,15 +168,16 @@ ci-buildworld: .PHONY
 	@echo "Building world for ${TARGET_ARCH}"
 	${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
 		${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
-		buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
+		${EXTRA_MAKE_FLAGS} buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
 		(echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)
 
 
 ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY
 	@echo "Building kernel for ${TARGET_ARCH"}"
 	${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
-		${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} \
-		SRCCONF=${SRCCONF} buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
+		${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF}
+		${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} \
+		buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
 		(echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)
 
 ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY