From nobody Mon Jan 20 13:55:12 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 4YcBg50wCyz5lN5m; Mon, 20 Jan 2025 13:55:13 +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 4YcBg475XQz458N; Mon, 20 Jan 2025 13:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737381313; 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=zPaRw3Bj1RE3Ph/4UdqEQBAHCkhxfJQSOUQbf+EawMo=; b=OU84vyd3dYrubuV1rjbs/Lxd9PZswe6bafkKo9J7igT0JxXXSD4YKM9rXE0OocWsy63VBy RNwHIMIfin61qm2/6lBdoNPyK4sc5OdJaKSEkKSjPJ1wyCYEVzRJ27oJxQfSHbIbi3vILY jhTo+i/YDe9p4++tY1wqkiP40rr0ehbxaAAM0qBP0lE3UKSTAulMk57oTlOmr8qU+BUbii 3PNpIaOC2qLW5iJD+fL5A5RoGoFMjeMFVC15KhxHO0953v63+6lQ0heYUYm5Vxc2ofyAiR p2zGtV8VaxB8aMeFz3/V3Ftwglf+5ckl840bK58nbUzgXJZ3hSKWwSo3xtZBkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737381313; 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=zPaRw3Bj1RE3Ph/4UdqEQBAHCkhxfJQSOUQbf+EawMo=; b=ZeFrAYWogbruBNfw4gFUzapLAdYx8R2Dv9guZOFTVSFXBRu7t1jondbPNrCBjZ6ONwIQea 8PjyLTbvNV2Ku1fby5MrUAbxsKGOkjYczeCtg02MZLfgmrAEvK5ksXYWpFwUjKJ8go2h7L yNS2Nn3e0IHrekTpgI7xVJ5xJVlr/vw1HLkMxJU7COVJTr3fJ3aWKklCPl7vSM1V2Xnlsa dTM2uSjBKVniItueRuQle25xmMVxDXTQLC60Mi09uPRpg8pyjzA5cazuhqNDuKw8rzCm1A Ya8Hz0F14WkDx7AaOTPftWiz6IwngzvC6eV7WuCIc/BJ3Kr6vGeDmDpmEJDWMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737381313; a=rsa-sha256; cv=none; b=B5dPRhOX2dyl2tsoj0FqBI6tx6E3eIwLpmITqwNknlGbDrBqrEwc2ErUxnvG/WdWv0fC1s V/vi8yVMi9NwU0leG4ub+WiO0+uQyL/p5wE96yO1uvpyo6AGi003c/4ZK0NeLJyzI3FVZB owpfmRi3FokZVIg71BWIJN/01TaP6K0BLlmCUjucx5twdpdZyYbaldAYEktzWJ/FLOHdm/ WZWdJvfRpc9/ltJhM2DYEjIegsQcRBf6oyO28aXKI9J48PPPG09hdfmlgxB+iN2k/Jd1oI ALqx18g20k7+lIJ3BLpkmyaRCrkAdb4bVe0mncF2Gzm62JE8FQkkOfXMWF0sfA== 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 4YcBg46Qbkz6pF; Mon, 20 Jan 2025 13:55:12 +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 50KDtCOZ030759; Mon, 20 Jan 2025 13:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KDtCjV030756; Mon, 20 Jan 2025 13:55:12 GMT (envelope-from git) Date: Mon, 20 Jan 2025 13:55:12 GMT Message-Id: <202501201355.50KDtCjV030756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f9097705fb1c - main - 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/main X-Git-Reftype: branch X-Git-Commit: f9097705fb1c8d9c1f8946d1c1897d606bdbd517 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f9097705fb1c8d9c1f8946d1c1897d606bdbd517 commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517 Author: Mark Johnston AuthorDate: 2025-01-19 23:25:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-20 13:54:49 +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 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c8e6e63d2e39..efa1299b76a7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2362,7 +2362,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} \