From nobody Sun Feb 05 21:47:01 2023 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 4P92zT6rlnz3ktnf; Sun, 5 Feb 2023 21:47:01 +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 4P92zT5ZWMz3k3d; Sun, 5 Feb 2023 21:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675633621; 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=cJidN5WtEbiCYsBj0vdiVfFLPpEtrEMwBjgep+B949E=; b=SgxehPD4/43ogOymPzCrOcrIDcvKvCEK07jRStTSwZWmYd2zA4BEGnPHFVE4ni0sq/GPNL 0PrPJpBiVogV8t+8lfLT/fByNlmx6ukfP3BCW9DLlTdT1XXcoLNyyQXLsUfM/qAXrlWjaE gvxC+YQw9fOAq6ml10xLV+Ksjb8BZW4Md4gbNvPDngfaBAgt3XxCyb7DsScC+86HJFlDfv vvk1AXdrivLPiKrXeeOjaPEpKHJiy/HAvNEmfxqPkyzX+NYGma/ywZTIITaQIwTpYsjngf ADWohh+8dEx+gTeSahGS6tEWb/6U3u/2TysmKy4n5Mt9wns+6OWcuAfFfx+d/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675633621; 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=cJidN5WtEbiCYsBj0vdiVfFLPpEtrEMwBjgep+B949E=; b=mh61OeLh2H+0jl9o9IF8T7LEL0qSQMEs524QRwIYxeQ1qWLoDDBf+pFrSFVqV75GGoL2tV MR6eXQn6zh5b+RtPoX/4Y/O0Rp2XRjv5/ZMLbCIC1yqWEtg+1iYFzeLpGWItYXW3su1F0i rm44u4+vV6BiDb3UE354GjPUVUcC6eLqJ2sH9suoI7TXpiVda6bn/g/cZG0yeTG++9NMpu rRMSOwwDQrAz7+HzuexuR478Ix8X64nmJso830XHGWq9gN8o1cHLpse6QmMwCz+AgUSUSb 6dP52z2UyZ9C7zrCzOPzfdtqE8luI+fWhldnZaZH69cljj1ejW/Rdh1C8ZUBNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675633621; a=rsa-sha256; cv=none; b=L1tMBZuyvxtIbdMK/wak6dwjmKucSPIe/TwMpf7nlMZuvjKatLFfVR8vc63G7BOUA7Upd5 1m4kxfCq0e44IGmwQII+QTXyBourtB7rrxPFlCT+tJQhWKZW04Z7woHEJeowrOKzqEhN8g 7Az8Gw9c2TB6/wXJ5+nknt6aS7kwW3Pv4UGMPSUwprOmW5cGTeLyEedOebWlv4uqGLwThA bt+zI9wXilpjrbhqIewiPocm9Tg1ul6Ocm1m2CCLNCvubTMsvd7PKb3NVmmo7syVxVFYJm kUxnyYnfAyiUPCAM8tb2HEvapuRHgcPn6YVEnsxIjccm2O20pNwJYtdSenkSpw== 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 4P92zT4XZGz19N6; Sun, 5 Feb 2023 21:47:01 +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 315Ll1wH048530; Sun, 5 Feb 2023 21:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315Ll1ZX048529; Sun, 5 Feb 2023 21:47:01 GMT (envelope-from git) Date: Sun, 5 Feb 2023 21:47:01 GMT Message-Id: <202302052147.315Ll1ZX048529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 15d0c8a17270 - stable/13 - release: Don't install ubldr.bin 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 15d0c8a1727036fcb319e3e230e80eb9825e2596 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=15d0c8a1727036fcb319e3e230e80eb9825e2596 commit 15d0c8a1727036fcb319e3e230e80eb9825e2596 Author: Warner Losh AuthorDate: 2022-02-07 20:16:15 +0000 Commit: Colin Percival CommitDate: 2023-02-05 21:46:07 +0000 release: Don't install ubldr.bin ubldr.bin was obsoleted by our uboot ports last year, so this is completely unused in the default config (some customers still use it, but that's not relevant to this script). Don't copy it at all since it won't be used for re@ produced images. Sponsored by: Netflix Reviewed by: kevans, gjb (re@) Differential Revision: https://reviews.freebsd.org/D34192 (cherry picked from commit 4e46c6fb35b3d5803f10c5edb5dabaf3cc308517) --- release/tools/arm.subr | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 69f56c7c6520..d07dbb41b48b 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -248,11 +248,6 @@ arm_install_boot() { chroot ${CHROOTDIR} mount_msdosfs ${dospart} ${FATMOUNT} chroot ${CHROOTDIR} mount ${ufspart} ${UFSMOUNT} - if [ "${EMBEDDED_TARGET}" = "arm" ]; then - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - fi - BOOTFILES="$(chroot ${CHROOTDIR} \ env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ WITH_UNIFIED_OBJDIR=yes \