From nobody Mon Nov 18 00:18:38 2024 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 4Xs7Wy37vhz5dbgC; Mon, 18 Nov 2024 00:18:38 +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 4Xs7Wy1n4Rz4QKY; Mon, 18 Nov 2024 00:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731889118; 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=yFA8ZptrZRrsb727MROemPlVFTHNeSWmHZsxzvhoZPc=; b=rh51bNuzGrXGTfeSlei1fovJXxEZyE45FSb4pQIo8FxA2aaoXl+zYV50Z17smhcm2CMa82 qnz/XbqCBQedDdF2hNT+iS7jnuHwDFIemDqlSoZiBTmHW5eYXWpLBUElsdk4GggV6D/5fG a8pW58bCLTGDsINFXFBZB5ckSHzwJiPlBPsGbVXPWXtMHOjmyt3FXvKqZBZuTTLJlnnxaY oBJY4cVkJ+PdTGm8A/IR/vypzOEFl5w72RFRYEUTAOj/TBlU+iAiO7kUuNvWsdDlLhrs+1 IXZkaCKBeoeNxQQnsIdWUTwODiACHfHgOqnpf4sECzMRjLLWFTr9/XkL5yGZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731889118; 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=yFA8ZptrZRrsb727MROemPlVFTHNeSWmHZsxzvhoZPc=; b=EZm3vkEmLfO+ppKR2VGFAvzsIr9W7SNc4lLS+hSokpcL4L+T5z8LVJzjBjM8we4TVtsf9l Iy/4MzoX/VEJ6We9r2KjBLxuV0lYpOiX32H/V6hSLUrjH8MF9i4eujZZv4YfgbdLzTKLsh EhcWeZ59uzsBq+bsEWTnlPtXr390ylyRtGDLcUUM0Qz6kl6dU5A3V8gIrPIgS5dPfta/w6 eFYADPDk/hUlm09bhh1LkOeTfh9xKr/SuQvl70tz9oHW9fjQY67ubKUQoojqDodlyfb9IE V6yPObvcCHQiJXwGCOuxO71ULbo3JJzT4QaXaZ7HPil52vlEn8nPGGq8LT8QCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731889118; a=rsa-sha256; cv=none; b=LbZ2BnjGeAZrn1NSbqWIQkpdRRZzOlgfa/FlHfV8Dv00dslKfNHnsbqDLtt9Act2ir8f+3 hvpp0S6yaYHdpGIiVhcVZ+r0JeKHeRWnGuRZgURlidP6I4ggwttZt22UxFSNjgN16GTelX 3kgX3lhDx19MPZlGHdhP58TkpZbLxOvXQ6hkWSvw55BphfwxNDEyAi8T97BJ9BJpsNxPRM uA/jawtzLg6xVCnPdPNVnlDx1ylytppNYdNoB84XvArsAJJQkdxDujii7f0JQ1imj9i2wx kfLOz4jtb2ZKZKS58IuOYMHeINrZ+5mWl4YeuflZvBBFC2b8FORqVntF2ZJKJA== 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 4Xs7Wy1B6bz1Cx3; Mon, 18 Nov 2024 00:18:38 +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 4AI0Icox068941; Mon, 18 Nov 2024 00:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AI0IcFb068938; Mon, 18 Nov 2024 00:18:38 GMT (envelope-from git) Date: Mon, 18 Nov 2024 00:18:38 GMT Message-Id: <202411180018.4AI0IcFb068938@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: d54fdd16636b - main - release: Remove empty suffix from file names 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06 commit d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06 Author: Colin Percival AuthorDate: 2024-11-18 00:06:17 +0000 Commit: Colin Percival CommitDate: 2024-11-18 00:18:20 +0000 release: Remove empty suffix from file names For "release" builds (as opposed to "snapshot" builds -- in this context BETAs and RCs are "releases") ${SNAP_SUFFIX} is empty; but it stuck into some ociimages filenames via a copy-and-paste error. The final filenames on the download mirrors were not affected, so this does not need to be merged to releng/14.2. MFC after: 3 days Sponsored by: Amazon --- release/Makefile.mirrors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 8856389979d1..7f7c34e21077 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -360,8 +360,8 @@ oci-images-stage: . endfor . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/ociimages && \ - ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} - cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM} + cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM} \ ${OCI_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor .endif