From nobody Sat Dec 02 09:45:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mY1fTbz52hh3; Sat, 2 Dec 2023 09:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj4mY0rcqz3YPn; Sat, 2 Dec 2023 09:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPra+atJel/iGNB6NoXXPmCFvps3uDRJxcVT0KWv9lw=; b=XkTI+s3sqj4otGOOuuDvgx1uXHS3Nx1S9yv9CiAgj31IC1ZP1A5u1SY7Wg70TR+sjEb5w7 AhP3KGYHvHmUrFofJVgb40slcBdg525qjG84ge9w/+dVQaLrR7nCA11hk5slEk+4u2DOkn TEGAgve/6bXmZ3doJtoOesPCik9deVBlq+vBo4kUjS8AFd4rWjmTVim2rlmq+LZ24fbAJH MprCamCQdcg+bRb8DaEFMRb3hBlUaDjSEx4WRsmVZAN9e65d/m7WVXq0zpgAXVOEUW9nIr ApWnt7qqALRfWJ62O645/jMcULuBFaoMV+j2IXc9er5dg2D7TsBY3cfEDwGNsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPra+atJel/iGNB6NoXXPmCFvps3uDRJxcVT0KWv9lw=; b=lv674YpRYh5BWzzbHIh+JnHg99/a5gZFwEReU47IlQwdZOwGeT0kgnI3UU3wAAUNpr1oyG 4yr2VXAbJ78rIL6lmP9VnnBL7gUWjqgc0u7JriVJuMeALgyuqlWHEhSeuAfhiK2SefKRHB bld0lavKXK5f9SufoeBkCJDaEbmC3mZayULV+Ipj0gqM9I12javOdmLn4WoyOUlBcHxXLx eE/Srdh8kKYu4lWFEaG3lx+GnUcf17q5mzDGbCRnozJJ0/XMOAJy4YcDFMjkZYd3GAstTx uVNrT9H2ZLBIE36RO4m7aoO46uo/Ib+dqlCFyywCJUPbbuNnllfhOdH3RGizWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510333; a=rsa-sha256; cv=none; b=EoVaIOhy74zROXhvjH5FRzW7lqnqC5+a97jxh2TRp8W3TRstGPVig1S4JjQTbQC7BOhYNc vSvUIqqFgHnd7EkbGdh0KfOrLzsylU4E/XFX9NM+VCaKsQI2YMaF4GCvvmTBEdzTsu3rWL xrdPD29PQDRhsxs/atRZpDfuABJJk31tFVyP10CuP6ViYyu1urQ3H7TKI0RnrKV1n5eh8v r0eWTPIk1vh0ZNgrMw2rzbBIg0UpWMR/+MOLIh7TtgIjlB/e8eDMFGDXUa4mAfsjk7wd9v zmCeBxnfJC8ar2KL9JP3rAmktJW9WLGO4wNCPLPRYN0BEzxqVMhUKOqU2qjeaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mX71PNz1B2M; Sat, 2 Dec 2023 09:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B29jWFV011518; Sat, 2 Dec 2023 09:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jWSQ011515; Sat, 2 Dec 2023 09:45:32 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:32 GMT Message-Id: <202312020945.3B29jWSQ011515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 181cc65dc462 - stable/14 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 181cc65dc4625ee114a89786d72ec07366c39873 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=181cc65dc4625ee114a89786d72ec07366c39873 commit 181cc65dc4625ee114a89786d72ec07366c39873 Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:58 +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 9f3f15a3194a..7e62894405df 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1678,15 +1678,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 @@ -1694,6 +1689,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)