diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2019-06-06 13:01:43 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-06-14 21:47:53 +0200 |
| commit | 9153b9d7401fa57684450d64cb193985ff71c037 (patch) | |
| tree | 855638875d42ecd5c6f0f92f6b0d287e24b27c74 | |
| parent | 36bf711d17d022d6fd9faa8379658166c1f6fa21 (diff) | |
| download | qemu-9153b9d7401fa57684450d64cb193985ff71c037.zip qemu-9153b9d7401fa57684450d64cb193985ff71c037.tar.gz qemu-9153b9d7401fa57684450d64cb193985ff71c037.tar.bz2 | |
roms/Makefile.edk2: update input file list for "pc-bios/edk2-licenses.txt"
(1) For TianoCore Bugzilla
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
the majority of the edk2 tree was relicensed under the
BSD-2-Clause-Patent license:
https://spdx.org/licenses/BSD-2-Clause-Patent.html>
Edk2 commit f53de8aecb12 ("edk2: Add License-History.txt", 2019-04-09)
added a new file called "License-History.txt", describing license and
contributor agreement changes over time.
(2) For advacing edk2's OpenSSL git submodule to the 1.1.1b release, a
more up-to-date ArmSoftFloatLib instance became necessary, on 32-bit
ARM. Therefore, the embedded (and by now, obsolete) Berkeley SoftFloat
library was replaced with a git submodule of the same, checked out at
the latest release ("3e", plus a typo fix on top -- commit
b64af41c3276). This was implemented for TianoCore Bugzilla
https://bugzilla.tianocore.org/show_bug.cgi?id=1845
in edk2 commit range b6cfa686e42d..371e7001e8d5.
Include the edk2 project's "License-History.txt" file, and the Berkeley
SoftFloat library's "COPYING.txt", in our generated
"pc-bios/edk2-licenses.txt" text file.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1831477
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | roms/Makefile.edk2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 6a19498..c2f2ff5 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -17,7 +17,9 @@ toolchain = $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1)) licenses := \ edk2/License.txt \ + edk2/License-History.txt \ edk2/OvmfPkg/License.txt \ + edk2/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/COPYING.txt \ edk2/CryptoPkg/Library/OpensslLib/openssl/LICENSE # The "edk2-arm-vars.fd" varstore template is suitable for aarch64 as well. |