From owner-svn-src-all@freebsd.org Thu Jun 4 20:48:58 2020 Return-Path: Delivered-To: svn-src-all@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 403B1331890; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dHty0ynFz3cgX; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@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 1C62E25B08; Thu, 4 Jun 2020 20:48:58 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054Kmv3Z082150; Thu, 4 Jun 2020 20:48:57 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054Kmv0D082149; Thu, 4 Jun 2020 20:48:57 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202006042048.054Kmv0D082149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 4 Jun 2020 20:48:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361807 - head/sys/contrib/edk2 X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/sys/contrib/edk2 X-SVN-Commit-Revision: 361807 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 20:48:58 -0000 Author: mhorne Date: Thu Jun 4 20:48:57 2020 New Revision: 361807 URL: https://svnweb.freebsd.org/changeset/base/361807 Log: Document upgrade procedure in FREEBSD-upgrade It was pointed out to me that this is the convention for documenting upgrade instructions, rather than just leaving the instructions in the commit message. It's possible these commands won't be used again before we transition to git, but then at least they'll give a path forward for whoever touches this next. Suggested by: lwhsu Added: head/sys/contrib/edk2/FREEBSD-upgrade (contents, props changed) Added: head/sys/contrib/edk2/FREEBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/edk2/FREEBSD-upgrade Thu Jun 4 20:48:57 2020 (r361807) @@ -0,0 +1,23 @@ +$FreeBSD$ + +We try to maintain the minimal set of headers required to build, as the full +set of files from MdePkg is quite large (10MB at the time of writing). To do +this when performing an upgrade, execute the following: + +# Generate list of the headers needed to build +cp -r ../vendor/edk2/dist/MdePkg/Include sys/contrib/edk2 +cd lib/libefivar +make +pushd `make -V .OBJDIR` +cat .depend*.o | grep sys/contrib | cut -d' ' -f 3 | + sort -u | sed -e 's=/full/path/sys/contrib/edk2/==' > /tmp/xxx +popd + +# Merge the needed files +cd ../../sys/contrib/edk2 +svn revert -R . +for i in `cat /tmp/xxx`; do + svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/$i $i +done +svn merge -c VendorRevision \ + svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/MdePkg.dec MdePkg.dec