From fbd6ccde44381c8d8c61fbd38312e944c01f93ae Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange@redhat.com>
Date: Sep 25 2023 17:11:48 +0000
Subject: Add BSD-2-Clause OR GPL-2.0-or-later license


This is used by FdtLib code which is linked into most of the
arm/riscv/x86 firmware targets.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

---

diff --git a/edk2.spec b/edk2.spec
index 79d97f3..db0f7bb 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -48,7 +48,7 @@ Name:       edk2
 Version:    %{GITDATE}
 Release:    %autorelease
 Summary:    UEFI firmware for 64-bit virtual machines
-License:    Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
+License:    Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
 URL:        http://www.tianocore.org
 
 # The source tarball is created using following commands:
@@ -173,7 +173,7 @@ Conflicts:  libvirt-daemon-driver-qemu < 9.7.0
 # OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL
 # library.
 Provides:   bundled(openssl) = %{OPENSSL_VER}
-License:    Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
+License:    Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
 
 # URL taken from the Maintainers.txt file.
 URL:        http://www.tianocore.org/ovmf/
@@ -195,7 +195,7 @@ Conflicts:  libvirt-daemon-driver-qemu < 9.7.0
 
 # No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack.
 Provides:   bundled(openssl) = %{OPENSSL_VER}
-License:    Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
+License:    Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
 
 # URL taken from the Maintainers.txt file.
 URL:        https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
@@ -261,7 +261,7 @@ Open Virtual Machine Firmware (experimental builds)
 %package arm
 Summary:        ARM Virtual Machine Firmware
 BuildArch:      noarch
-License:        Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
+License:        Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain
 %description arm
 EFI Development Kit II
 ARMv7 UEFI Firmware
@@ -269,7 +269,7 @@ ARMv7 UEFI Firmware
 %package riscv64
 Summary:        RISC-V Virtual Machine Firmware
 BuildArch:      noarch
-License:        Apache-2.0 AND BSD-2-Clause-Patent AND LicenseRef-Fedora-Public-Domain
+License:        Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND LicenseRef-Fedora-Public-Domain
 
 # need libvirt version with qcow2 support
 Conflicts:  libvirt-daemon-driver-qemu < 9.7.0