From nobody Thu Nov 21 06:08:01 2024 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 4Xv77j2zNxz5fHWR; Thu, 21 Nov 2024 06:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xv77j2Tlkz4sC9; Thu, 21 Nov 2024 06:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169281; 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=lW7bIRrFEDeP2XKwLjuI3tLheMSx9kJUXPp9YWiyo/s=; b=ZikVMIh6kJcmM0VhC+ixsFJkAsQGTgMHW4NsTT7a6G3GVKrg6hehREtVsPZobQNwRXozRM IWOfUuZl9qVUu/QVI6V7GwahD1tv1101GqYl3TDHoZuMAyfqDmOf5fvU4t5mcfj+Z87Fxj cS23wTgDSH19JI3tvkU7EQJ3Xs268Qys0/qEOZ0YxK7YnARfD+mQBB+BhAr7oHoGOjgCgM bYd1KVHuwm1acPknXJnC2S1O8Iwk1RqG+sua9+MvEYrLlj/S2CWdz6iyCjUPc8JEM6hftS Y+bVPqXQGAVdRs3UYGinmEUwKmDg8VKJTu9rXDWpNOCP+rHebY4HgPguOD+5vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169281; 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=lW7bIRrFEDeP2XKwLjuI3tLheMSx9kJUXPp9YWiyo/s=; b=aB7/75KWLHsvkm+XFHQyfXpH289TogCbwcOJNhNsBMUDFs7vz2Mwcbgvj+mi4Kg4ch9M0L w39H0jbDDMSZHUBYkTYlG6jE9hi1aN2c5iaL7qFFKt4+P1MoDz1/KbeGy9Hqr6869XPSAK d2PQ39cLPGj8mUx663y5VP8XRNtnQ8CLKIlNagiu28qxx3mxdzDDSYIaWRKK/rteiplITe 5qB6CjzoVnuucIgIcN5L30/xa9aGLIfN15aEyOSG/fgDR46KL/lbJvZOARqzpWH2q17EkR sLQ0yVF45fJktHEtkUgq/JlgXwqLjUZt87mf8xQh6nTUHkQ9lJ9P4TaKUkKwCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732169281; a=rsa-sha256; cv=none; b=LsQRTSRXCfbvAEC8sbX/boK6AZJPxec5wPuG9CtnQEa0kdJe+h+wo3/mo3kUKheF9tSzwd rkzcCXZIUnNlGMBANjIrWcrkiPuxQqXy8GPb51nyzfC1TMhNfCEPxV3rXqaqh3ceRcJ1be BF4CB2uYaZwyf+hgEkPM2go5acI5wcgBRJhhY+AvKhlCcOam8F/EshSBYeRXpsiyBGPzam hfe26V++XMkWUHDaoeIf9SdDYMnAFFQ3rEkIAwqalsx+JF03nSSOqbFx0M9/UNSffZZpxO D+itOG0VclPmAhAT3D2yRHuvuIji8LOv9un33PH7RKzt/RV727mbLQOYMRXEwQ== 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 4Xv77j24jKzRCM; Thu, 21 Nov 2024 06:08:01 +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 4AL681hZ059715; Thu, 21 Nov 2024 06:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL681Jk059712; Thu, 21 Nov 2024 06:08:01 GMT (envelope-from git) Date: Thu, 21 Nov 2024 06:08:01 GMT Message-Id: <202411210608.4AL681Jk059712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 60ec1704493a - stable/14 - release: Remove empty suffix from file names 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 60ec1704493ac92de9cb997c27d04ac199aa6ab0 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=60ec1704493ac92de9cb997c27d04ac199aa6ab0 commit 60ec1704493ac92de9cb997c27d04ac199aa6ab0 Author: Colin Percival AuthorDate: 2024-11-18 00:06:17 +0000 Commit: Colin Percival CommitDate: 2024-11-21 06:07:50 +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 (cherry picked from commit d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06) --- release/Makefile.mirrors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 8af614d9a9bb..7e25d69588bd 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -380,8 +380,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