From owner-dev-commits-src-main@freebsd.org Sun Jan 17 20:06:16 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98E294D68B1; Sun, 17 Jan 2021 20:06:16 +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 4DJmBw3twmz4S3N; Sun, 17 Jan 2021 20:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 78442271DF; Sun, 17 Jan 2021 20:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10HK6GVw008109; Sun, 17 Jan 2021 20:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10HK6GpR008108; Sun, 17 Jan 2021 20:06:16 GMT (envelope-from git) Date: Sun, 17 Jan 2021 20:06:16 GMT Message-Id: <202101172006.10HK6GpR008108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 9af9e7c5cc47 - main - pkgbase: default to installing all specified kernels MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9af9e7c5cc47d3b5ff5fde5bd6707f910486d273 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 20:06:16 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9af9e7c5cc47d3b5ff5fde5bd6707f910486d273 commit 9af9e7c5cc47d3b5ff5fde5bd6707f910486d273 Author: Kyle Evans AuthorDate: 2021-01-15 13:43:38 +0000 Commit: Kyle Evans CommitDate: 2021-01-17 20:05:33 +0000 pkgbase: default to installing all specified kernels These only get staged off to the side, not installed into the system. Let's change the default for packages/update-packages to be less surprising. MFC after: 1 week Reviewed by: manu, meena Differential Revision: https://reviews.freebsd.org/D28190 --- Makefile.inc1 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5a9eff870dd5..27229cb06711 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1711,7 +1711,15 @@ buildkernel: .MAKE .PHONY echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" +.if !make(packages) && !make(update-packages) NO_INSTALLEXTRAKERNELS?= yes +.else +# packages/update-packages installs kernels to a staging directory then builds +# packages from the result to be installed, typically to other systems. It is +# less surprising for these targets to honor KERNCONF if multiple kernels are +# specified. +NO_INSTALLEXTRAKERNELS?= no +.endif # # installkernel, etc. @@ -1872,11 +1880,14 @@ PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest .endif .endif +PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \ + NO_INSTALLEXTRAKERNELS=${NO_INSTALLEXTRAKERNELS} + packages: .PHONY - ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages + ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages update-packages: .PHONY - ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-update-packages + ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages package-pkg: .PHONY rm -rf /tmp/ports.${TARGET} || :