From nobody Thu Oct 31 16:22:05 2024 X-Original-To: dev-commits-src-branches@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 4XfTlx5Bm8z5byVL; Thu, 31 Oct 2024 16:22:05 +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 4XfTlx4dSDz4dxK; Thu, 31 Oct 2024 16:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730391725; 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=QzkVlIrk7fgfgm+I57x1oXjU8eATkaVXRx/5IcOZJC4=; b=I7qmJz2r/HBWNtUTxWsDEOA17c41+OD9wfw47q2bfvqlPxHNcDquZMw16RdgRxT3Dc92Ww Q8YDmVmNa+fGDrxkRgy+Ftabc8s9kMAifR5rk2VayVXCVxIxURXjJfLISDpPi6PJHJPzhr ri/EpIwLTDUh6NbwSzDntET5QS1rYGxlcXYKgYG0WOeBbneJFWLjtiBbMcM2jYInU72ATX LICucmf4EjIQer2MduQ/3EK4bNsadUyFN4iZ/E3MKCnw5JSllEucGF7DD8cRCWg9Nrw2Ec b8s+pVEkzdoDgHak/ymViVEBMPNsgqfrO83xhvlFMYJXnGjBXI2dDc3GPkdi8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730391725; 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=QzkVlIrk7fgfgm+I57x1oXjU8eATkaVXRx/5IcOZJC4=; b=MzALAWdbjafmQXrM1mH0EdjMLXIjsY4Cy+I+MJe7ag7GbHo84hLD93M05ii5C8t3viK6Wh pu5l8MpfDJvXEIvTpyO9xE1MUIshiG+NItZJN2ojZLnKAed/WZvjTbhmyDjutbeoQ/Ku0x 6//Pxu2PDATvktygrZ5QdEEHMcxrVHRum8H8TjrXao7wfPyqonWMWQQhmApHjehrn3S76W HAIlL89gvD2i0EToo+twA3R5bQXMg5LkMAEPFc8mXyMNcpZ0FUtSspat/0WZRAi44o3t6y U99SSEhWZXd6S3HyQKnKxUhHuaH99TdWmqBZ9oB0JnQJYAVne8xEodxvzU2O+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730391725; a=rsa-sha256; cv=none; b=qm42BO0Fc7bbkeOdgcZYiCZH4rogyyUy2Qegcpy0f8+8sPhflMR6IxL0iQQSjdiBVxpWhZ ld4Itq2ze21EQaLE5HhkkCSX9Fa2mMLjJnjHMPEyY0jHRjVmqAm7GcDZwdaXRxa+tR8DOS JJR9Xa+6aNWsvUe1w5R3+7Fm58EDihbwmA460rI4uarFJb8nozK3UfHKTx+vZkJucflagc dDrscI98NOihAtwoylsq0daVEpZ1myUI1WSWa0EUFmWlFN2CpGDrCtJFn0dptK/BnslKdH J6ar4fhn/4/IivmSYU7LZD2VHkgwQGUNw36cPST2EteULbdDJuZMriQ/Ui3HmQ== 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 4XfTlx4FCxzjYl; Thu, 31 Oct 2024 16:22:05 +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 49VGM5Mt009681; Thu, 31 Oct 2024 16:22:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VGM51e009678; Thu, 31 Oct 2024 16:22:05 GMT (envelope-from git) Date: Thu, 31 Oct 2024 16:22:05 GMT Message-Id: <202410311622.49VGM51e009678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1e8db1f74e42 - stable/14 - pkgbase: don't remove the 'latest' symlink until the repo is final List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e8db1f74e4230e13cd0c85b21745f4a70e2aef9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8db1f74e4230e13cd0c85b21745f4a70e2aef9 commit 1e8db1f74e4230e13cd0c85b21745f4a70e2aef9 Author: Kyle Evans AuthorDate: 2024-10-29 20:50:49 +0000 Commit: Kyle Evans CommitDate: 2024-10-31 16:21:58 +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 (cherry picked from commit 8549e3ce0cd6d4a6187b3977d53ff56ce0ac9c5b) --- Makefile.inc1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 605b8098b742..1927a69ef732 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2280,14 +2280,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 # #