From owner-svn-src-stable-12@freebsd.org Mon Oct 19 22:27:22 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D67F436450; Mon, 19 Oct 2020 22:27:22 +0000 (UTC) (envelope-from mhorne@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFWbF72G2z4HXL; Mon, 19 Oct 2020 22:27:21 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D47C9AD9D; Mon, 19 Oct 2020 22:27:21 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09JMRLsn048189; Mon, 19 Oct 2020 22:27:21 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09JMRLKq048188; Mon, 19 Oct 2020 22:27:21 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202010192227.09JMRLKq048188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Mon, 19 Oct 2020 22:27:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r366864 - stable/12/release/arm64 X-SVN-Group: stable-12 X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: stable/12/release/arm64 X-SVN-Commit-Revision: 366864 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 22:27:22 -0000 Author: mhorne Date: Mon Oct 19 22:27:21 2020 New Revision: 366864 URL: https://svnweb.freebsd.org/changeset/base/366864 Log: MFC r365884: arm64: generate ISO release images This was modified slightly to cope with how ESP partitions are generated in stable/12. Sponsored by: The FreeBSD Foundation Added: stable/12/release/arm64/mkisoimages.sh - copied, changed from r365884, head/release/arm64/mkisoimages.sh Modified: Directory Properties: stable/12/ (props changed) Copied and modified: stable/12/release/arm64/mkisoimages.sh (from r365884, head/release/arm64/mkisoimages.sh) ============================================================================== --- head/release/arm64/mkisoimages.sh Fri Sep 18 14:40:13 2020 (r365884, copy source) +++ stable/12/release/arm64/mkisoimages.sh Mon Oct 19 22:27:21 2020 (r366864) @@ -19,11 +19,6 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -set -e - -scriptdir=$(dirname $(realpath $0)) -. ${scriptdir}/../../tools/boot/install-boot.sh - if [ -z $ETDUMP ]; then ETDUMP=etdump fi @@ -39,13 +34,18 @@ fi if [ "$1" = "-b" ]; then BASEBITSDIR="$4" - # Make an EFI system partition. - # The ISO file is a special case, in that it only has a maximum of - # 800 KB available for the boot code. So make an 800 KB ESP - espfilename=$(mktemp /tmp/efiboot.XXXXXX) - make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi - - bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o platformid=efi" + # Make EFI system partition (should be done with makefs in the future) + dd if=/dev/zero of=efiboot.img bs=4k count=200 + device=`mdconfig -a -t vnode -f efiboot.img` + newfs_msdos -F 12 -m 0xf8 /dev/$device + mkdir efi + mount -t msdosfs /dev/$device efi + mkdir -p efi/efi/boot + cp -p "$BASEBITSDIR/boot/loader.efi" efi/efi/boot/bootaa64.efi + umount efi + rmdir efi + mdconfig -d -u $device + bootable="-o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi" shift else