openssl licence update (3.0.x uses apache 2.0).
This commit is contained in:
parent
580b0e9300
commit
5072963c7f
20
edk2.spec
20
edk2.spec
@ -45,7 +45,7 @@ Name: edk2
|
||||
Version: %{GITDATE}
|
||||
Release: %autorelease
|
||||
Summary: UEFI firmware for 64-bit virtual machines
|
||||
License: BSD-2-Clause-Patent and OpenSSL and MIT
|
||||
License: BSD-2-Clause-Patent and Apache-2.0 and MIT
|
||||
URL: http://www.tianocore.org
|
||||
|
||||
# The source tarball is created using following commands:
|
||||
@ -154,7 +154,7 @@ Obsoletes: OVMF < 20180508-100.gitee3198e672e2.el7
|
||||
# OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL
|
||||
# library.
|
||||
Provides: bundled(openssl) = %{OPENSSL_VER}
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
|
||||
# URL taken from the Maintainers.txt file.
|
||||
URL: http://www.tianocore.org/ovmf/
|
||||
@ -176,7 +176,7 @@ Conflicts: libvirt-daemon-driver-qemu < 9.2.0
|
||||
|
||||
# No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack.
|
||||
Provides: bundled(openssl) = %{OPENSSL_VER}
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
|
||||
# URL taken from the Maintainers.txt file.
|
||||
URL: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
|
||||
@ -213,7 +213,7 @@ environment for the UEFI and PI specifications. This package contains sample
|
||||
%if %{defined fedora}
|
||||
%package ovmf-ia32
|
||||
Summary: Open Virtual Machine Firmware
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
Provides: bundled(openssl)
|
||||
BuildArch: noarch
|
||||
%description ovmf-ia32
|
||||
@ -222,7 +222,7 @@ Open Virtual Machine Firmware (ia32)
|
||||
|
||||
%package ovmf-xen
|
||||
Summary: Open Virtual Machine Firmware, Xen build
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
Provides: bundled(openssl)
|
||||
BuildArch: noarch
|
||||
%description ovmf-xen
|
||||
@ -231,7 +231,7 @@ Open Virtual Machine Firmware (Xen build)
|
||||
|
||||
%package ovmf-experimental
|
||||
Summary: Open Virtual Machine Firmware, experimental builds
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
Provides: bundled(openssl)
|
||||
BuildArch: noarch
|
||||
%description ovmf-experimental
|
||||
@ -241,7 +241,7 @@ Open Virtual Machine Firmware (experimental builds)
|
||||
%package arm
|
||||
Summary: ARM Virtual Machine Firmware
|
||||
BuildArch: noarch
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
%description arm
|
||||
EFI Development Kit II
|
||||
ARMv7 UEFI Firmware
|
||||
@ -249,14 +249,14 @@ ARMv7 UEFI Firmware
|
||||
%package riscv64
|
||||
Summary: RISC-V Virtual Machine Firmware
|
||||
BuildArch: noarch
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
%description riscv64
|
||||
EFI Development Kit II
|
||||
RISC-V UEFI Firmware
|
||||
|
||||
%package ext4
|
||||
Summary: Ext4 filesystem driver
|
||||
License: BSD-2-Clause-Patent and OpenSSL
|
||||
License: BSD-2-Clause-Patent and Apache-2.0
|
||||
BuildArch: noarch
|
||||
%description ext4
|
||||
EFI Development Kit II
|
||||
@ -439,7 +439,7 @@ done
|
||||
%install
|
||||
|
||||
cp -a OvmfPkg/License.txt License.OvmfPkg.txt
|
||||
cp -a CryptoPkg/Library/OpensslLib/openssl/LICENSE LICENSE.openssl
|
||||
cp -a CryptoPkg/Library/OpensslLib/openssl/LICENSE.txt LICENSE.openssl
|
||||
mkdir -p %{buildroot}%{_datadir}/qemu/firmware
|
||||
|
||||
# install the tools
|
||||
|
Loading…
Reference in New Issue
Block a user