From nobody Mon Aug 19 18:11:30 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 4Wngdv1q0Qz5TDR9; Mon, 19 Aug 2024 18:11:31 +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 4Wngdt5lZmz4TMm; Mon, 19 Aug 2024 18:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724091090; 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=Kn7Q534AU8XROiow/RcW5dlAZz6GwGt+5qVx2S70FiA=; b=eK9h5a3VBkdLpA1a12UBoHYNsFSsGllVRHnmXtBemQFK76XbY+hTZ+cbKlds6kl3DsqA7c 2LPvenYzgumMxSZJxIlBbHbO+B327px5cWbjeYfW+VU6aUDC06At1ibWDPs3klWZscoTUU fZiv6zpS9TkG6pOC56jrc9ciXRuy/vlLZoQWmQtonKUzwUTXITa0jjYxoOn+KJavugKcIT xBRlFVSsKhw9mqOuQ7J8keb9irHYulVSMQ6zdIzYraR+2OviB9fKUuRNnC2nJ0vqsYRO9o NFvf2Xe8E5+O+ObpPjha5bI34GLk8qxrfJg5sHSwg9WVFHu2JmHhPfaEyjEHEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724091090; a=rsa-sha256; cv=none; b=b8niffiVnwYSjjuzeCnoHir8xy4ys3WlG2sqAaSYIEcGh8Wj5p+jewLt08EZihniGJlNSD po/cXYHjuChMBjAb4kUrDYl+YLUYZcD0UwEvJtT2gp/z0zPVFnYs1SdpGYGl5+g+4MRuDJ Du02yoKxn53h5cG2JK9BW60q7UTf/hhoifk9o2Q2gMTOD13ZlaosL94b7HT7wTv6XACXK8 irWS2LL9HLFW/McOv4pnm15QxWCI6jjZZqKdPdPUL54jxisqLwGUIRiflcqnsVcdHLXrXw zwDO2Wc00C9z64W5QfLEpASS2uHba9cicEU1g/wvCEMDjstSJLswKQvz1awlQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724091090; 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=Kn7Q534AU8XROiow/RcW5dlAZz6GwGt+5qVx2S70FiA=; b=LGvfkH+unffgqU5JtdCcBsoK4adtL4f9m4bMcz0INIsCQV6qjykRFr6AhHwUjY8+LJQHuQ q6+6NG0Y7Ymkg4G7pL4ghyUDkdQOjhjjn3zpjMqgjpsACs298txzwntizEXYhbuRFIawHc y3EMu+zAAfc3qTDlM3wUcJVyzc8xAJpduQovIw94JIrl1dlJkdjwOSCAxAT7u4P0EfESSU hfy3YwtIjngy5rChrm8hE89Rm8Anuh8F+BezYD5xk4LhjnpfP/rg3wlS4pVhvNiCRSWOXE wLnGgxtQmJFqzLOOOqjc/z7Xt6HgtY/CT9nMohWzVf55MHg70V7WjoaAO/8qJg== 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 4Wngdt4LgGzRjC; Mon, 19 Aug 2024 18:11:30 +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 47JIBUcN065193; Mon, 19 Aug 2024 18:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47JIBUlA065190; Mon, 19 Aug 2024 18:11:30 GMT (envelope-from git) Date: Mon, 19 Aug 2024 18:11:30 GMT Message-Id: <202408191811.47JIBUlA065190@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: c482d65cd187 - main - EC2: Drop UEFI-PREFERRED from AMI 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/main X-Git-Reftype: branch X-Git-Commit: c482d65cd187a5cc311ede3e328270bfcd014e73 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c482d65cd187a5cc311ede3e328270bfcd014e73 commit c482d65cd187a5cc311ede3e328270bfcd014e73 Author: Colin Percival AuthorDate: 2024-08-18 02:05:52 +0000 Commit: Colin Percival CommitDate: 2024-08-19 18:11:17 +0000 EC2: Drop UEFI-PREFERRED from AMI names Starting in September 2021 EC2 AMI names have included the boot method: "BIOS", "UEFI", or "UEFI-PREFERRED". The third option became available in June 2023 and allows AMIs to boot via UEFI on EC2 instance types which support that, but fall back to (much slower) BIOS booting on the instance types which don't support UEFI. Since UEFI-PREFERRED is basically a best-of-both-worlds option and is now the default, there's no point mentioning it in the AMI names. If for some reason an AMI is built with the boot method forced to BIOS or UEFI, that will still be included in the AMI name. This will not be MFCed, in case anyone has scripts which look at the AMI names on 13.x/14.x. Sponsored by: Amazon --- release/Makefile.ec2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 4363aac21369..27e6340dca2b 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -29,6 +29,11 @@ BOOTMODEOPT= --uefi .if ${AMIBOOTMETHOD} == "UEFI-PREFERRED" && ${TARGET_ARCH} == "amd64" BOOTMODEOPT= --uefi-preferred .endif +.if ${AMIBOOTMETHOD} == "UEFI-PREFERRED" +AMIBASENAME=${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} +.else +AMIBASENAME=${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} +.endif CLEANFILES+= ec2ami @@ -83,7 +88,7 @@ ec2ami-${_FL}-${_FS}: cw-ec2-${_FL}-${_FS} ${CW_EC2_PORTINSTALL} /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ ${EC2ARCH} ${SSMOPTS_${_FL}_${_FS}} ${BOOTMODEOPT} --sriov --ena \ ${.OBJDIR}/${EC2-${_FL:tu}${_FS:tu}IMAGE} \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${_FL} ${_FS:tu}" \ + "${AMIBASENAME} ${_FL} ${_FS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS}