From nobody Tue Jul 22 05:25:33 2025 X-Original-To: dev-commits-src-main@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 4bmQhY5mxtz62TVM; Tue, 22 Jul 2025 05:25:33 +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 4bmQhY1hMJz3sdN; Tue, 22 Jul 2025 05:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753161933; 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=RoStG+fLZQ4635GSwdvwxUKOYdiS0w26DpDFyOrZLdw=; b=UtyVe9pfd6jFjlEFafAwkCErmmVMHgFqhmiWnZKUTcKFWOU3kwTM24k3J1rFdp2RlbWRCx 7osvX/BdEdSjuNeEVAe5VQsHveBjFb08r3V3nk0F2izDRbLk4DoEOMhZlX3ye8cpRaZsqc IXpvIUvqswOInC/RgiAWA2BzwWfQaW0Za9gKlR7yw4DZwIT5+9zG50TPHBSaamFWDWlxvd cwd38EK5kvk1Y7iqTD0dNonxEBwSBwUGQ+MXbRXII1tkfzXjyZ3duks3m4OLNuzPK6MRxa AFfDylwCSmEiZDuksZGpGjCSYvNOERJm7oxaym1BtRmhzzkYF/dBMwrRyYTF1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753161933; 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=RoStG+fLZQ4635GSwdvwxUKOYdiS0w26DpDFyOrZLdw=; b=ljNLgqJKIM7CUflWLHBH5E0gORV19pN/k4Bxtpe14FDOHvwWBmULNJLa9dWEGZ9Am0DWLt heZEu2Ce4nqRWPDCcsEnmQ/IRug8YQgdT4CfPAJI9ABXY1b1YPfKa4lZ+SOrGDOMDfrKZl jSlj+0eUO5YjDDw9InIQXbQ4ClW8gkhQs3DP44XscQOb3+8jYpN1G8s9eTgZ8JQHeoBhO/ FcYFWu1DeGzZ/j3O+jbpyw57k/BEWlAZ661EsAHhGWWcYkYH+Dm6dw9G90Z33zFVsxuycv PYOfWzNm3K5Zada/MJp8UHiY+0o4/+YDHgA+45RE2kWiHYdYt8+TeqDKXSfOPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753161933; a=rsa-sha256; cv=none; b=pR3BB/Ms3cRdY3Sx6AU6WTq5Zbnhb1yeo/5dsHP5o9QXeBLCAbOp6Y+u7YvxPPJ+i2iXFr O0y+pkLjkaS81uJ8EH7n+q1HpL742i7PgmL03+m0eClocuK6Ls9PovXt0UrQ93I1rZYKx7 moeeqXvSJkt6GBTLKqYp5trHKN0vCoVaLl/oGcL7THet3rc/GrjmeG7rTT0cVOcyE8VYUN UDRRq+/cVBHcyRviWUeypDO28OWsRFaavm4O6g68kvT59zvulT5LN6urK/8g9QuYD4FzAW 9/WrUSzT/XKWNYOGkvNWxvDIfRV1+KvuhE+r22m18UKDEtsVrGiT4LkObcGiRQ== 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 4bmQhY1Btyz1SLk; Tue, 22 Jul 2025 05:25:33 +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 56M5PXtF091433; Tue, 22 Jul 2025 05:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56M5PXa5091430; Tue, 22 Jul 2025 05:25:33 GMT (envelope-from git) Date: Tue, 22 Jul 2025 05:25:33 GMT Message-Id: <202507220525.56M5PXa5091430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 479b9db52635 - main - release: make symlink creation for src.tgz more robust List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 479b9db52635f0ec6de896aafdedfa94c76c2af9 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=479b9db52635f0ec6de896aafdedfa94c76c2af9 commit 479b9db52635f0ec6de896aafdedfa94c76c2af9 Author: Wolfram Schneider AuthorDate: 2025-07-22 05:22:39 +0000 Commit: Wolfram Schneider CommitDate: 2025-07-22 05:22:39 +0000 release: make symlink creation for src.tgz more robust PR: 288256 Approved by: emaste Differential Revision: https://reviews.freebsd.org/D51335 --- release/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 5d7d1402d6f8..b6a9aa42c2e2 100644 --- a/release/Makefile +++ b/release/Makefile @@ -162,7 +162,8 @@ kernel.txz: # Also (if enabled) kernel-dbg.txz. src.txz: mkdir -p ${DISTDIR}/usr - ln -fs ${WORLDDIR} ${DISTDIR}/usr/src + rm -f ${DISTDIR}/usr/src + ln -s ${WORLDDIR} ${DISTDIR}/usr/src ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/src.txz \ --exclude .svn --exclude .zfs \ --exclude .git --exclude @ --exclude usr/src/release/dist \ @@ -170,7 +171,8 @@ src.txz: ports.txz: mkdir -p ${DISTDIR}/usr - ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports + rm -f ${DISTDIR}/usr/ports + ln -s ${PORTSDIR} ${DISTDIR}/usr/ports ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/ports.txz \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \