From nobody Fri Nov 3 08:17:48 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 4SMDBh4cvZz50MGx; Fri, 3 Nov 2023 08:17:48 +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 4SMDBh48Vyz3Qw9; Fri, 3 Nov 2023 08:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698999468; 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=L0m/KaemOtcUQOrYTdXZi3xicTdkEBGFqgnybIHVOHE=; b=AVCha6H/818UYawaCQVdmlw7FpICNC012Su6KrsJVPxDaeI69iSaawSiHctaDYDnwZ7H0G YfgM90neRBYhGzsIryj8tEQFhaRB5ljjKGApThcY0w1yWmH0UD1GsDZkUOi38hi3AplO8a +1AsBzdfJSgTlzYl1hWS949FWyY+wFIT8PFjyLfdfdkU5gLSSLA9qYdFAeH9e9GWEh9ym6 hWgf+UfPJ60FswMudfvtjZ+onR0HqSIoVEhlGDWASzTec427OPOaBYhlYz8wslHmuyc5HA d4K2DDPxYvYwtksbnjLaY8NX3BEOie07as7qw6Ne1AwGKuvkB+xpl5LxgwGqzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698999468; 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=L0m/KaemOtcUQOrYTdXZi3xicTdkEBGFqgnybIHVOHE=; b=hNU8dQQmFd/NUXeMYzVBOSLiu/Bp001A0aY60EQ3BOD3s4eh5Nwgg8uJFrSfNu/0jk1m1g I6uHIHjx9fsjRZlBaPnn1y+WSUZsWYqTTsqZ9B9xKtj28WnHsX9GFV1JFI7CcLMe10XXdS BvpDlns9dyiKe9Zozz29iEVIxlzPyjNvzUUnaNxnz0qfP3d29hCNjjrAvhx70u25aOMuVb OMe//MiJh7VFUrQ/LsDlQG/dvu0kxI4/Zl2C/oO3P7xuRSzf2NjApBri+hKOMZ2gCdsgUK +PSlUa3XGr0IRewzROXCmGEJ9mZtIk2XAzC+OCLxDzkyyNkaWt+5cHRIjDSRnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698999468; a=rsa-sha256; cv=none; b=mJYiopXYGDkdbAijmpaFkOpyhbyXatLjzw61XLj6b1C2UqQpLnsw8gxzKq1B31XbdkCbpB 8T8tsCK4mDSUDc7svipYpx5CAV6kawJ10EyQNZrMW0mAR1mtT8DmpS43zSC/8VVvE0Y9ng ZgO+FpbfzxTh1AVwrrbnX+9klsnjuYJHr0/fTRZlPU8U6rze9U2EOQbklLRzVVkxpDXbC0 d+RUUv+usFEXY1o+qpJu1/PvwKx8HWMYLKIOBemmDaJVylFd8fRjr2dT6xweaDeqBaSkKQ FwbaDPYTKQOhMgntEITuZ7dOPgy48DCQqnv+PolRg93YUpdw3CUrlsPiTKKPhA== 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 4SMDBh31cNz14gY; Fri, 3 Nov 2023 08:17:48 +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 3A38HmTc097371; Fri, 3 Nov 2023 08:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A38HmYF097368; Fri, 3 Nov 2023 08:17:48 GMT (envelope-from git) Date: Fri, 3 Nov 2023 08:17:48 GMT Message-Id: <202311030817.3A38HmYF097368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: df6e7e11c5f6 - main - 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df6e7e11c5f660cbd5381819718e3c947325fa2e Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=df6e7e11c5f660cbd5381819718e3c947325fa2e commit df6e7e11c5f660cbd5381819718e3c947325fa2e Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-11-03 08:17:30 +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 --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 075bca234630..a49903a30903 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1677,15 +1677,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 @@ -1693,6 +1688,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)