From owner-svn-src-head@freebsd.org  Sat Jun 16 17:45:45 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77491101D57F;
 Sat, 16 Jun 2018 17:45:45 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2B00E6978A;
 Sat, 16 Jun 2018 17:45:45 +0000 (UTC)
 (envelope-from allanjude@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 0C44018CA;
 Sat, 16 Jun 2018 17:45:45 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5GHjig9096353;
 Sat, 16 Jun 2018 17:45:44 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5GHjiX0096352;
 Sat, 16 Jun 2018 17:45:44 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201806161745.w5GHjiX0096352@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sat, 16 Jun 2018 17:45:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335259 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: allanjude
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 335259
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2018 17:45:45 -0000

Author: allanjude
Date: Sat Jun 16 17:45:44 2018
New Revision: 335259
URL: https://svnweb.freebsd.org/changeset/base/335259

Log:
  rootgen.sh: Don't copy various bits of the bootcode from the running system
  
  We want to use the versions of the bootcode we just built, rather than
  ones from whatever happens to be in /boot on the test machine
  
  These were incorrectly added by me in r334888

Modified:
  head/tools/boot/rootgen.sh

Modified: head/tools/boot/rootgen.sh
==============================================================================
--- head/tools/boot/rootgen.sh	Sat Jun 16 17:11:23 2018	(r335258)
+++ head/tools/boot/rootgen.sh	Sat Jun 16 17:45:44 2018	(r335259)
@@ -389,16 +389,8 @@ DESTDIR=${OBJDIR}/boot-tree
 rm -rf ${DESTDIR}
 mkdir -p ${DESTDIR}/boot/defaults
 mkdir -p ${DESTDIR}/boot/kernel
-cp /boot/boot0 ${DESTDIR}/boot
-cp /boot/boot0sio ${DESTDIR}/boot
-cp /boot/pmbr ${DESTDIR}/boot
-cp /boot/boot ${DESTDIR}/boot
 # XXX boot1 exists only on sparc64
 cp /boot/boot1 ${DESTDIR}/boot
-cp /boot/boot1.efifat ${DESTDIR}/boot
-cp /boot/gptboot ${DESTDIR}/boot
-cp /boot/gptzfsboot ${DESTDIR}/boot
-cp /boot/loader ${DESTDIR}/boot
 cp /boot/kernel/kernel ${DESTDIR}/boot/kernel
 echo -h -D -S115200 > ${DESTDIR}/boot.config
 # XXX