From nobody Mon Apr 27 19:51:00 2026 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 4g4DhP3Fdhz6bXXF for ; Mon, 27 Apr 2026 19:51:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4DhP0xS7z3Hb0 for ; Mon, 27 Apr 2026 19:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777319461; 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=lOGnKRKC9NhkCC9KmDCCJZ7ljNHS2JCdXqvOBT/mh3k=; b=ZfPJjcG0xWZmWQca1tBWCNiHSK6e39G/HaK4tJtfsIAzqXaCv+qcZFnW5fhSKej6AxPFvs 1jyfX1Jn0Nlf10qeyVgjxwNZrmVXOLPhSi4c3ycCD7Spqv2BcWTLTJlWVi8ge+DQg6Q72x acbAyUlH7sZADBCp54/aSxhSLTgCp1DxLdBxKaYofFp3DXXaPoUOCrcy2sK0ONz/+0Tace Fel0QpHJ7vNMr8axRhJPe1j7Ua/xWRC9VvWJ086BgtosVBOERX//MO/9iEKjI2U6+OT5xk /bixmefAu2I6U2gN5eimU6nMpcLd/5/19GtGIUn9EXZw5fC/4hxXmLjncs1xIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777319461; a=rsa-sha256; cv=none; b=kXbX8HskyBKz5akg64bUZUZshj06NSAICFa+jmE5v9OWbrEUz8+8cXnvA4vxIvrPuY4Ft4 3k3brZvGfVFtMVStaBaLeUGmIDMvDfYtTblGrtxundxjWwiWf//ma6RfJD8SA5rNprkQe4 8JBBJBEPy5DvAACQNxVsDdiEUl+5nBdtOg1l/HxYhFOu6i8/mNMPeYX848TzJywT1Lv1IA bJpfdSM4UD2HCufKhu9CG+sqdwhcyh3UUmS9MKn7nbs0N8bbbAuumte1VY0CARNJdo3A1+ 2sbddHagEIibMaNcz8XDCgAHHneoG/GAaCRBWQgEPlUwnqb6ePOP59B3z0z8TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777319461; 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=lOGnKRKC9NhkCC9KmDCCJZ7ljNHS2JCdXqvOBT/mh3k=; b=EQXcBX+pahxrW1qsf0kkJh0tVZG3FUuw3DMOaA7Gqvso6SJ+7CgwwkpkOEck4FCLHsgLNX OfFghHYz9MDLFVMSKi5VzSbEBFpD5Owg+9qPlVCrKBgbrJJ8uQa3HqFYXkfUdRHiCn8hWX Zkr867VF7A5S2AGxbDLhWJ6C5d4F2C8EMba3UhHn6dlUIt84TK4Hw4xyUM8gD4TMhrX9XS ogsXzX3fbxiICm1YnCFLkJpM3RtKV5OHHqWrhNqq4s4OUTGXCvRhbc+G63/ylfFvdaa7XJ AbOtyMMLVlBay9nzDOFGEaVebQaWW49IvRnheaGPh+IRds1keto8I0ZP0ojMFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4DhP0HzHz5RS for ; Mon, 27 Apr 2026 19:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 19:51:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4846afc9104a - main - pkg-stage: Improve symlink creation 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4846afc9104a1b4aeec31dc7c324f69ad5ffab1b Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 19:51:00 +0000 Message-Id: <69efbe24.32e5b.62894ae8@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4846afc9104a1b4aeec31dc7c324f69ad5ffab1b commit 4846afc9104a1b4aeec31dc7c324f69ad5ffab1b Author: Ed Maste AuthorDate: 2025-05-05 18:01:21 +0000 Commit: Ed Maste CommitDate: 2026-04-27 19:47:24 +0000 pkg-stage: Improve symlink creation Invoke ln with -n and -f. In normal use it doesn't matter, but during development this might be run in a partially populated leftover tree. Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52883 --- release/scripts/pkg-stage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 2f56cf794973..278f7422894d 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -76,7 +76,7 @@ export PKG_REPODIR="packages/${PKG_ABI}" /bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR} if [ -n "${PKG_ALTABI}" ]; then - ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} + ln -nfs ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} fi # Ensure the ports listed in _DVD_PACKAGES_* exist to sanitize the @@ -115,7 +115,7 @@ ${PKGCMD} fetch -o ${PKG_REPODIR} -r release-kmods -d ${DVD_PACKAGES_KMODS} # using the on-disc packages. export LATEST_DIR="${ROOTDIR}/${PKG_REPODIR}/Latest" mkdir -p ${LATEST_DIR} -ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg +ln -nfs ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg ${PKGCMD} repo ${PKG_REPODIR}