From nobody Mon Dec 04 10:39:35 2023 X-Original-To: dev-commits-src-branches@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 4SkKt036lrz53CvW; Mon, 4 Dec 2023 10:39:36 +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 4SkKsz6T9Wz4Rtl; Mon, 4 Dec 2023 10:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; 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=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=v3OpcGN3j1EEZeKrMTh16u29RpSzNjYLiCzevXA2KzTEgWj3Bztj43/s/6+8oZUirCSJne 9a3+btvtfKoXZem+9sYcn0i+h49cbqxRzfaD6AzsilQhzMLR08PqaFdfhmakPZEOY+/RGm agqTyQV33A0FYDzAq1bWd7zPGjauhxuya4Now7wLLPH05y4ETTJimS2hMWGXemMKAls7LU rqfCMiQNQfueHT6mNtDm0e6RT6LYwX99evQLCMIN3cV96qV6vduzSkaNHi28DFsBMZwUTC fZGh+MTW/H4uIr4N9WEhYf74+/HXN2hVTy+/cewIovebtjJ5+xJRU9uFswbvXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; 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=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=MCXeXN/Qh4u/1PYdvnCFRO9dF2sGDE6XBv1YjcFf44cmJj1I8msCjxpSosxaMG4InNrorv QCX3ufkWpkChZzQuBVdNSswST+U9HLNDpWZ7hEUK2B77E+SBeEQcFCbzvdv0rtmBSclYYo VV3g75EpAduThb3oUDOdjMN65CxPX5Xo8VwVBieQqm1F5fin9PnNSYjllGpBaijtVYpUBu 6acfgW15ZP8NtTdD4zQzZjl0IVfUZvqNfeBzHvpXqUxMmYf//YRiuYAkNsyl6ggh9jesbW REw9xZc9Iiz29wK89Z5z/ukK5+kqG2Uv0eWDDT7PXw1pISgdtCfyDm201YSL3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686375; a=rsa-sha256; cv=none; b=OAUMcrjPvuXf0Kl/pVb3wJKFk99UlnivM7A10o+tGfF1NA3sOL+VozPJ5Qo0ERbEdVbOCr QrdVb/nNa8nsaz+RD7tECbxpPkbw/aRZLjOv+sXS1Q4iWU41GZFqD58luS3OsY8n/4Z1LX MHvTYiqhQtGNPJmvO4LuU/T+nPjiGbnlKine6PWeCSOwoqYKqc0QQrjjFmcChI+wuR88R4 bntxiTmXYIySnaUtY0PGxjxTyv2szUYn0Bim0W9c27X/FDfkmlXf6OpiLZbSy8NxY5aRXH qTAeqJfTiWLAgL+Zxz4Rx0JXu1jT9ISy0mLuwMV9rUQICoUMhQXP5L3iomy7Zg== 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 4SkKsz5YkCz7b7; Mon, 4 Dec 2023 10:39:35 +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 3B4AdZOD010155; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdZbo010152; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:35 GMT Message-Id: <202312041039.3B4AdZbo010152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8bc5e4f54b40 - stable/13 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 commit 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin 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)