From nobody Fri Jun 20 18:22:40 2025 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 4bP5S05ryqz5yNQm; Fri, 20 Jun 2025 18:22:40 +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 4bP5S04pL2z3fPK; Fri, 20 Jun 2025 18:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750443760; 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=V8H48wWkWljv3WcL1k30ewPQWInRqDjjtNWS+UEY9qg=; b=k4kyV3UaLCKi2u8FG5XVv40Sny8x7i9GVoWZe4SGSS+gyy44fH8tG/Yquz23M9ix4O/b6a oo1GRZgvQ4u/+eQKzsUOvxZ+5/dAitmK01LTsfAVjS7nO2wK/vOVST72QR0JYN4GDFjslT WPV4KtlPCxNSVnQK+hwhK3ybb7xJvP6rGBwDt3/7GYatEi5chQIC9fG2waJxIDdstTWZnv 7dHjezWp20QFpSXYZEv0bTM0g+8GprJ0IHhRdG6/QYOY4c0Ch7CXglCc4hCkSfOtXp7/rH OXpUpG/c8dhARymMnkjm2wWCOS0CM0vRAzV+H7I48Jur1IhhrT4n2oIYdBWxVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750443760; 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=V8H48wWkWljv3WcL1k30ewPQWInRqDjjtNWS+UEY9qg=; b=FEGciHWJmFLMUAbHx+QENwH/liM+BbrMkG7Ofjv3PLZCeNqo99FMoD1cHXPPiLPlLAMWY4 hs3mlGLIHs9QnSMI9F211Jmt/58R/nEi/wtNo1RhhOAZWzFqZfmY0IuETTmMgfXymxWlBd 4toK0rGo41fLfmll4UtBptjJ8Ed1IuxCPImVNdrMNRON0rdsY0TMUxIMdlqFHrmz0DFzia GxUME9aBzT4P4GrvFnt49hYq8TLbtzZK91/wXuayB95QutFpsTflsjLzwfpHl4mMz3QSXT bCJRcC9Goy4xiilpBjkhzg+Qty4hRdxkJ14e+1pV+plL5knpsDHfM4DD325ShA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750443760; a=rsa-sha256; cv=none; b=MI8nYirpQELU++opOR8ZIMefCwEHbfGIvpV3uv9mPiAhYTOHJzrrZfqn6c/bgY1YODDn6n PoyLrmV8Kn3PnRnLVh6zvT7leWvaGaBjUG6FBmPiZK4ERzeS7kptLzzkKId4Qp2fcAJ++1 0pwSMhFeXHXWwmGOkg95zTzkSEewEpN/nLV4JmdI2jeiMKPw7EjQ+beVfGxUCp0VSM+hWF 9rmAXjO/EAMasZDmsNwv9I5tPiTZSuJGB3OkPnO/KB858XZyCQWGmOTJtf55iezrkDgZwA 2JbDexnO+uAZKltudSUtTSVVN4NGT9CUUg2Kh7T6nJuKruBh2jSkXj0nbibFYA== 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 4bP5S04PSVzx0G; Fri, 20 Jun 2025 18:22:40 +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 55KIMesl067678; Fri, 20 Jun 2025 18:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KIMeFM067675; Fri, 20 Jun 2025 18:22:40 GMT (envelope-from git) Date: Fri, 20 Jun 2025 18:22:40 GMT Message-Id: <202506201822.55KIMeFM067675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: be7272d78a76 - main - release: Don't fail if we can't hardlink a VM img 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be7272d78a76c7a897b530538b905385f1b09f88 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=be7272d78a76c7a897b530538b905385f1b09f88 commit be7272d78a76c7a897b530538b905385f1b09f88 Author: Colin Percival AuthorDate: 2025-06-20 18:19:59 +0000 Commit: Colin Percival CommitDate: 2025-06-20 18:22:34 +0000 release: Don't fail if we can't hardlink a VM img For compatibility with code written before we added ZFS images, we create compatibility hardlinks from non-FS-labelled image filenames to the ${VMFS} (typically UFS) images. This fails if the image didn't build, and can take down the entire release build if we're not careful. Fixes: 611c1457ff32 ("release: Add set -e to abort upon failure") --- release/Makefile.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 975a8e970ade..8375650cd9aa 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -156,7 +156,7 @@ CLOUDTARGETS+= cw-${_CW:tl}-${_FMT} CLEANFILES+= ${_CW:tl}.${_FMT} ${_CW:tu}${_FMT:tu}IMAGE= ${_CW:tl}.${_FMT} cw-${_CW:tl}-${_FMT}: cw-${_CW:tl}-${VMFS}-${_FMT} - ln -f ${${_CW:tu}${VMFS:tu}${_FMT:tu}IMAGE} ${${_CW:tu}${_FMT:tu}IMAGE} + ln -f ${${_CW:tu}${VMFS:tu}${_FMT:tu}IMAGE} ${${_CW:tu}${_FMT:tu}IMAGE} || true . endfor # Targets without a disk format listed are the first disk format on the list