From nobody Thu Jan 23 13:58:54 2025 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 4Yf2bz4Ldbz5kyhL; Thu, 23 Jan 2025 13:58:55 +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 4Yf2by653Cz3bp0; Thu, 23 Jan 2025 13:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737640734; 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=+We/OAfx9sL1F8I+KQIZRpc/7sO2kUXa/9HUtrFqyDM=; b=T7h4SiPXj9uBu7oMg1Nnlpra2hSfmnEVpuDWhY4owJYk++1a92KtxWtP7unzLp1eNulqS7 eCQD94BjAcoQkavcOY3wsypU0ObviaeGWef+k1FjgnroO+Fnofz08Phyd1llRqZcBMMts8 DomyAvQgNg/KK0XgLX083FW3Hx7Na705daTPrdm3ElZePoR/NRTQoe+Fr4WddkSSXkl4s2 ldaGBAuNxwFfJIYoenAV4vDpr0F4a7SCjviZr9LH31m8f0Xk7f4AIEKfJdooxBtPMCGRlP fRXaqSEmuDM0s3E6w3n/XFqS52gjg0ZmU+SGCZRgy4ZOIzKzxo+mvNyayj5zuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737640734; 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=+We/OAfx9sL1F8I+KQIZRpc/7sO2kUXa/9HUtrFqyDM=; b=wetAJLohyZn4CbGsCyKv170PEEE0iwGQ5WQ8SpfdAvs3wyA170agdYe/yRdBaqpCKn5ocE TLbCT/qMANiZxBEHn3TJL0MEUespL8lR3ps/bSsIYdry3M6Ecn7ZWGePpUrSqofDlVKZQX Xx7Yez0m6wN6X7zDrjVfLxL3ovb2PGo3RSMLsWge99eJffi9/Kq6Ema2aYgHGmku9KWgUx 5SVTZFFkw1VvAsRLZ+hsWPIKvn0htdrSbqkgxnlLf37ODaCv8fqHUr4x805YYevaaxzqyR j001aiGGNOl4MNc6FnzBgsYZDRpFycrxjM4AfMhoiUal5s2leaR4kR+uUKIHgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737640734; a=rsa-sha256; cv=none; b=W7eDvzx19o5IBmD6UKamFobSbCrkKEBkEtlGW+j4CyIl/CyFFyQrh7D3nKe5dhuJrn393m M/3eOGKgZIlBi0IbmngwFvZ7WXFCl2dfqgkZ/N+4+jFKZWhKCrJMthuMioHtZEnrHGIb/u 2G/CChHse4Pb77ek4v/9P86+2ToSzgKQWN+7swGnA2EroT3S20yiK7I3IRexLrY9jFDL4T 53XXolRuAQMm29MmJNHAv6lHWChRu8EVdkPr83Z2jDLVntK2OaTsLoPhXHRy9MoN6MAT9D avr2jXEfF17UqXUxcLsaKmzRxO42Ka1F/cCgZzkTBMroXgx/v+UCaQ3awGxhAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf2by5R4lzjBv; Thu, 23 Jan 2025 13:58:54 +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 50NDwsJf026309; Thu, 23 Jan 2025 13:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NDwsIs026306; Thu, 23 Jan 2025 13:58:54 GMT (envelope-from git) Date: Thu, 23 Jan 2025 13:58:54 GMT Message-Id: <202501231358.50NDwsIs026306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e8e2e213ab53 - stable/14 - pkgbase: Fix OSVERSION specification when creating a repo 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8e2e213ab53845fe38a8220fb7fbd473255ad8e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e8e2e213ab53845fe38a8220fb7fbd473255ad8e commit e8e2e213ab53845fe38a8220fb7fbd473255ad8e Author: Mark Johnston AuthorDate: 2025-01-19 23:25:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-23 13:58:07 +0000 pkgbase: Fix OSVERSION specification when creating a repo -o OSVERSION= needs to appear before the "repo" verb, otherwise it has no effect. In this case, recent pkg-devel fails to create the repo, saying that ABI cannot be specified without OSVERSION. Reviewed by: kevans, manu MFC after: 2 weeks Fixes: 188fe88ec50e ("pkgbase: force OSVERSION") Differential Revision: https://reviews.freebsd.org/D48518 (cherry picked from commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d4ec63091e5a..94f74392f4fb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2283,7 +2283,7 @@ real-sign-packages: _pkgbootstrap .PHONY .if ${PKG_BIN_VERSION} < 11700 printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta .endif - @${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \ + @${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" repo \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \ ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \