From nobody Wed Jan 14 22:10:41 2026 X-Original-To: dev-commits-src-branches@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 4ds0g60hn2z6P073 for ; Wed, 14 Jan 2026 22:10: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ds0g56bvWz3H2Z for ; Wed, 14 Jan 2026 22:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768428641; 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=qnKm+FSEooWnrALjk6Xrcrea9/xIVvaxWNPKFe/Cqiw=; b=Nrgrz0VaDL8x80P4xMMTPaNLeVQoya52pYYYxMcTZjIcd0JFX5kueAcnN1VgIf72FBYQaf m6EYD6tdSzFHmMX+11oi0xQ6xpSnwns5XUlskJUcGWzYOLJfYx52yQaijvkPWt8fN2G8Zz zoYc2fUXJnjOlS6Zue0cjyfrxWCbjwWiIvW648DfrbNtg/VsQHc9imkKwGsHvnaZxAdm8r HqzBasV/ksv+NVyypDdNtLH78XaE0kRVkGyvNyv8sPYMUvHLfzE/CHQ9BIiEWKAMYtfiHP rcEp+QhGFdLEOoTOvK5RQporauQV2qyMwrOGSurcEhJ3iXlfPwzcWAa1XzeqRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768428641; 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=qnKm+FSEooWnrALjk6Xrcrea9/xIVvaxWNPKFe/Cqiw=; b=MU4pM8kbEcbq89/j+FqfBtQef4qmIHhHgsjim+YSRoxAUaFuod1FY+ZcHuw6KKPxEAW0db zxStd8p0IBTsGXTsvseyw8Xmrqpp3I1j/hTLlqvMzacoKSg8smxqV6KrHnEl9GXEYx2DVB JFTXCV9Gn3tZ5kHTUgna+GCsmi2ej4JMwhzCztMCwA5JPj/TCG6yPbJ2acr9X8g1/L32vp t90it5JH8m77Gxa9GDOsSfwnJMiyGM3BEe0DglcWpQGvk/e2n0Pqmk/N7BT5MUwQsI4xgp 5gRsN0XYI9KN0OqqTi1OK7efd5gCzDyHQX8/jsBefs70RCkfqmbW6T94bcGdQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768428641; a=rsa-sha256; cv=none; b=RZCbb6e69FRHrZyIJmWLHJPZnzj+FxOUYr1suLXBgRaOb4uqtdC4vN5bt8eo1g1M8P/EQW awhnCMRI04zbXEN0eRLXO8KIzOBiJHmc7j6AQC8E+1SVaECPcrY2gSyYy5n5u4WRWf77MF dQfUIodMXouUDWYlK1reY2tAgs2z4nuRRdmk2lXKtj1ZIE7JbKkZBv2QJjbnz77VBp54QM KoSVK/xGZj+DXwEmTuJQAqK74li1QQ7hST/fMcyGwvmo8xsUuk37KIBfbuBVkdlFsp12o3 o6hE2w+pIUe1dOMmDMi9MOFvXj1hKQf4fNQqqpdpJROwvaW1vvpLKCCE7K342Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ds0g56870z1FfL for ; Wed, 14 Jan 2026 22:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3037e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 22:10:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eb9c65a3d60b - stable/15 - EC2: Add extra SSM Parameter names for releases List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: eb9c65a3d60bb78e418d69a717ea34380e7aab10 Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 22:10:41 +0000 Message-Id: <69681461.3037e.3636f9a0@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eb9c65a3d60bb78e418d69a717ea34380e7aab10 commit eb9c65a3d60bb78e418d69a717ea34380e7aab10 Author: Colin Percival AuthorDate: 2026-01-11 22:25:51 +0000 Commit: Colin Percival CommitDate: 2026-01-14 22:10:32 +0000 EC2: Add extra SSM Parameter names for releases Record releases in the SSM Parameter Store not just as e.g. /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE but also as .../RELEASE/latest, e.g. /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE/latest The latter parameters will be updated when new AMIs are built with security and errata updates appplied, and have been backfilled for 15.0. MFC after: 3 days MFC to: stable/15 (14.x will not get security-update AMIs) Sponsored by: Amazon (cherry picked from commit b558c92fd0005d311edbcd02953c17d4a34fb909) --- release/Makefile.ec2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 47561feefc23..c33345201b36 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -61,6 +61,9 @@ cw-ec2-portinstall: .for _FL in ${EC2_FLAVOURS:tl} .if defined(SSMPREFIX) && !empty(SSMPREFIX) SSMOPTS_${_FL}_${_FS}= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/${_FL}/${_FS}/${REVISION}/${BRANCH} +.if ${BRANCH} == "RELEASE" +SSMOPTSEXTRA_${_FL}_${_FS}= --ssm-name-extra ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/${_FL}/${_FS}/${REVISION}/${BRANCH}/latest +.endif .endif EC2AMILIST+= ec2ami-${_FL}-${_FS} CLEANFILES+= ec2ami-${_FL}-${_FS} @@ -84,7 +87,8 @@ ec2ami-${_FL}-${_FS}: cw-ec2-${_FL}-${_FS} ${CW_EC2_PORTINSTALL} @false .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ - ${EC2ARCH} ${SSMOPTS_${_FL}_${_FS}} ${BOOTMODEOPT} --sriov --ena \ + ${EC2ARCH} ${SSMOPTS_${_FL}_${_FS}} ${SSMOPTSEXTRA_${_FL}_${_FS}} \ + ${BOOTMODEOPT} --sriov --ena \ ${.OBJDIR}/${EC2-${_FL:tu}${_FS:tu}IMAGE} \ "${AMIBASENAME} ${_FL} ${_FS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \