Date: Mon, 4 Dec 2023 10:39:35 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8bc5e4f54b40 - stable/13 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 Message-ID: <202312041039.3B4AdZbo010152@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 commit 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2023-12-04 10:38:05 +0000 pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 PACKAGE_BUILDING is already known in the ports tree as a variable use to defined when the packages is being actually built in an automation process, reuse that variable to define the default set of kernel we plan to build for the default pkgbase. Reviewed by: manu, jrtc27 Accepted by: manu MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D42444 (cherry picked from commit df6e7e11c5f660cbd5381819718e3c947325fa2e) --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5b2876ea2b45..ccd65be4402f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1628,15 +1628,10 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if ${TARGET_ARCH} == "powerpc64" -KERNCONF?= GENERIC64 -.elif ${TARGET_ARCH} == "powerpc64le" -KERNCONF?= GENERIC64LE -.elif ${TARGET_ARCH} == "powerpcspe" -KERNCONF?= MPC85XXSPE -.else -KERNCONF?= GENERIC -.endif +GENERIC_KERNCONF_SUFX_powerpc64= 64 +GENERIC_KERNCONF_SUFX_powerpc64le= 64LE +GENERIC_KERNCONF_powerpcspe= MPC85XXSPE +GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1644,6 +1639,23 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM +.if exists(${KERNCONFDIR}/${_k}) +PKG_KERNCONF+= ${_k} +.for _dbg in NODEBUG DEBUG +.if exists(${KERNCONFDIR}/${_k}-${_dbg}) +PKG_KERNCONF+= ${_k}-${_dbg} +.endif +.endfor +.endif +.endfor + +.if defined(PACKAGE_BUILDING) +KERNCONF?= ${PKG_KERNCONF} +.else +KERNCONF?= ${GENERIC_KERNCONF} +.endif + BUILDKERNELS= INSTALLKERNEL= .if defined(NO_INSTALLKERNEL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312041039.3B4AdZbo010152>