From nobody Sun May 25 13:06:42 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 4b4zgQ3vXzz5xXbR; Sun, 25 May 2025 13:06:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b4zgQ2p7yz44HP; Sun, 25 May 2025 13:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178402; 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=uD4F7fDQuid/LHsbrDPAWs3afnE0VX36yS9ZJg1VTuQ=; b=RSCadujg/VHwtkHqPERwN3+u55U0vj5X3AGaz5dZQUrYQzpg18r+dIehqI9QYNpUfdHRcN wI6YuV/XCoLVgqDtKEb6wdmEHDLznz8DfMoOSVRMUm9TlmvzSH1eyPB2wC+eSVKBl6SWd1 B5r8f2A7LdMGgI6m5ENVPIgFl/UsBQieFmqGFocPo3s3gGHG477KtuoQnX323AIw8+p73X kwuu9HjeI2JjiiFr8mIK23kAz1JOXGW5bWBzHP7rVs1JhRFuj1p8wcDbhnY/ImwdIsbTth B7chCX6WIARlyXWDVyeWO3buOpdSZ/vXmG/qAH3Cbl/UjsLIEnGggHsItdESzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178402; 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=uD4F7fDQuid/LHsbrDPAWs3afnE0VX36yS9ZJg1VTuQ=; b=KbdFdmf6fYbjOFND/ROilog+syfNaJte0oo9mODj4B5W0yFHVEIiEr8l56NIth3d+Aqhhv f35c/EV0CQ4hEw1rGviWJkETFuDANHbX+AZhUYGOHkw6T3m7RU6KTDxJ+T/prQmeAmzQh3 8W269NA8MJQpA3OJrgN1tTr1DtT/PLzZEkE2/2gpshaj0LRl4YfP7YNe8EIVQgsA8V6kop 3fmCRP9W2mUgQoUag0NXi8sXmN7BOpDzJwg3i3EceirbyR/VngIC9YD6EbShrKegOtluC2 4uVw1kwyWijRJnM7qjYqUBbuwK7bkL9hdqyUeRVZ8T04XmTN/u0udovUvUp2eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748178402; a=rsa-sha256; cv=none; b=gyDJwMzuqVpsPy3miMwRzTJj7M8hkvJza6bVeh2VWNBxsztAMIYFP9yUu1pv/mMAolC2+k Gu/abG0QXeT3joJ/AjbGIAhn2WsUAPZjNVkWf5pu5RxKnWtGEH9T3DgEymPzGLBERcA+qq IHlZ0uA0j+G2Zw/8m3a8OYWy1NLQNuGidml8QDTQj8MpVZO1MSb9nQEqusX1m97kPJGw3g lMi79ghbDcoU0OA/6Ge85PMsRFNEnmgwY5ylQPp/de87h5//O6FwJKXz/fHrgVugPItOqz 0BWrU1poUiCewRjj+Ldkauuz1v76mH6aRsrmxgyhfXWPc9cW+sFeGppJWkfhhw== 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 4b4zgQ2J5Qz78B; Sun, 25 May 2025 13:06:42 +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 54PD6gbx071113; Sun, 25 May 2025 13:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PD6gCV071110; Sun, 25 May 2025 13:06:42 GMT (envelope-from git) Date: Sun, 25 May 2025 13:06:42 GMT Message-Id: <202505251306.54PD6gCV071110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a28f7eb863d5 - main - release: Avoid pipe in tarball creation 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a28f7eb863d52140088c4956797d97a207ac7e6e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a28f7eb863d52140088c4956797d97a207ac7e6e commit a28f7eb863d52140088c4956797d97a207ac7e6e Author: Ed Maste AuthorDate: 2025-05-22 18:52:34 +0000 Commit: Ed Maste CommitDate: 2025-05-25 01:00:41 +0000 release: Avoid pipe in tarball creation Previously errors from invoking tar for src.txz or ports.txz were eaten by the pipeline. If something fails in creating these tarballs we want the build to fail rather than producing subtly broken artifacts. Use ${TAR_XZ_CMD} to add -J to tar's commandline rather than | xz. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50459 --- release/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index a5f5b65a562e..cf941534995b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -158,19 +158,18 @@ kernel.txz: src.txz: mkdir -p ${DISTDIR}/usr ln -fs ${WORLDDIR} ${DISTDIR}/usr/src - ( cd ${DISTDIR} && ${TAR_CMD} cLvf - --exclude .svn --exclude .zfs \ + ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/src.txz \ + --exclude .svn --exclude .zfs \ --exclude .git --exclude @ --exclude usr/src/release/dist \ - --exclude usr/src/release/obj usr/src | \ - ${XZ_CMD} > ${.OBJDIR}/src.txz ) + --exclude usr/src/release/obj usr/src ) ports.txz: mkdir -p ${DISTDIR}/usr ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports - ( cd ${DISTDIR} && ${TAR_CMD} cLvf - \ + ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/ports.txz \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \ - --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ - ${XZ_CMD} > ${.OBJDIR}/ports.txz ) + --exclude 'usr/ports/INDEX*' --exclude work usr/ports ) .if defined(PKGBASE) PKGBASE_REPO= pkgbase-repo