From owner-dev-commits-src-main@freebsd.org Tue Mar 2 18:44:52 2021 Return-Path: Delivered-To: dev-commits-src-main@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 E3FF954C162; Tue, 2 Mar 2021 18:44:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DqmJd28D9z4vBC; Tue, 2 Mar 2021 18:44:49 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from comporellon.tachypleus.net (unknown [IPv6:2601:405:4a00:acd:9508:6d03:14a7:a372]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: nwhitehorn/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 15DC78E2A; Tue, 2 Mar 2021 18:44:46 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Subject: Re: git: 2c26d77d989a - main - Remove /boot/efi from mtree, missed in 0b7472b3d8d2. To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202103021826.122IQfMN047888@gndrsh.dnsmgr.net> From: Nathan Whitehorn Message-ID: Date: Tue, 2 Mar 2021 13:44:45 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <202103021826.122IQfMN047888@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 18:44:52 -0000 On 3/2/21 1:26 PM, Rodney W. Grimes wrote: >> The branch main has been updated by nwhitehorn: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=2c26d77d989abe48c662eeb6f52f7e4c9b81680c >> >> commit 2c26d77d989abe48c662eeb6f52f7e4c9b81680c >> Author: Nathan Whitehorn >> AuthorDate: 2021-03-02 16:47:00 +0000 >> Commit: Nathan Whitehorn >> CommitDate: 2021-03-02 16:49:41 +0000 >> >> Remove /boot/efi from mtree, missed in 0b7472b3d8d2. >> >> This had prevented the bootconfig step from determining if an ESP exists, >> resulting in its unconditional setup. On BIOS-booted amd64, this wasn't >> harmful, just unnecessary, but it resulted in failed installations on >> non-EFI-supporting platforms like powerpc64. >> >> MFC after: 3 days >> --- >> etc/mtree/BSD.root.dist | 2 -- >> release/tools/arm.subr | 1 + >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist >> index f734f7891429..1dc9e179b0fc 100644 >> --- a/etc/mtree/BSD.root.dist >> +++ b/etc/mtree/BSD.root.dist >> @@ -18,8 +18,6 @@ >> rockchip tags=package=runtime >> .. >> .. >> - efi >> - .. >> firmware >> .. >> loader.conf.d tags=package=bootloader >> diff --git a/release/tools/arm.subr b/release/tools/arm.subr >> index 343d9f3a7034..2f91490c0859 100644 >> --- a/release/tools/arm.subr >> +++ b/release/tools/arm.subr >> @@ -184,6 +184,7 @@ arm_install_base() { >> TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ >> DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ >> ${CONF_FILES} installworld installkernel distribution >> + chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi > This fails to apply the proper owner/group and mode values > using what ever defaults are in place of the process running > the build. This script is riddled with such issues (see the line immediately below and copied here, for instance). Presumably, as run in the official build environment to generate SD-card images, this works -- if it didn't, large sections of the rest of the script would not either. It did not seem reasonable to fix it for this one case only or to retool the entire script at present, though some of this code should probably be looked at sooner rather than later -- I started with vmimage.subr already, but the rest will take a while. -Nathan >> chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos >> >> arm_create_user >>