From nobody Mon Feb 07 20:20:04 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 710A219AAF31; Mon, 7 Feb 2022 20:20:05 +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 4JsyDj0s5lz4T1N; Mon, 7 Feb 2022 20:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265205; 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=WKwzt+p7XX5MsBXUkvpPmjU4mUCRKRrNruID8ciXpXE=; b=wThtCjMt/3Bs68Cp9vnK3q6hDDawn43ScjrdlJf3v6ofkOv65NedsWOwvEKJlAtMc0ig+G LykP81BNTstl5v4PjUz1g2dq9u/QBp5Q3DSVNvTdeskRpfqV3UDWSzQiRmBUX1DrKzXEIe ll9s8UZjOkpNtOHyQKv5MASEAHX9VWadFsGYxD+u6iy9HEr7XIe48Ws6s+5sdPkIHP9dK7 pFxmZtG8oIN42nayC3Nq7sJRLkebqKa5gExng0ySgxtIlW/J+ikdmob4fJsOS2K2dKHDcJ 1Hh43Hs0X/MV+gsDzzn6OYzuxbFrkP7H2pHCX0/QZkhmd5VqA3D0+GctMCYm+Q== 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 D593843AB; Mon, 7 Feb 2022 20:20:04 +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 217KK4am000490; Mon, 7 Feb 2022 20:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217KK4WE000488; Mon, 7 Feb 2022 20:20:04 GMT (envelope-from git) Date: Mon, 7 Feb 2022 20:20:04 GMT Message-Id: <202202072020.217KK4WE000488@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: 4e46c6fb35b3 - main - release: Don't install ubldr.bin 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: 4e46c6fb35b3d5803f10c5edb5dabaf3cc308517 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265205; 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=WKwzt+p7XX5MsBXUkvpPmjU4mUCRKRrNruID8ciXpXE=; b=rrtTli0KfLFS/ukMUuNrNemooWOK7zisXAvM67mrYznVXONjmQppZyCUQhoj8OZtZnAi/1 G22hVZ7sKeow3Pre8BOYKJ+5BT746kGqDHmZhCepbpTHt/AzfmYvT2fJH/UOtXFRz9BUW/ v8bfJmiOFtJZOaXcQbJMr1Y2MHGmDsqs49S/6Nuj9XGDrOx5dCMeYNNhAeoaJoZTJ7IVQO e3ED7if+dq7ItZDjU8dSqLpxwQXLYJdvqxjaFp/bwdHzlEWL8XEleiJuKTQwMfUXjgPuGB +AotQiFgLJ8L7f0Cyk6lHLSduiKrwpg9xU0g/zam5ptw8d4o8iJrdo01J6HprQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644265205; a=rsa-sha256; cv=none; b=XADsxSVL4JKb+kCCFUGHBKDQQ45P6PuCKAgOhl66pzsGnRN1qXNrIoVwMkVgyypFmzzO9w nOWmDnQWA5BKVhult5E123IR/HWe9ECtl8K8AMkPAC1mmO/06HLKWWhFbV0MSBK8KOLjtj y14iwUD8XTMDYWPBsQGhc6Y/yabv+BUONaqWLySEiGnZdfDnoPje95/5EZzF84gcjB0M32 +qmutfLpBKqtFDSBdLWX9K9dgP7jNihakvzH2XFC6jM7Lm8PX3wKzhvcTABVzGPE4dzq1w 4+/r/DoPQmDr5LE1JxGVLwYm32nl7f9bWSfonG9jplIHXm34MlmCK5zysFTcig== 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=4e46c6fb35b3d5803f10c5edb5dabaf3cc308517 commit 4e46c6fb35b3d5803f10c5edb5dabaf3cc308517 Author: Warner Losh AuthorDate: 2022-02-07 20:16:15 +0000 Commit: Warner Losh CommitDate: 2022-02-07 20:19:20 +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 --- release/tools/arm.subr | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 89b52077e836..e73a6c0e6ff7 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -244,11 +244,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 \