From nobody Tue Sep 23 22:07:02 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 4cWYx33w6Vz681pN; Tue, 23 Sep 2025 22:07:03 +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 4cWYx268xxz3nlb; Tue, 23 Sep 2025 22:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758665223; 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=DA0erIZiROWt87dz/WYh40lRUvu2hxaK6Oz8ufRQDI0=; b=vlnPE4XGwRshD6DIJHQA2toxR/t3+07fjwbFSVY62zi0DtuT7B5jiplJRDGopk/yuaG338 ajZk9KU6o8Rw1zCbHn0VHQrFQpGgyc1yTKAYNYccGVem72vcwhBMzpQBrdZICEpmBt05vE kt7zrpzT90QEqJqwdoq+7/WokeNPO0YoksSN6fArmcCBEvgx+3Nb7YRT9c3Ip10UmLVGb+ ElrW7uIRBJrnyvAWCnivt0qSD/yx7bwJ9hu8R4opBvAE+hmI+iDBHESBhbdvWHae8etWQ2 aAyn17pvc6ffliJavbXwbtBjHy8XlG8L6obPCXDn0LARgHJGbYt6dJ9T8YkcUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758665223; 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=DA0erIZiROWt87dz/WYh40lRUvu2hxaK6Oz8ufRQDI0=; b=Ihv4L5eXcP8S2ad+XpHH5ZesmJMiuSOTs5NUVpx3Msdab1tdLo6U7wFUaloNAe7G4X2l7F /n95KNX8zce3tEAVIjNAYWgP2+8GJJ9cFGqL6+hIKzEr6V759zSsPfuXjkXVKmV894uGWM OVE1qTJTQZ2P4eJcwJFA/Cgg2BudnhFHlisJRimZ641hQXEtY8VwQLErULeA5h+VZOjSjI EHEcSz5EYZYqv3SUwsvHwdGXChcGijxN+okJ07eOo6KTCl04Pxa1K0JZHzqCy6CPcatngb TH1qxM8e0wgVad65CYwnAoQ+cjmDweyfwfMx/lbPKuU76J0ewbJW+C3uOY70mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758665223; a=rsa-sha256; cv=none; b=JbF+h/7EjJp/IVV/+ESMCIsvbMV0k0mN3MB/Jd9BBMfTxmv4X15vp+me8BrdKyrekn1DNh PfS30kGxHvLfJ6Heei/dlU8q/kyU19m6TR4OaJ68cVTXxopv2e4N9pqnst7871c3CGAnhz 7T43F3qbbgLEiEppU+HgSwJfqzTNEiLU3341m5zUATlPIFvGuIBLQNdeA05lqJBIVqToI5 Ukg6cIhgLWFj6GgkOQPOlGVEfDvsSsFyqlQjADJVRM4DgZjjI3Z+wHd5/ei3pVNPpYWGFR N9PU+pe7IySaIBp4TcTwsawvX8ZuDfj5A5dVf2MVRUQmZDrf6nSzoWvc4VuCRw== 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 4cWYx25cRpz142F; Tue, 23 Sep 2025 22:07:02 +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 58NM72vL043443; Tue, 23 Sep 2025 22:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NM72J8043440; Tue, 23 Sep 2025 22:07:02 GMT (envelope-from git) Date: Tue, 23 Sep 2025 22:07:02 GMT Message-Id: <202509232207.58NM72J8043440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f6d1cdabdd6f - main - 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/main X-Git-Reftype: branch X-Git-Commit: f6d1cdabdd6fe5b26bda58348647d891ad138471 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f6d1cdabdd6fe5b26bda58348647d891ad138471 commit f6d1cdabdd6fe5b26bda58348647d891ad138471 Author: Lexi Winter AuthorDate: 2025-09-23 21:41:20 +0000 Commit: Lexi Winter CommitDate: 2025-09-23 22:06:33 +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 --- 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 \