From nobody Tue Oct 11 19:20:23 2022 X-Original-To: dev-commits-src-main@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 4Mn5GH3FvXz4fFLw; Tue, 11 Oct 2022 19:20:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mn5GH2nNwz3Np4; Tue, 11 Oct 2022 19:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665516023; 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=19KBrKTEfSRX+kmuO7dyvOBE2Datoj6GFR8PXuL9QX0=; b=POPjXsvY3KJHyJLWB8iifGRdKaqhOHrzpYxI1vkd/x7GQ16J+IOlznAa/wWY1V246hXfLS JqtVUIsq5Pi16zbHVVQTJF1rcax9x7EGt41KK7E78F9H/J+5RcoOetsZsdpUwdlcY4fCUC lZ1osbqWnyz/VSae73a5q4Kd61zwDix4T/KY6do2PkhYoLnDh2prNqn1drNlOZPXdGVYLC KnnOl+uB8x8ekfPALVkjFo2x9ul8gwt+CYPekVK+r/F9+vuQVt3WYvxiY0GIPloith9+s0 uz4BOt4yVhsO7/wS840diYrJxds1tOyLS8CXzB/zV7GFjcodQjT/HPrxD1Bvhg== 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 4Mn5GH1rgDz13h8; Tue, 11 Oct 2022 19:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29BJKNYw008891; Tue, 11 Oct 2022 19:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BJKNHT008890; Tue, 11 Oct 2022 19:20:23 GMT (envelope-from git) Date: Tue, 11 Oct 2022 19:20:23 GMT Message-Id: <202210111920.29BJKNHT008890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1be88beabb3c - main - release: link from /boot/msdos to efi List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1be88beabb3c9856e011bc2628120562e46795fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665516023; 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=19KBrKTEfSRX+kmuO7dyvOBE2Datoj6GFR8PXuL9QX0=; b=yURzSEkUjcwHGUQWzDHIKkfSsyqvt5+YEq1fi7z8fj1GQSD6i/qJRVzZZJ9+NyRevT1/y7 cXiA6ioK4qukjonRajFJAPI2USm77NR2AsR+i9lkrT+FN/KGWHaDfP1jkxmACiy+86jSg1 L+vt8lGBet24JH2cY6s7iTV33z5k7WcIOUSWb+a719w7Ie3ctB1yGUOMxcv8NLDhT3tYmZ 96Vz4bJOIU4IitcItxwIceh88C/cRsW2YghdrVB6wC4f30rIi6kpzMGCHoGV4cw/KyNanK ydDnXoyKfb+ZfLFHjKNzymKLuH9oAzK60IL8Sdrp6M9UeJ4m29Y7619GvZ4Srg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665516023; a=rsa-sha256; cv=none; b=Z9W1hvTiIEx3ZyVwCbgQyYFvkgmkYC/Ewrw52G9HMTc4cmjUh6i5uK2BncQTIJJ95SsUoU N8t/1UvEP9p8Iu20gY0THO2YIghIgkZNXyPTQc9dzNr1kP5T1mDQA/JFpZZjsVhDs8Jfqk eB2oN8Q6xSFDteuTUmAL+7i5ZDvOykETds2hakR+sns5I7VCCD1KuibQrQ4BcmS68JLouF 3K6mDnjWYCmWvbek5QmcdfzXQJncekACuki8Ez3AzeAyDC2sQc2kYn+MBrcAyb15hwAFu3 XfVe0P1CRR7f8hcl3BSAE+6ScLS5GJsbq2mkowU0V8hS2yuNRrBKML6ZQpuoVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1be88beabb3c9856e011bc2628120562e46795fe commit 1be88beabb3c9856e011bc2628120562e46795fe Author: Warner Losh AuthorDate: 2022-10-11 19:19:52 +0000 Commit: Warner Losh CommitDate: 2022-10-11 19:19:52 +0000 release: link from /boot/msdos to efi We need to do a relative link to efi instead of an absolute link into the build tree. Sponsored by: Netflix Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D36941 --- release/tools/arm.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 9e0704d7c95d..99bfde33c801 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -190,7 +190,7 @@ arm_install_base() { ${CONF_FILES} installworld installkernel distribution chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi # Compatibility symlink to /boot/msdos for 13.1 and earlier - chroot ${CHROOTDIR} ln -s ${DESTDIR}/boot/efi ${DESTDIR}/boot/msdos + chroot ${CHROOTDIR} ln -s efi ${DESTDIR}/boot/msdos arm_create_user arm_setup_usb_otg