qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PULL 4/6] roms/Makefile.edk2: update input file list for "pc-bios/edk2-licenses.txt"
Date: Fri, 14 Jun 2019 22:23:31 +0200	[thread overview]
Message-ID: <20190614202333.19355-5-lersek@redhat.com> (raw)
In-Reply-To: <20190614202333.19355-1-lersek@redhat.com>

(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>
---
 roms/Makefile.edk2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 6a19498d0738..c2f2ff59d5b1 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.
-- 
2.19.1.3.g30247aa5d201




  parent reply	other threads:[~2019-06-14 20:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-14 20:23 [Qemu-devel] [PULL 0/6] update edk2 submodule & binaries to edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 1/6] roms/Makefile.edk2: define edk2-stable201905 network feature test macros Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 2/6] roms/edk2: update submodule from edk2-stable201903 to edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 3/6] roms/Makefile.edk2: remove edk2-stable201903 network feature test macros Laszlo Ersek
2019-06-14 20:23 ` Laszlo Ersek [this message]
2019-06-14 20:23 ` [Qemu-devel] [PULL 5/6] pc-bios: refresh edk2 build artifacts for edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 6/6] pc-bios: update the README file with edk2-stable201905 information Laszlo Ersek
2019-06-17 10:54 ` [Qemu-devel] [PULL 0/6] update edk2 submodule & binaries to edk2-stable201905 Peter Maydell
2019-06-19 23:40   ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190614202333.19355-5-lersek@redhat.com \
    --to=lersek@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).