From nobody Tue Oct 29 20:50:56 2024 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 4XdMq51twzz5bt7r; Tue, 29 Oct 2024 20:50:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdMq50d8Yz4S8b; Tue, 29 Oct 2024 20:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730235057; 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=ZRguIFFziMIzFgXJ2KVAvDlskSraVo20M7JizqJ23Dg=; b=bWiBre/AtR21NI7abMvXHG3UqMNt70oplkdhMOrRvHRDfeO8zwj/cZajA+T7zS8/Vah+/T 4PvWnVst6KZLQ5gJH9UUFbb3EzPpZawcuVp4TfvIzfGE6u0RpYx01LhxGlAoSCOl0foSkE zWhcVnMTCB3RH55uej2Kz26BNNB2OQyfNk2B0WcXpWmjo02LFfPifFPE6cSiWaqzMU7EgC Oz/jNZRgjVfLPdbv3xV4iGxAgzCkSj590iQQU+W2ww/gLNAVrxa98uSB1SfbrLQUlrnEAs S8DDqFA5j88GT2AjUXUUdgBRCiLkxGj0jbHQFpREV71XrQ+gJZjosBx9z6wAcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730235057; 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=ZRguIFFziMIzFgXJ2KVAvDlskSraVo20M7JizqJ23Dg=; b=x6M0RVTOOSiVXxoC6pJAtgCqvNcUmSF9neG/W+N/LHpJ/x66OdMINNLCsVLTLLXo97JIjz POn4kEWY5ZH1G2wNs/eq5cY72HLYHgxYgqrjm9JFxusDyEfTrc4JLCe7Ob+Rc/IOfDHQs1 9mOLZ/3nR2E0SC/jh010wPpcP870J44VGwXgHlrQzkHy/B7KYovyQXGFjHis+Vc4V0+aLG HO5pFixMXNnwanPQETNQ0BgUaVSHlnk83EjKZ+H3/RzhoPXGke8K8j6aMZy/89VbrRk8ZB sHl1o1fE8ACGHysun4VcBnjwcG8fYaZD6RTpHTpnfHjFNCyoVnNNMhE02BDpqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730235057; a=rsa-sha256; cv=none; b=GO1vzKns2C2xWtTQZsHDn5NlGr6mufU4bKVfZNX94TAUeIX5gYHCSwtxtFLNlJIamJoOo8 ee0mSN0Hg52QBYKcj4qwiGuuCuhhrmrDxWOlHhDeE+eewojpqHtkup1Gg7NuWB4kbTt7vu uncL+KN7Erk2Yt8Ucr6PAPc/KB1IAk5RVso388I/FG/YYnceJYkCy+11doIJehKAzqFHJ4 tHa09O/WBMi/2KzbfcbumJr0LyuZ4p67zJ/wY0siPyjT2F3twQL6sp0AyH3lAScaAii80l c4B7Nn4qr1W5WKwMwHVPQNz3aAV9uum+qFwBaA68phC20UqGusue6cwb2qlhPw== 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 4XdMq50FCXzff3; Tue, 29 Oct 2024 20:50:57 +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 49TKouQV052460; Tue, 29 Oct 2024 20:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TKou5j052457; Tue, 29 Oct 2024 20:50:56 GMT (envelope-from git) Date: Tue, 29 Oct 2024 20:50:56 GMT Message-Id: <202410292050.49TKou5j052457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8549e3ce0cd6 - main - pkgbase: don't remove the 'latest' symlink until the repo is final 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8549e3ce0cd6d4a6187b3977d53ff56ce0ac9c5b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8549e3ce0cd6d4a6187b3977d53ff56ce0ac9c5b commit 8549e3ce0cd6d4a6187b3977d53ff56ce0ac9c5b Author: Kyle Evans AuthorDate: 2024-10-29 20:50:49 +0000 Commit: Kyle Evans CommitDate: 2024-10-29 20:50:49 +0000 pkgbase: don't remove the 'latest' symlink until the repo is final We can encounter many issues in the pkg-repo(8) process which would currently leave us with no more 'latest' symlink in the repository. The main problems with this are that we've now broken a subsequent `update-packages` because we can't determine a PKG_VERSION_FROM, but also we break configured clients that are still expecting to see *some* repository. Switch to just replacing the `latest` symlink entirely after we have made it past the pkg-repo(8) step so that we only swap over when we have a finished repository. Reviewed by: bapt, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47303 --- Makefile.inc1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 69a1ad2c8d01..4bd85a8cbf04 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2367,14 +2367,13 @@ real-sign-packages: _pkgbootstrap .PHONY .if ${PKG_BIN_VERSION} < 11700 printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta .endif - @[ -L "${REPODIR}/${PKG_ABI}/latest" ] && unlink ${REPODIR}/${PKG_ABI}/latest; \ - ${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \ + @${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \ ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \ ${PKG_REPO_SIGNING_KEY} ; \ cd ${REPODIR}/${PKG_ABI}; \ - ln -s ${PKG_OUTPUT_DIR} latest + ln -hfs ${PKG_OUTPUT_DIR} latest # #