From nobody Thu Sep 25 01:01:35 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 4cXFm10TQPz68k9n; Thu, 25 Sep 2025 01:01:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXFm012Kjz3bPj; Thu, 25 Sep 2025 01:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762096; 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=vpSK5U2C4vo5o6ORfmqlmu66U8MS1jM96sMqztgAIJA=; b=cIH5tGq24KgOWCP0z59RBo179ut39xfk6G2XkGDbDBaB7xXjqiB2c0ziUs6Vy00psqlhqf l/+ZXbq3NNSYL/OFnWOW03WxQH2vx7q/m/u/+4GXZNquHlq3QB4soxpx//PbWq56pVs9ge zILsXgOsEik+kjX1N/uzUQQaXatP9OE3Fwl3F+wE+Lxgp2VmHtIYjF8W9BhxTrhH1N/aQ+ cv/3mnXEe2hp3Q5v5c47D8i8k4MSvY6LBhSZU1GhFnAcEAV8k2KpD2VsSUEzvt5TeVMAAC ug651He4hgwI6AaTPoO6tyk4b5H8bD16igNavYGwPk9v1nguGEjhLZ87yDs/fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762096; 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=vpSK5U2C4vo5o6ORfmqlmu66U8MS1jM96sMqztgAIJA=; b=nej8rP6rcPUiinOprjgVUtvKRebgs4PycV6u8Vy65OsvSk2PdCxJBHOYC2/37pHsfTG4Hu RsouzypuCMXwdad08D1soAy65h/c983wOJ81KFKOSk1IJQUJ5xSu5Qgu1Z8iUBSy2k1VQD wQ3OpBbz+hV28kadyFCtjeSJTqJPNCwar6O6ShaeztgtNIY8EtU0Q+obqTKclIdk/9sTym YJCD0fIw6ixBNK9LewAYrr9XNudeq//lAvzAzQpvS/xI2NVCfe+7t6EnYmu/U44SEBo5Dj u+66Rrpd/kjJU0qGambAmUKx2yXtetZss7QVb5tQeUETeThjZLB+gKI4RGJr1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762096; a=rsa-sha256; cv=none; b=f1MLhQz53oVyMk7d/yp5r8O7EDsFzGE6OAkzNJ0g1peNV2HLIMdLkuST9SkhVKU6FSrLpg 62osbt3f6cvf9yTesOI+3afp18NF/clBPkyHjsDMCn+Cj0iPPqLxHthV0NqGWxMV+gDEGj suuAFEZeGzcSB4At+lPAR8+tRzL6793E3BIhyg6q/blJKbR6T/N1ZJAxdYYdkkN+IhcPoo Zzur1jYCEw6uydzBYRz/VNulGckG+47fK9I9NZJzsmNKWtTDihnkgyhKQV+2qrSewH5XL/ NunthQzp9mPRrX9oDjiYRdqTIil5ccpqLz/ucxuRwaJVzLQad5aXj4mFhHdmDQ== 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 4cXFm00KLlzwDS; Thu, 25 Sep 2025 01:01:36 +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 58P11ZTj086780; Thu, 25 Sep 2025 01:01:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11Zq8086775; Thu, 25 Sep 2025 01:01:35 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:35 GMT Message-Id: <202509250101.58P11Zq8086775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 9bcc0094b5a4 - stable/15 - Makefile.inc1: Handle pkg development versions 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9bcc0094b5a4a1ca2c868e8f7f61a80a76fa320c Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9bcc0094b5a4a1ca2c868e8f7f61a80a76fa320c commit 9bcc0094b5a4a1ca2c868e8f7f61a80a76fa320c Author: Lexi Winter AuthorDate: 2025-09-23 21:41:20 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:40 +0000 Makefile.inc1: Handle pkg development versions Development versions of pkg have a version like "2.3.0-d8bbde1c3-dirty", which is not handled by PKG_BIN_VERSION, so PKG_EXT ends up being "tar" and this breaks update-packages. Fix the PKG_BIN_VERSION logic, and while here, remove backwards compat for pkg versions prior to 2.0, which no one should be using to build main or stable/15. This means nothing is left to use PKG_BIN_VERSION, but continue to set it, since we might need it again in the future. MFC after: 1 day Reviewed by: manu, kevans Differential Revision: https://reviews.freebsd.org/D52666 (cherry picked from commit f6d1cdabdd6fe5b26bda58348647d891ad138471) --- Makefile.inc1 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6744a25965c6..94c33ca791fd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2004,12 +2004,8 @@ _pkgbootstrap: .PHONY .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ - awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' -.if ${PKG_BIN_VERSION} < 11700 -PKG_EXT= ${PKG_FORMAT} -.else + awk -F. '/^[0-9.]+(-.*)?$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' PKG_EXT= pkg -.endif .if !defined(PKG_VERSION_FROM) && make(real-update-packages) && \ exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest) @@ -2371,9 +2367,6 @@ sign-packages: .PHONY real-sign-packages: _pkgbootstrap .PHONY printf "version = 2;\n" > ${WSTAGEDIR}/meta -.if ${PKG_BIN_VERSION} < 11700 - printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta -.endif @${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" \ -o WORKERS_COUNT=${PKG_WORKERS_COUNT} repo \ -m ${WSTAGEDIR}/meta \