From nobody Fri Nov 07 05:13:16 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 4d2nJX35kLz652X8; Fri, 07 Nov 2025 05:13:16 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nJX1z5Gz3Q9m; Fri, 07 Nov 2025 05:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492396; 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=DBH8SpKSZAr/Yy1pIK5sjWglCll2/LlDZQWcFPJASsM=; b=ktC+YyLp6FkRQAEFd1YYLReayyCEQxDy03hDDGCUzccb0pbZf9CWOewtRo+wvUqrbxb8OA pQr42OgDKrJxp3z99nD0LNVMzkh1PeqRmojpNXKNc2vrDzQ4ZyA71iFcPQ5FEWavkWo2M3 y/mAMQdzvuIYeMsgk93g+cAwWH18lxSUjoAgtNzSWyQgV8Fkm3X+eJ16JQZqgYaq/9/Fq2 UCssI/7oXD9fTV6IgoVNNpaQT+4vVxDChKBbvcWz0Yw6yDsgq3i9JxXUAs4hm6MmHA+M5B 9WwFGp0lVEYvOgr53XxnbMoljrU+g8ngn/UEslgibldQW0BVTMydPqthPYuhCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492396; 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=DBH8SpKSZAr/Yy1pIK5sjWglCll2/LlDZQWcFPJASsM=; b=KPaz4gOz0+eq5ot5Lx4+ftwhj7qpjCUORQziilAimrWYeKTPxE14td3M1p/Ag5Nx5S+JRr OqGlkcMzLSOINanShBEIrC32WWpwe2f25PsVR0mSsLx1tKnMB2V9BpGNCjV00rEOsm9Ugw kXDbm+gjDE/RDqbifcNOMY4MaWQnKF998cxKijTQd85nEGhE7w1EaBlKhqoNSd8fZVpz7r XXhvTyQS4WCvdBzlXuCR53J1iOovPXfHyr+ADPPqHWGxsH7M7dB+A0WPX4bQrwYzlyRjgq FhK92VFje8c3tVNAMy+ecEqiJlmu/bDVaIADtCC6QOoDsiK2z67otuF54cX8BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492396; a=rsa-sha256; cv=none; b=i7mbOABbxAPtNPugvXqgzVKFcGb5pQshiKYX79/grGZ2zJUPgURTJnD6+Bx3bE2Gn/cZg0 7FFq2RBOUAkSSBtX8AkcSz6JoxUf5ty5bOtaUT1FbGOEl3YiSmesz+OWUhXeb+UixJS+s6 sI5kAoiE5YD8KKe4lmiLuNfsZ1mL2xXI269UU1uMFAa3qRn5yB0+74kIj2Msurm9TcYRNQ 9C0tv57nxpmgUEHVHogIsH7TrN8QbXNqbb19Dt3+Z/bDrvMLe7WEagI6VbUZxudapkr5I2 YvwaPHd2O0fKzsi9nGJh9y10s2yAqLEiSVeDjer5p1bI4rsWreJFNSgMKcyDkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d2nJX1T91zmJt; Fri, 07 Nov 2025 05:13:16 +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 5A75DGwM091004; Fri, 7 Nov 2025 05:13:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75DGis091002; Fri, 7 Nov 2025 05:13:16 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:13:16 GMT Message-Id: <202511070513.5A75DGis091002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 72617603a28f - stable/15 - release: Comply with Azure Marketplace requirements for aarch64 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72617603a28fb19d45b1aac380f998c4551d5f72 Auto-Submitted: auto-generated The branch stable/15 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=72617603a28fb19d45b1aac380f998c4551d5f72 commit 72617603a28fb19d45b1aac380f998c4551d5f72 Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Li-Wen Hsu CommitDate: 2025-11-07 05:12:38 +0000 release: Comply with Azure Marketplace requirements for aarch64 Azure requires the first 1 MB (2,048 sectors) of the OS disk to remain empty for VM images: https://learn.microsoft.com/partner-center/marketplace-offers/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space Also append the BOOTPARTSOFFSET suffix for aarch64 images, which only has an ESP partition for booting. Co-authored-by: Brad Davis Approved by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53628 (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd) --- release/tools/vmimage.subr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 8531e9b8f2d6..92f00f9cf7c3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -449,7 +449,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}" + espsuffix="" + if [ -z "${BOOTPARTS}" ]; then + espsuffix="${BOOTPARTSOFFSET}" + fi + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi