Repo: https://github.com/lersek/qemu.git Branch: edk2_build_v3
Version 2, that is: [Qemu-devel] [PATCH v2 00/12] bundle edk2 platform firmware with QEMU was posted at: https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg04670.html 20190313210057.32584-1-lersek@redhat.com">http://mid.mail-archive.com/20190313210057.32584-1-lersek@redhat.com Updates in v3 are noted on each patch individually, in the Notes section. In summary, - I've picked up feedback tags from the v2 thread (see above), - I've replaced the xz compression with bz2 compression according to the subthread Re: [Qemu-devel] [PULL 00/12] EDK2 Firmware roms at: https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg06016.html http://mid.mail-archive.com/CAFEAcA-UcX6Brv3O28vcCw31bt=QpvbUwnPBBjhETm=vfci...@mail.gmail.com I'm pasting a cumulative diffstat, and diff, between v2 and v3 below. Note that a normal diffstat for this v3 series is at the bottom of the cover letter, as usual. > Makefile | 6 +++--- > configure | 2 +- > pc-bios/README | 2 +- > pc-bios/edk2-aarch64-code.fd.bz2 | Bin 0 -> 1177603 bytes > pc-bios/edk2-aarch64-code.fd.xz | Bin 1146804 -> 0 bytes > pc-bios/edk2-arm-code.fd.bz2 | Bin 0 -> 1173662 bytes > pc-bios/edk2-arm-code.fd.xz | Bin 1147852 -> 0 bytes > pc-bios/edk2-arm-vars.fd.bz2 | Bin 0 -> 263 bytes > pc-bios/edk2-arm-vars.fd.xz | Bin 10008 -> 0 bytes > pc-bios/edk2-i386-code.fd.bz2 | Bin 0 -> 1688659 bytes > pc-bios/edk2-i386-code.fd.xz | Bin 1674764 -> 0 bytes > pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 0 -> 1881979 bytes > pc-bios/edk2-i386-secure-code.fd.xz | Bin 1870024 -> 0 bytes > pc-bios/edk2-i386-vars.fd.bz2 | Bin 0 -> 190 bytes > pc-bios/edk2-i386-vars.fd.xz | Bin 320 -> 0 bytes > pc-bios/edk2-x86_64-code.fd.bz2 | Bin 0 -> 1669280 bytes > pc-bios/edk2-x86_64-code.fd.xz | Bin 1655276 -> 0 bytes > pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 0 -> 1901210 bytes > pc-bios/edk2-x86_64-secure-code.fd.xz | Bin 1889024 -> 0 bytes > roms/Makefile.edk2 | 6 +++--- > 20 files changed, 8 insertions(+), 8 deletions(-) > diff --git a/configure b/configure > index 5061f68653a3..df6e01ada833 100755 > --- a/configure > +++ b/configure > @@ -7865,7 +7865,7 @@ for bios_file in \ > $source_path/pc-bios/*.img \ > $source_path/pc-bios/openbios-* \ > $source_path/pc-bios/u-boot.* \ > - $source_path/pc-bios/edk2-*.fd.xz \ > + $source_path/pc-bios/edk2-*.fd.bz2 \ > $source_path/pc-bios/palcode-* > do > LINKS="$LINKS pc-bios/$(basename $bios_file)" > diff --git a/Makefile b/Makefile > index 6c5c1a1cad6e..f4562092e8dc 100644 > --- a/Makefile > +++ b/Makefile > @@ -296,9 +296,9 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) > $(SRC_PATH)/ui/Makefile > $(KEYCODEMAP_GEN): .git-submodule-status > $(KEYCODEMAP_CSV): .git-submodule-status > > -edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.xz)) > -pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.xz > - $(call quiet-command,xz -d -c $< > $@,"UNXZ",$<) > +edk2-decompressed = $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) > +pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2 > + $(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<) > > # Don't try to regenerate Makefile or configure > # We don't generate any of them > diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 > index e5c3036949c8..822c547fec64 100644 > --- a/roms/Makefile.edk2 > +++ b/roms/Makefile.edk2 > @@ -34,11 +34,11 @@ flashdevs := \ > arm-vars \ > i386-vars > > -all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.xz) \ > +all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \ > ../pc-bios/edk2-licenses.txt > > -../pc-bios/edk2-%.fd.xz: ../pc-bios/edk2-%.fd > - xz -9 -e -c $< > $@ > +../pc-bios/edk2-%.fd.bz2: ../pc-bios/edk2-%.fd > + bzip2 -9 -c $< > $@ > > # When the build completes, we need not keep the uncompressed flash device > # files. > diff --git a/pc-bios/README b/pc-bios/README > index f6acd3209610..807d95dd5418 100644 > --- a/pc-bios/README > +++ b/pc-bios/README > @@ -51,7 +51,7 @@ > - QemuMacDrivers (https://github.com/ozbenh/QemuMacDrivers) is a project to > provide virtualised drivers for PPC MacOS guests. > > -- The "edk2-*.fd.xz" images are platform firmware binaries and matching UEFI > +- The "edk2-*.fd.bz2" images are platform firmware binaries and matching UEFI > variable store templates built from the TianoCore community's EFI > Development > Kit II project > <https://github.com/tianocore/tianocore.github.io/wiki/EDK-II>. The images > diff --git a/pc-bios/edk2-aarch64-code.fd.bz2 > b/pc-bios/edk2-aarch64-code.fd.bz2 > new file mode 100644 > index 000000000000..b213334d9553 > Binary files /dev/null and b/pc-bios/edk2-aarch64-code.fd.bz2 differ > diff --git a/pc-bios/edk2-aarch64-code.fd.xz b/pc-bios/edk2-aarch64-code.fd.xz > deleted file mode 100644 > index 8ca34c56b51b..000000000000 > Binary files a/pc-bios/edk2-aarch64-code.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-arm-code.fd.bz2 b/pc-bios/edk2-arm-code.fd.bz2 > new file mode 100644 > index 000000000000..a494a8391eed > Binary files /dev/null and b/pc-bios/edk2-arm-code.fd.bz2 differ > diff --git a/pc-bios/edk2-arm-code.fd.xz b/pc-bios/edk2-arm-code.fd.xz > deleted file mode 100644 > index db2c20b71e29..000000000000 > Binary files a/pc-bios/edk2-arm-code.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-arm-vars.fd.bz2 b/pc-bios/edk2-arm-vars.fd.bz2 > new file mode 100644 > index 000000000000..2a5a9af31a6c > Binary files /dev/null and b/pc-bios/edk2-arm-vars.fd.bz2 differ > diff --git a/pc-bios/edk2-arm-vars.fd.xz b/pc-bios/edk2-arm-vars.fd.xz > deleted file mode 100644 > index 8c3a4b5c8bdc..000000000000 > Binary files a/pc-bios/edk2-arm-vars.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-i386-code.fd.bz2 b/pc-bios/edk2-i386-code.fd.bz2 > new file mode 100644 > index 000000000000..5440ca856db6 > Binary files /dev/null and b/pc-bios/edk2-i386-code.fd.bz2 differ > diff --git a/pc-bios/edk2-i386-code.fd.xz b/pc-bios/edk2-i386-code.fd.xz > deleted file mode 100644 > index f25dbec37e72..000000000000 > Binary files a/pc-bios/edk2-i386-code.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-i386-secure-code.fd.bz2 > b/pc-bios/edk2-i386-secure-code.fd.bz2 > new file mode 100644 > index 000000000000..24ae88ac3e40 > Binary files /dev/null and b/pc-bios/edk2-i386-secure-code.fd.bz2 differ > diff --git a/pc-bios/edk2-i386-secure-code.fd.xz > b/pc-bios/edk2-i386-secure-code.fd.xz > deleted file mode 100644 > index 11d499b90d85..000000000000 > Binary files a/pc-bios/edk2-i386-secure-code.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-i386-vars.fd.bz2 b/pc-bios/edk2-i386-vars.fd.bz2 > new file mode 100644 > index 000000000000..4a1bc4523880 > Binary files /dev/null and b/pc-bios/edk2-i386-vars.fd.bz2 differ > diff --git a/pc-bios/edk2-i386-vars.fd.xz b/pc-bios/edk2-i386-vars.fd.xz > deleted file mode 100644 > index 1656532daa6e..000000000000 > Binary files a/pc-bios/edk2-i386-vars.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-x86_64-code.fd.bz2 b/pc-bios/edk2-x86_64-code.fd.bz2 > new file mode 100644 > index 000000000000..6a0b1f983199 > Binary files /dev/null and b/pc-bios/edk2-x86_64-code.fd.bz2 differ > diff --git a/pc-bios/edk2-x86_64-code.fd.xz b/pc-bios/edk2-x86_64-code.fd.xz > deleted file mode 100644 > index 92398935a482..000000000000 > Binary files a/pc-bios/edk2-x86_64-code.fd.xz and /dev/null differ > diff --git a/pc-bios/edk2-x86_64-secure-code.fd.bz2 > b/pc-bios/edk2-x86_64-secure-code.fd.bz2 > new file mode 100644 > index 000000000000..3ef6452c0375 > Binary files /dev/null and b/pc-bios/edk2-x86_64-secure-code.fd.bz2 differ > diff --git a/pc-bios/edk2-x86_64-secure-code.fd.xz > b/pc-bios/edk2-x86_64-secure-code.fd.xz > deleted file mode 100644 > index a95891dcf134..000000000000 > Binary files a/pc-bios/edk2-x86_64-secure-code.fd.xz and /dev/null differ Thanks, Laszlo Laszlo Ersek (12): roms: lift "edk2-funcs.sh" from "tests/uefi-test-tools/build.sh" roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64 tests/uefi-test-tools/build.sh: work around TianoCore#1607 roms/edk2: advance to tag edk2-stable201903 roms/edk2-funcs.sh: add the qemu_edk2_get_thread_count() function roms/Makefile: replace the $(EFIROM) target with "edk2-basetools" roms: build edk2 firmware binaries and variable store templates pc-bios: add edk2 firmware binaries and variable store templates pc-bios: document the edk2 firmware images; add firmware descriptors tests: add missing dependency to build QTEST_QEMU_BINARY, round 2 Makefile: install the edk2 firmware images and their descriptors MAINTAINERS: add the "EDK2 Firmware" subsystem .gitignore | 1 + MAINTAINERS | 12 + Makefile | 29 ++- configure | 1 + pc-bios/README | 11 + pc-bios/descriptors/50-edk2-i386-secure.json | 34 +++ pc-bios/descriptors/50-edk2-x86_64-secure.json | 35 +++ pc-bios/descriptors/60-edk2-aarch64.json | 31 +++ pc-bios/descriptors/60-edk2-arm.json | 31 +++ pc-bios/descriptors/60-edk2-i386.json | 33 +++ pc-bios/descriptors/60-edk2-x86_64.json | 34 +++ pc-bios/edk2-aarch64-code.fd.bz2 | Bin 0 -> 1177603 bytes pc-bios/edk2-arm-code.fd.bz2 | Bin 0 -> 1173662 bytes pc-bios/edk2-arm-vars.fd.bz2 | Bin 0 -> 263 bytes pc-bios/edk2-i386-code.fd.bz2 | Bin 0 -> 1688659 bytes pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 0 -> 1881979 bytes pc-bios/edk2-i386-vars.fd.bz2 | Bin 0 -> 190 bytes pc-bios/edk2-licenses.txt | 209 ++++++++++++++++ pc-bios/edk2-x86_64-code.fd.bz2 | Bin 0 -> 1669280 bytes pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 0 -> 1901210 bytes roms/Makefile | 9 +- roms/Makefile.edk2 | 148 ++++++++++++ roms/edk2 | 2 +- roms/edk2-build.sh | 55 +++++ roms/edk2-funcs.sh | 253 ++++++++++++++++++++ tests/Makefile.include | 2 +- tests/uefi-test-tools/build.sh | 100 +------- 27 files changed, 934 insertions(+), 96 deletions(-) create mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json create mode 100644 pc-bios/descriptors/50-edk2-x86_64-secure.json create mode 100644 pc-bios/descriptors/60-edk2-aarch64.json create mode 100644 pc-bios/descriptors/60-edk2-arm.json create mode 100644 pc-bios/descriptors/60-edk2-i386.json create mode 100644 pc-bios/descriptors/60-edk2-x86_64.json create mode 100644 pc-bios/edk2-aarch64-code.fd.bz2 create mode 100644 pc-bios/edk2-arm-code.fd.bz2 create mode 100644 pc-bios/edk2-arm-vars.fd.bz2 create mode 100644 pc-bios/edk2-i386-code.fd.bz2 create mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2 create mode 100644 pc-bios/edk2-i386-vars.fd.bz2 create mode 100644 pc-bios/edk2-licenses.txt create mode 100644 pc-bios/edk2-x86_64-code.fd.bz2 create mode 100644 pc-bios/edk2-x86_64-secure-code.fd.bz2 create mode 100644 roms/Makefile.edk2 create mode 100755 roms/edk2-build.sh create mode 100644 roms/edk2-funcs.sh -- 2.19.1.3.g30247aa5d201
