From nobody Fri Jun 13 01:21:46 2025 X-Original-To: dev-commits-src-main@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 4bJM7H2KNHz5ykW4; Fri, 13 Jun 2025 01:21:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJM7G5kYcz3Kxj; Fri, 13 Jun 2025 01:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777706; 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=3f8bqUU8wV6X+5EyC5XqK/WLKMR/0zYCD2JQhR4Y/VM=; b=whIwgu0K9BcZNSE4aNVbzzCNg3SWdHsvCh66thykQUj+Wi2qizgwzP++yNSj2ewZr8jCT2 MtuhHyDZA2bzfr9cEaKdjtBWJ0uE85UBsBIB7kfnktBfCsKIDJaSB1cElvn/YgeBRIgYA7 S+lf4HHp4V61CpCfUkRDIW3Edz9VBsqDgtZcmkBHvZuIcY4evAB6Q8xXddn9+0U+E3Rfkk QJqH9in8uwPXs1vz7WyFlI0rTOl3MRd5nsd9ssYdegN/nIojpsRTSKLwkCfsjH4yAW48wT Iz7GKo5WDrgxSijv7bqAs1inqXXmlbbmJrL0o6Kxl0Cpe6IS+Aa7mJf7ZOKBvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777706; 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=3f8bqUU8wV6X+5EyC5XqK/WLKMR/0zYCD2JQhR4Y/VM=; b=dh9MwO3RjQPjlBis1hj5432gWPAWSki1SjxgSHKCwxSO6mLPGdz48fm+iMmZrh3Uv5kR7G pDXR352qv0LWuwgXFVyF/gRemTYjl47f6rRbq/EKiCka/MtSZBsuoDAeGGJuTTqGstv0TC WfA2buNiCmp7R4m5rqhel4pqhBT3zCkES3MeqopGE5Fd6mFMKh7d0xJjs6bGmatz9nLtEi pFnTvYyeryBSjlAPeGp0U11weAt5ED/5R+N8GRVF7uOHJpiaSAeKGEqGQdYnaC95SLIcfn 4BEzN96kDc1/RQwW/tNKLr3KE/9cvrKb1Weyjs9aYwnatXkikdpKF3kfcn7lvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749777706; a=rsa-sha256; cv=none; b=NmArJzx4Ehj69mEAxnG7pBWeKYasMJPj5Wa1XhYCFAG4NlagyCfe7NMlwDJwFpV3pQJSNv OoGTBDLe+c1QNjYEjJ8hIeizNqqxfji8bLPe6RcToq2ik9DwZNTiXudQSA3JH4t+uIVlSX DQ/zPVNQjI5YAzilOTZrkupWTxGtRaC+VHbPhPFDOBtCEwALd/ZYUYR6/UGAAabreFHJMs 1xYayKRwzHdbjd0yTC8MhEx3va4sSCjcdWNUOw8j39s8izYjeUzVV5DL9HgkenLDNhk1Wa Qb7w3EUUIbGa3X3aQK6twh2BzhOEgGE3hTIWSILEkZfuAUloCkzxiuNgOoZkUA== 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 4bJM7G58XGzcwb; Fri, 13 Jun 2025 01:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55D1Lk5V086562; Fri, 13 Jun 2025 01:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55D1LkN5086559; Fri, 13 Jun 2025 01:21:46 GMT (envelope-from git) Date: Fri, 13 Jun 2025 01:21:46 GMT Message-Id: <202506130121.55D1LkN5086559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b44147bb1245 - main - Makefile.inc1: allow real-update-packages to be called independently List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b44147bb12450bdf851a519d1cdc85402f89ed1f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b44147bb12450bdf851a519d1cdc85402f89ed1f commit b44147bb12450bdf851a519d1cdc85402f89ed1f Author: Siva Mahadevan AuthorDate: 2024-10-04 22:46:09 +0000 Commit: Warner Losh CommitDate: 2025-06-13 01:21:44 +0000 Makefile.inc1: allow real-update-packages to be called independently To perform an incremental update of a pkgbase repo, you would call 'make update-packages', which will stage, create, and incrementally choose newer package versions to sign as part of a pkg repo. However, this forces you to stage the kernel and source packages along with the world packages. For a jail-only installation of FreeBSD, these packages are generally not required. This patch separates the 'update-packages' target from the 'real-update-packages' target to allow choosing world, kernel, and/or source individually at the command line like so: Jail-only installation: 1. make -j`nproc` buildworld 2. make PKG_VERSION='15.snap' \ stage-packages-world create-packages-world \ real-update-packages Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1445 Closes: https://github.com/freebsd/freebsd-src/pull/1445 --- Makefile.inc1 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 50efeecd5def..588f95654e99 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2031,8 +2031,8 @@ PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \ packages: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages -update-packages: .PHONY - ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages +update-packages: stage-packages .PHONY + ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} create-packages real-update-packages package-pkg: .PHONY rm -rf /tmp/ports.${TARGET} || : @@ -2044,8 +2044,7 @@ package-pkg: .PHONY real-packages: stage-packages create-packages sign-packages .PHONY -real-update-packages: stage-packages .PHONY - ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages +real-update-packages: .PHONY .if defined(PKG_VERSION_FROM_DIR) @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \