From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmltk-0005ji-4s for qemu-devel@nongnu.org; Thu, 24 Jan 2019 15:46:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmlnU-0001kn-Dw for qemu-devel@nongnu.org; Thu, 24 Jan 2019 15:40:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51762) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmlnU-0001jt-78 for qemu-devel@nongnu.org; Thu, 24 Jan 2019 15:40:24 -0500 From: Laszlo Ersek Date: Thu, 24 Jan 2019 21:39:55 +0100 Message-Id: <20190124203959.30875-2-lersek@redhat.com> In-Reply-To: <20190124203959.30875-1-lersek@redhat.com> References: <20190124203959.30875-1-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 1/5] roms: add the edk2 project as a git submodule List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel list Cc: "Michael S. Tsirkin" , Ard Biesheuvel , Gerd Hoffmann , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Shannon Zhao The roms/edk2 submodule can help with three goals: - build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be implemented later), - build the EfiRom tool on the fly, which is used in roms/Makefile, for building the "efirom" target, - build UEFI test applications (to be run in guests), for qtest support. Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the lates= t "stable tag", namely "edk2-stable201811". The edk2 repository tracks some binary files that should not be removed b= y QEMU's top-level "make clean"; exempt the full pathnames from the "find" command. Cc: "Michael S. Tsirkin" Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Igor Mammedov Cc: Philippe Mathieu-Daud=C3=A9 Cc: Shannon Zhao Signed-off-by: Laszlo Ersek Reviewed-by: Gerd Hoffmann --- Notes: v2: - pick up R-b [Gerd] Makefile | 6 +++++- .gitmodules | 3 +++ roms/edk2 | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index de898eab6234..b0a70b2929ad 100644 --- a/Makefile +++ b/Makefile @@ -604,7 +604,11 @@ clean: rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h = gen-op-arm.h rm -f qemu-options.def rm -f *.msi - find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[od= a]' \) -type f -exec rm {} + + find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[od= a]' \) -type f \ + ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ + ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ + ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ + -exec rm {} + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *= .pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h diff --git a/.gitmodules b/.gitmodules index 6b91176098c8..ceafb0ee29a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "tests/fp/berkeley-softfloat-3"] path =3D tests/fp/berkeley-softfloat-3 url =3D https://github.com/cota/berkeley-softfloat-3 +[submodule "roms/edk2"] + path =3D roms/edk2 + url =3D https://github.com/tianocore/edk2.git diff --git a/roms/edk2 b/roms/edk2 new file mode 160000 index 000000000000..85588389222a --- /dev/null +++ b/roms/edk2 @@ -0,0 +1 @@ +Subproject commit 85588389222a3636baf0f9ed8227f2434af4c3f9 --=20 2.19.1.3.g30247aa5d201