]> git.proxmox.com Git - pve-edk2-firmware.git/commitdiff
update submodule, patches and buildsys to 2023.08
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 14 Nov 2023 17:04:29 +0000 (18:04 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Sun, 19 Nov 2023 13:29:16 +0000 (14:29 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
15 files changed:
debian/binary-check.allow
debian/binary-check.remove
debian/copyright
debian/edk2-vars-generator.py
debian/find-binaries.py
debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch [deleted file]
debian/patches/ArmVirtPkg-disable-the-EFI_MEMORY_ATTRIBUTE-protocol.patch [new file with mode: 0644]
debian/patches/Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch
debian/patches/series
debian/python/UEFI/Qemu.py
debian/rules
debian/source/lintian-overrides
debian/tests/control
debian/tests/shell.py
edk2

index 749a2f86ec6a20a79aeaeb44bb7899b9b6a8321b..18c296181360eb725a67096ada34f3590a20b6d0 100644 (file)
@@ -1,67 +1,50 @@
-.gitmodules
-AppPkg/Applications/Python/Python-2.7.2/Demo/comparisons/patterns
-AppPkg/Applications/Python/Python-2.7.2/Demo/md5test/foo
-AppPkg/Applications/Python/Python-2.7.2/Demo/parser/FILES
-AppPkg/Applications/Python/Python-2.7.2/Demo/pdist/rcsbump
-AppPkg/Applications/Python/Python-2.7.2/Demo/pdist/rcvs
-AppPkg/Applications/Python/Python-2.7.2/Demo/pdist/rrcs
-AppPkg/Applications/Python/Python-2.7.2/Demo/scripts/newslist.doc
-AppPkg/Applications/Python/Python-2.7.2/Grammar/Grammar
-AppPkg/Applications/Python/Python-2.7.2/Lib/distutils/command/command_template
-AppPkg/Applications/Python/Python-2.7.2/Lib/distutils/tests/Setup.sample
-AppPkg/Applications/Python/Python-2.7.2/Lib/email/test/data/audiotest.au
-AppPkg/Applications/Python/Python-2.7.2/Lib/pdb.doc
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/185test.db
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/Sine-1000Hz-300ms.aif
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/audiotest.au
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/check_soundcard.vbs
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/empty.vbs
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/greyrgb.uue
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/randv2_32.pck
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/randv2_64.pck
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/randv3.pck
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/testimg.uue
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/testimgr.uue
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/testrgb.uue
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/testtar.tar
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/xmltestdata/test.xml.out
-AppPkg/Applications/Python/Python-2.7.2/Lib/test/zipdir.zip
-AppPkg/Applications/Python/Python-2.7.2/Lib/wsgiref.egg-info
-AppPkg/Applications/Python/Python-2.7.2/Modules/zlib/make_vms.com
-AppPkg/Applications/Python/Python-2.7.2/Parser/Python.asdl
-AppPkg/Applications/Python/Python-2.7.2/Tools/compiler/ACKS
-AppPkg/Applications/Python/Python-2.7.2/Tools/msi/msisupport.mak
-AppPkg/Applications/Python/Python-2.7.2/Tools/scripts/2to3
-AppPkg/Applications/Python/Python-2.7.2/Tools/scripts/dutree.doc
-AppPkg/Applications/Python/Python-2.7.2/Tools/scripts/idle
-AppPkg/Applications/Python/Python-2.7.2/Tools/scripts/pydoc
-AppPkg/Applications/Python/Python-2.7.2/Tools/scripts/pydocgui.pyw
-AppPkg/Applications/Python/Python-2.7.2/Tools/unicode/python-mappings/CP1140.TXT
-AppPkg/Applications/Python/Python-2.7.2/Tools/unicode/python-mappings/KOI8-U.TXT
-AppPkg/Applications/Python/Python-2.7.2/Tools/unicode/python-mappings/TIS-620.TXT
-AppPkg/Applications/Python/Python-2.7.2/Tools/world/world
-ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat-macros
-ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
+ArmPkg/Library/GnuNoteBti.bin
+BaseTools/BinPipWrappers/PosixLike/AmlToC
+BaseTools/BinPipWrappers/PosixLike/BPDG
+BaseTools/BinPipWrappers/PosixLike/BrotliCompress
+BaseTools/BinPipWrappers/PosixLike/build
+BaseTools/BinPipWrappers/PosixLike/DevicePath
+BaseTools/BinPipWrappers/PosixLike/Ecc
+BaseTools/BinPipWrappers/PosixLike/EfiRom
+BaseTools/BinPipWrappers/PosixLike/GenCrc32
+BaseTools/BinPipWrappers/PosixLike/GenDepex
+BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
+BaseTools/BinPipWrappers/PosixLike/GenFds
+BaseTools/BinPipWrappers/PosixLike/GenFfs
+BaseTools/BinPipWrappers/PosixLike/GenFv
+BaseTools/BinPipWrappers/PosixLike/GenFw
+BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
+BaseTools/BinPipWrappers/PosixLike/GenSec
+BaseTools/BinPipWrappers/PosixLike/LzmaCompress
+BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
+BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
+BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
+BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
+BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
+BaseTools/BinPipWrappers/PosixLike/Split
+BaseTools/BinPipWrappers/PosixLike/TargetTool
+BaseTools/BinPipWrappers/PosixLike/TianoCompress
+BaseTools/BinPipWrappers/PosixLike/Trim
+BaseTools/BinPipWrappers/PosixLike/UPT
+BaseTools/BinPipWrappers/PosixLike/VfrCompile
+BaseTools/BinPipWrappers/PosixLike/VolInfo
+BaseTools/BinWrappers/PosixLike/AmlToC
 BaseTools/BinWrappers/PosixLike/BPDG
-BaseTools/BinWrappers/PosixLike/BootSectImage
-BaseTools/BinWrappers/PosixLike/Brotli
 BaseTools/BinWrappers/PosixLike/BrotliCompress
+BaseTools/BinWrappers/PosixLike/build
 BaseTools/BinWrappers/PosixLike/DevicePath
 BaseTools/BinWrappers/PosixLike/Ecc
-BaseTools/BinWrappers/PosixLike/EfiLdrImage
 BaseTools/BinWrappers/PosixLike/EfiRom
-BaseTools/BinWrappers/PosixLike/GenerateCapsule
+BaseTools/BinWrappers/PosixLike/FMMT
 BaseTools/BinWrappers/PosixLike/GenCrc32
 BaseTools/BinWrappers/PosixLike/GenDepex
+BaseTools/BinWrappers/PosixLike/GenerateCapsule
 BaseTools/BinWrappers/PosixLike/GenFds
 BaseTools/BinWrappers/PosixLike/GenFfs
 BaseTools/BinWrappers/PosixLike/GenFv
 BaseTools/BinWrappers/PosixLike/GenFw
-BaseTools/BinWrappers/PosixLike/GenPage
 BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
 BaseTools/BinWrappers/PosixLike/GenSec
-BaseTools/BinWrappers/PosixLike/GenVtf
-BaseTools/BinWrappers/PosixLike/GnuGenBootSector
 BaseTools/BinWrappers/PosixLike/LzmaCompress
 BaseTools/BinWrappers/PosixLike/LzmaF86Compress
 BaseTools/BinWrappers/PosixLike/PatchPcdValue
@@ -75,9 +58,11 @@ BaseTools/BinWrappers/PosixLike/Trim
 BaseTools/BinWrappers/PosixLike/UPT
 BaseTools/BinWrappers/PosixLike/VfrCompile
 BaseTools/BinWrappers/PosixLike/VolInfo
-BaseTools/BinWrappers/PosixLike/build
 BaseTools/BuildEnv
+BaseTools/Conf/diff.order
+BaseTools/Conf/gitattributes
 BaseTools/Conf/XMLSchema/DistributionPackage.xsd
+BaseTools/ReadMe.rst
 BaseTools/Scripts/PackageDocumentTools/packagedocapp.pyw
 BaseTools/Source/C/Makefiles/ms.app
 BaseTools/Source/C/Makefiles/ms.common
@@ -90,23 +75,267 @@ BaseTools/Source/C/VfrCompile/Pccts/RIGHTS
 BaseTools/Source/Python/Ecc/CParser4/C.g4
 BaseTools/Source/Python/Pkcs7Sign/TestRoot.cer
 BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigningPublicKey.bin
-BeagleBoardPkg/ConfigurationHeader.dat
+**/*.cmake
+**/*.conf
+CryptoPkg/Library/OpensslLib/openssl/apps/demoSRP/srp_verifier.txt.attr
+CryptoPkg/Library/OpensslLib/openssl/apps/insta.ca.crt
+CryptoPkg/Library/OpensslLib/openssl/apps/*.srl
+CryptoPkg/Library/OpensslLib/openssl/config
+CryptoPkg/Library/OpensslLib/openssl/config.com
+CryptoPkg/Library/OpensslLib/openssl/Configurations/common0.tmpl
+CryptoPkg/Library/OpensslLib/openssl/Configurations/descrip.mms.tmpl
+CryptoPkg/Library/OpensslLib/openssl/Configurations/gentemplate.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/INTERNALS.Configure
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/AIX.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/BASE.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/Cygwin.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/mingw.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/Unix.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/VMS.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/Windows/cppbuilder.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/Windows/MSVC.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/platform/Windows.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/unix-checker.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/unix-Makefile.tmpl
+CryptoPkg/Library/OpensslLib/openssl/Configurations/windows-checker.pm
+CryptoPkg/Library/OpensslLib/openssl/Configurations/windows-makefile.tmpl
+CryptoPkg/Library/OpensslLib/openssl/Configure
+CryptoPkg/Library/OpensslLib/openssl/crypto/des/asm/des_enc.m4
+CryptoPkg/Library/OpensslLib/openssl/crypto/err/openssl.ec
+CryptoPkg/Library/OpensslLib/openssl/crypto/objects/obj_mac.num
+CryptoPkg/Library/OpensslLib/openssl/crypto/perlasm/s390x.pm
+CryptoPkg/Library/OpensslLib/openssl/demos/bio/descrip.mms
+CryptoPkg/Library/OpensslLib/openssl/demos/bio/shared.opt
+CryptoPkg/Library/OpensslLib/openssl/demos/bio/static.opt
+CryptoPkg/Library/OpensslLib/openssl/doc/images/openssl.svg
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/cipher.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/digest.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/kdf.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/lifecycles.ods
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/mac.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/pkey.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/life-cycles/rand.dot
+CryptoPkg/Library/OpensslLib/openssl/doc/perlvars.pm
+CryptoPkg/Library/OpensslLib/openssl/engines/e_afalg.ec
+CryptoPkg/Library/OpensslLib/openssl/engines/e_capi.ec
+CryptoPkg/Library/OpensslLib/openssl/engines/e_dasync.ec
+CryptoPkg/Library/OpensslLib/openssl/engines/e_loader_attic.ec
+CryptoPkg/Library/OpensslLib/openssl/engines/e_ossltest.ec
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/Changes
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/INSTALL
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/lib/Text/Template.pm
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/lib/Text/Template/Preprocess.pm
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/MANIFEST
+CryptoPkg/Library/OpensslLib/openssl/external/perl/Text-Template-1.56/SIGNATURE
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/DIGESTS.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/DSA.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/EC.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/ECX.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/NIST.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/oids_to_c.pm
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/RSA.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/SM2.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/common/der/wrap.asn1
+CryptoPkg/Library/OpensslLib/openssl/providers/fips.checksum
+CryptoPkg/Library/OpensslLib/openssl/providers/fips.module.sources
+CryptoPkg/Library/OpensslLib/openssl/providers/fips-sources.checksums
+CryptoPkg/Library/OpensslLib/openssl/test/certs/bad.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/cyrillic_crl.utf8
+CryptoPkg/Library/OpensslLib/openssl/test/certs/cyrillic.msb
+CryptoPkg/Library/OpensslLib/openssl/test/certs/cyrillic.utf8
+CryptoPkg/Library/OpensslLib/openssl/test/certs/embeddedSCTs1.tlssct
+CryptoPkg/Library/OpensslLib/openssl/test/certs/ext-check.csr
+CryptoPkg/Library/OpensslLib/openssl/test/certs/interCA.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/leaf-encrypted.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/leaf.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/rootCA.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/sm2.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/sm2-root.crt
+CryptoPkg/Library/OpensslLib/openssl/test/certs/sm2-root.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/subinterCA.key
+CryptoPkg/Library/OpensslLib/openssl/test/certs/v3-certs-RC2.p12
+CryptoPkg/Library/OpensslLib/openssl/test/certs/v3-certs-TDES.p12
+CryptoPkg/Library/OpensslLib/openssl/test/certs/x509-check.csr
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad_bio.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad_cert.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad-cms.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad_generalname.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad-int-pad0.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/bad-int-padminus1.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/high_tag.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/int0.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/int1.der
+CryptoPkg/Library/OpensslLib/openssl/test/d2i-tests/intminus1.der
+CryptoPkg/Library/OpensslLib/openssl/test/data2.bin
+CryptoPkg/Library/OpensslLib/openssl/test/data.bin
+CryptoPkg/Library/OpensslLib/openssl/test/ocsp-tests/*.ors
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/04-test_pem_reading_data/wellknown
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/15-test_mp_rsa_data/plain_text
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/15-test_rsaoaep_data/plain_text
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-1024.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/20-test_dhparam_data/pkcs3-2-2048.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/20-test_dhparam_data/pkcs3-5-1024.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/20-test_dhparam_data/x942-0-1024.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/25-test_eai_data/san.ascii
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/25-test_eai_data/san.utf8
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/25-test_pkcs7_data/malformed.pkcs7
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/25-test_rusext_data/grfc.msb
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/25-test_rusext_data/grfc.utf8
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/DH.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/DH.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/DSA.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/DSA.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/EC.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/EC.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/ED25519.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/ED448.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/ED448.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/RSA.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/RSA.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/X25519.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/X25519.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/X448.priv.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/30-test_evp_pkey_provided/X448.pub.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_client_data/client.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_client_data/client.csr
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_client_data/client.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_client_data/server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_client_data/server.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_msg_data/new.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_msg_data/pkcs10.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_msg_data/server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/EndEntity1.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/EndEntity2.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/Intermediate_CA.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/IP_PBM.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/IR_protected.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/IR_unprotected.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/Root_CA.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_protect_data/server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_server_data/CR_protected_PBM_1234.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/client.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/EndEntity1.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/EndEntity2.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/Intermediate_CA.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IP_waitingStatus_PBM.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected_0_extraCerts.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected_2_extraCerts.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IR_protected.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IR_rmprotection.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/IR_unprotected.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/Root_CA.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/65-test_cmp_vfy_data/server.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_ca_data/revoked.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/big_issuing.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/big_root.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/big_server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/big_trusted.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/issuing.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/issuing_expired.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/new.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/new_pass_12345.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/new_pub.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/random.bin
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/root.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/root_expired.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/server.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/server.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_issuing.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.key
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_only.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer.p12
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/signer_root.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/Mock/trusted.crt
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/test_commands.csv
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/test_connection.csv
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/test_credentials.csv
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/test_enrollment.csv
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmp_http_data/test_verification.csv
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cmsapi_data/encryptedData.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cms_data/bad_signtime_attr.cms
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cms_data/ciphertext_from_1_1_1.cms
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cms_data/ct_multiple_attr.cms
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cms_data/no_ct_attr.cms
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_cms_data/no_md_attr.cms
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_tsa_data/all-zero.tsq
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/80-test_tsa_data/sectigo-all-zero.tsr
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/90-test_store_data/testrsa.msb
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/90-test_store_data/testrsa.pvk
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/91-test_pkey_check_data/dsapub_noparam.der
+CryptoPkg/Library/OpensslLib/openssl/test/recipes/ocsp-response.der
+CryptoPkg/Library/OpensslLib/openssl/test/shibboleth.pfx
+CryptoPkg/Library/OpensslLib/openssl/test/smcont.bin
+CryptoPkg/Library/OpensslLib/openssl/test/smime-eml/SignedInvalidMappingFromanyPolicyTest7.eml
+CryptoPkg/Library/OpensslLib/openssl/test/ssl-tests/protocol_version.pm
+CryptoPkg/Library/OpensslLib/openssl/test/ssl-tests/ssltests_base.pm
+CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.tmpl
+CryptoPkg/Library/OpensslLib/openssl/test/testrsa_withattrs.der
+CryptoPkg/Library/OpensslLib/openssl/util/check-malloc-errs
+CryptoPkg/Library/OpensslLib/openssl/util/engines.num
+CryptoPkg/Library/OpensslLib/openssl/util/err-to-raise
+CryptoPkg/Library/OpensslLib/openssl/util/find-doc-nits
+CryptoPkg/Library/OpensslLib/openssl/util/find-unused-errs
+CryptoPkg/Library/OpensslLib/openssl/util/fix-deprecation
+CryptoPkg/Library/OpensslLib/openssl/util/fix-includes
+CryptoPkg/Library/OpensslLib/openssl/util/fix-includes.sed
+CryptoPkg/Library/OpensslLib/openssl/util/indent.pro
+CryptoPkg/Library/OpensslLib/openssl/util/libcrypto.num
+CryptoPkg/Library/OpensslLib/openssl/util/libssl.num
+CryptoPkg/Library/OpensslLib/openssl/util/markdownlint.rb
+CryptoPkg/Library/OpensslLib/openssl/util/merge-err-lines
+CryptoPkg/Library/OpensslLib/openssl/util/other-internal.syms
+CryptoPkg/Library/OpensslLib/openssl/util/other.syms
+CryptoPkg/Library/OpensslLib/openssl/util/perl/**/*.pm
+CryptoPkg/Library/OpensslLib/openssl/util/providers.num
+CryptoPkg/Library/OpensslLib/openssl/util/write-man-symlinks
+CryptoPkg/Library/OpensslLib/openssl/VERSION.dat
+CryptoPkg/Library/OpensslLib/openssl/VMS/engine.opt
+CryptoPkg/Library/OpensslLib/openssl/VMS/msg_install.com
+CryptoPkg/Library/OpensslLib/openssl/VMS/msg_staging.com
+CryptoPkg/Library/OpensslLib/openssl/VMS/test-includes.com
+CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestEKUCerts/CreateTestCerts.cmd
+CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestEKUCerts/SignFirmwareWithEKUs.cmd
+debian/**
 EmulatorPkg/Unix/.gdbinit
-EmulatorPkg/Unix/GdbRun
 EmulatorPkg/Unix/Host/X11IncludeHack
 EmulatorPkg/Unix/lldbinit
 EmulatorPkg/Win/VS2017/Win.vcxproj
 EmulatorPkg/Win/VS2017/Win.vcxproj.filters
 EmulatorPkg/Win/VS2017/Win.vcxproj.user
-IntelFspWrapperPkg/FspWrapperSecCore/Vtf0/Bin/ResetVec.ia32.raw
-StandaloneMmPkg
-StdLib/Efi/StdLib/etc/host.conf
-StdLib/Efi/StdLib/etc/hosts
-StdLib/Efi/StdLib/etc/networks
-StdLib/Efi/StdLib/etc/protocols
-StdLib/Efi/StdLib/etc/resolv.conf
-StdLib/Efi/StdLib/etc/services
-StdLib/LibC/Softfloat/bits32/softfloat-macros
-StdLib/LibC/Softfloat/bits64/softfloat-macros
-StdLib/LibC/Softfloat/softfloat-specialize
-StdLib/LibC/Softfloat/templates/softfloat-specialize
+.git/**
+.git-blame-ignore-revs
+.github/codeql/edk2.qls
+.gitmodules
+IntelFsp2Pkg/Tools/Tests/ExpectedOutput.bsf
+**/*.json
+.mailmap
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/bootstrap
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/BUILD
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/compiler_config_setting.bzl
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/docs/brotli.svg
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/python/_brotli.cc
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/scripts/sources.lst
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/setup.cfg
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/tests/testdata/empty
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/tests/testdata/empty.compressed
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/tests/testdata/ukkonooa
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/tests/testdata/ukkonooa.compressed
+MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/WORKSPACE
+MdePkg/Library/MipiSysTLib/mipisyst/CODEOWNERS
+MdePkg/Library/MipiSysTLib/mipisyst/collateral/sys-t_1-0.xsd
+MdePkg/Library/MipiSysTLib/mipisyst/.gitmodules
+MdePkg/Library/MipiSysTLib/mipisyst/library/doxygen/mipi_sys_t_library_flow.vsd
+OvmfPkg/AmdSev/Grub/grub.cfg
+.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
+ReadMe.rst
+RedfishPkg/Documents/Media/BmcExposedUsbNic.svg
+RedfishPkg/Documents/Media/EmualtorPlatformLibrary.svg
+RedfishPkg/Documents/Media/PlatformWihtBmcLibrary.svg
+RedfishPkg/Documents/Media/RedfishDriverStack.svg
+RedfishPkg/Library/JsonLib/Readme.rst
+**/*.yaml
+**/*.yml
index 0d6c47fbde2a6f0739ecb0937de53313f2ceb7b4..76513016624cdfc6f369ede1e7608c52a2325e2c 100644 (file)
@@ -1,44 +1,5 @@
 ArmPkg/Library/GccLto/liblto-aarch64.a
 ArmPkg/Library/GccLto/liblto-arm.a
-BaseTools/Bin/CYGWIN_NT-5.1-i686/BootSectImage
-BaseTools/Bin/CYGWIN_NT-5.1-i686/BuildEnv
-BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
-BaseTools/Bin/CYGWIN_NT-5.1-i686/EfiLdrImage
-BaseTools/Bin/CYGWIN_NT-5.1-i686/EfiRom
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenCrc32
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFfs
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFv
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFw
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenPage
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenSec
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GenVtf
-BaseTools/Bin/CYGWIN_NT-5.1-i686/GnuGenBootSector
-BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaCompress
-BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
-BaseTools/Bin/CYGWIN_NT-5.1-i686/RunBinToolFromBuildDir
-BaseTools/Bin/CYGWIN_NT-5.1-i686/RunToolFromSource
-BaseTools/Bin/CYGWIN_NT-5.1-i686/Split
-BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool
-BaseTools/Bin/CYGWIN_NT-5.1-i686/TianoCompress
-BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
-BaseTools/Bin/CYGWIN_NT-5.1-i686/VfrCompile
-BaseTools/Bin/CYGWIN_NT-5.1-i686/VolInfo
-BaseTools/Bin/CYGWIN_NT-5.1-i686/build
-BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE31/CompilerIntrinsicsLib.lib
-BaseTools/Bin/Darwin-i386/Arm/DEBUG_XCODE32/CompilerIntrinsicsLib.lib
-BaseTools/Bin/Darwin-i386/Arm/RELEASE_XCODE31/CompilerIntrinsicsLib.lib
-BaseTools/Bin/Darwin-i386/Arm/RELEASE_XCODE32/CompilerIntrinsicsLib.lib
 BaseTools/Source/Python/Eot/EfiCompressor.pyd
 BaseTools/Source/Python/Eot/LzmaCompressor.pyd
 IntelFsp2Pkg/FspSecCore/Vtf0/Bin/ResetVec.ia32.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw
-UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw
index 29134b9c23eac2a532aea7a28fb6ca982067d6bc..5d7cbf25b2e96ec59ef42e5acb0d49eb1179dcf1 100644 (file)
@@ -5,54 +5,21 @@ Source: git://github.com/tianocore/edk2.git, http://www.openssl.org/source/,
  See get-orig-source in debian/rules for details.
 
 Files: *
-Copyright: 1999-2013, Intel Corporation
-License: BSD-2-clause
-
-Files: StdLib/PosixLib/Stringlist/stringlist.c StdLib/PosixLib/Gen/dirname.c
-       StdLib/LibC/Time/strptime.c StdLib/LibC/Locale/aliasname_local.h
-       StdLib/LibC/Locale/wcsxfrm.c StdLib/LibC/Locale/wcstold.c
-       StdLib/LibC/Locale/__mb_cur_max.c StdLib/LibC/Locale/_wcstod.h
-       StdLib/LibC/Locale/aliasname.c StdLib/LibC/Locale/__wctoint.h
-       StdLib/LibC/Locale/wcsftime.c StdLib/LibC/Locale/wcscoll.c
-       StdLib/LibC/Locale/wcstof.c StdLib/LibC/Locale/wcstod.c
-       StdLib/LibC/Locale/wcstoul.c StdLib/LibC/Locale/setlocale32.c
-       StdLib/LibC/Math/* StdLib/LibC/gdtoa/* StdLib/LibC/StdLib/setprogname.c
-       StdLib/Include/strings.h StdLib/Include/Ipf/* StdLib/Include/nsswitch.h
-       StdLib/Include/stringlist.h StdLib/BsdSocketLib/getnetnamadr.c
-       StdLib/BsdSocketLib/getnetbynis.c StdLib/BsdSocketLib/gethostnamadr.c
-       StdLib/BsdSocketLib/gethostbynis.c
-Copyright: 1993, Sun Microsystems, Inc.
-           1994, Garrett Wollman
-           1994-2008, The NetBSD Foundation, Inc.
-           1994-1996, Carnegie-Mellon University
-           1996-1997 John D. Polstra
-           1998-2000, Lucent Technologies
-           1998-2001, Doug Rabson
-           1999-2006, Citrus Project
-           1999-2012, Intel Corporation
-           2002, YAMAMOTO Takashi
-           2002, Tim J. Robbins
-           2002-2004, Marcel Moolenaar
-           2003, David Schultz <das@FreeBSD.ORG>
-License: BSD-2-clause
-
-Files: OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDriver.*
-Copyright: 2004-2013, Intel Corporation
-           2012, Ashley DeSimone
-License: BSD-2-clause
+Copyright: 2019, TianoCore and contributors.  All rights reserved.
+License: BSD-2-Clause-Patent
 
 Files: OvmfPkg/*
-Copyright: 2004-2013, Intel Corporation
+Copyright: 2004-2019, Intel Corporation
            2008-2009, Apple Inc.
            2011, Andrei Warkentin <andreiw@motorola.com>
            2011-2012, Bei Guan <gbtju85@gmail.com>
            2012-2013, Red Hat, Inc
            2013, ARM Ltd.
-License: BSD-2-clause
+License: BSD-2-Clause-Patent
 
 Files: BaseTools/Source/C/GenFw/elf*.h
-       BaseTools/Source/Python/sitecustomize.py DuetPkg/build*.sh
-       EmulatorPkg/* MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
+       BaseTools/Source/Python/sitecustomize.py EmulatorPkg/*
+       MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
        MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
        MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
        MdePkg/Include/* MdePkg/Library/*
@@ -62,7 +29,35 @@ Copyright: 1996-1998 John D. Polstra
            2008-2012, Apple Inc.
            2011-2013, ARM Limited
            2013, Red Hat, Inc.
-License: BSD-2-clause
+License: BSD-2-Clause-Patent
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/include/mipi_syst/api.h
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/include/mipi_syst/message.h
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/include/mipi_syst.h.in
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/src/mipi_syst_api.c
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/test/unit/mipi_syst_sbd_test.cpp
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/library/src/mipi_syst_writer.c
+Copyright: 2018-2023, MIPI Alliance, Inc.
+License: BSD-3-clause
+
+Files: MdePkg/Library/MipiSysTLib/mipisyst/*
+Copyright: 2018, MIPI Alliance, Inc.
+License: BSD-3-clause
 
 Files: ArmPkg/* ArmPlatformPkg/* BaseTools/Source/C/Common/*PeCoff*.c
        BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -77,138 +72,15 @@ Copyright: 2011-2013, ARM Limited
            2009, Hewlett-Packard Company
            2011, Hewlett-Packard Corporation
            2003-2008 University of Illinois at Urbana-Champaign
-License: BSD-2-clause
+License: BSD-2-Clause-Patent
 
 Files: ShellPkg/Application/Shell/* ShellPkg/Library/*
 Copyright: 1999-2013, Intel Corporation
            2013, Hewlett-Packard Development Company, L.P.
-License: BSD-2-clause
-
-Files: ArmPkg/Library/CompilerIntrinsicsLib/AArch64/memcpy.S
-       ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/*
-       EdkCompatibilityPkg/*
-       StdLibPrivateInternalFiles/Include/kfile.h StdLib/PosixLib/Glob/glob.c
-       StdLib/PosixLib/Gen/readdir.c StdLib/PosixLib/Gen/utime.c
-       StdLib/PosixLib/Gen/opendir.c StdLib/PosixLib/Gen/closedir.c
-       StdLib/LibC/Time/gettimeofday.c StdLib/LibC/Locale/_wcstol.h
-       StdLib/LibC/Locale/rune.h StdLib/LibC/Locale/setlocale.c
-       StdLib/LibC/Locale/iswctype_sb.c StdLib/LibC/Locale/_wcstoul.h
-       StdLib/LibC/Locale/multibyte_sb.c StdLib/LibC/Locale/runetype.h
-       StdLib/LibC/String/strncasecmp.c StdLib/LibC/Main/is*.c
-       StdLib/LibC/Main/*/is*.c StdLib/LibC/NetUtil/inet_*.c
-       StdLib/LibC/Stdio/* StdLib/LibC/StdLib/* StdLib/Include/netatalk/*
-       StdLib/Include/glob.h StdLib/Include/Ipf/machine/limits.h
-       StdLib/Include/Ipf/machine/int_types.h
-       StdLib/Include/Ipf/machine/param.h StdLib/Include/Ipf/machine/stdarg.h
-       StdLib/Include/Ipf/machine/types.h StdLib/Include/Ipf/machine/varargs.h
-       StdLib/Include/Ipf/machine/vmparam.h StdLib/Include/Ipf/machine/ansi.h
-       StdLib/Include/Ipf/machine/aout_machdep.h StdLib/Include/netinet6/in6.h
-       StdLib/Include/pwd.h StdLib/Include/locale.h StdLib/Include/dirent.h
-       StdLib/Include/arpa/nameser.h StdLib/Include/arpa/inet.h
-       StdLib/Include/utime.h StdLib/Include/netinet/in.h
-       StdLib/Include/netinet/tcp.h StdLib/Include/X64/machine/atomic.h
-       StdLib/Include/X64/machine/asm.h StdLib/Include/X64/machine/int_types.h
-       StdLib/Include/X64/machine/types.h StdLib/Include/X64/machine/ansi.h
-       StdLib/Include/paths.h StdLib/Include/netdb.h
-       StdLib/Include/Ia32/machine/asm.h StdLib/Include/Ia32/machine/int_types.h
-       StdLib/Include/Ia32/machine/param.h StdLib/Include/Ia32/machine/types.h
-       StdLib/Include/Ia32/machine/ansi.h StdLib/BsdSocketLib/getaddrinfo.c
-       StdLib/BsdSocketLib/getnameinfo.c
-Copyright: 1982-2013, Intel Corporation
-           1982-1994, The Regents of the University of California
-           1990-1991, Regents of The University of Michigan
-           1993-1994, Digital Equipment Corporation
-           1995, Jason Downs
-           1995-1997, Kungliga Tekniska Hogskolan
-           1995-1998, WIDE Project
-           1996-1999, Internet Software Consortium
-           1997, Todd C. Miller <Todd.Miller@courtesan.com>
-           2002, Wasabi Systems, Inc
-           2004, Internet Systems Consortium, Inc.
-           2010-2012, Intel Corporation
-           2011-2013, ARM Limited
-License: BSD-3-clause
-
-Files: StdLibPrivateInternalFiles/Include/namespace.h
-       StdLibPrivateInternalFiles/Include/reentrant.h
-       StdLibPrivateInternalFiles/Include/extern.h
-       StdLib/PosixLib/Err/warn_err.c StdLib/LibC/Time/timegm.c
-       StdLib/LibC/Time/strftime.c StdLib/LibC/Locale/ctypeio.*
-       StdLib/LibC/String/strsep.c StdLib/LibC/gdtoa/_strtold.c
-       StdLib/LibC/gdtoa/_strtof.c StdLib/LibC/Main/Arm/flt_rounds.c
-       StdLib/LibC/Uefi/writev.c StdLib/LibC/Uefi/select.c
-       StdLib/LibC/Uefi/compat.c StdLib/LibC/NetUtil/inet_addr.c
-       StdLib/LibC/Stdio/fparseln.c StdLib/LibC/Stdio/vswscanf.c
-       StdLib/LibC/Stdio/vfwscanf.c StdLib/LibC/Stdio/flockfile.c
-       StdLib/Include/sys/* StdLib/Include/x86/ieee.h
-       StdLib/Include/sysexits StdLib/Include/Ipf/machine/loadfile_machdep.h
-       StdLib/Include/Ipf/machine/cpu_counter.h
-       StdLib/Include/Ipf/machine/pmap.h
-       StdLib/Include/Ipf/machine/wchar_limits.h
-       StdLib/Include/Ipf/machine/cpu.h StdLib/Include/Ipf/machine/disklabel.h
-       StdLib/Include/Ipf/machine/ptrace.h StdLib/Include/Ipf/machine/setjmp.h
-       StdLib/Include/Ipf/machine/int_limits.h StdLib/Include/nl_types.h
-       StdLib/Include/Arm/machine/* StdLib/Include/net/*
-       StdLib/Include/inttypes.h StdLib/Include/arpa/telnet.h
-       StdLib/Include/arpa/nameser_compat.h StdLib/Include/arpa/ftp.h
-       StdLib/Include/netinet/ip.h StdLib/Include/netinet/in_systm.h
-       StdLib/Include/*/machine/int_mwgwtypes.h
-       StdLib/Include/*/machine/int_const.h
-       StdLib/Include/X64/machine/byte_swap.h
-       StdLib/Include/*/machine/int_fmtio.h
-       StdLib/Include/X64/machine/int_limits.h StdLib/Include/resolv.h
-       StdLib/Include/netns/ns.h StdLib/Include/Ia32/machine/byte_swap.h
-       StdLib/Include/Ia32/machine/int_limits.h StdLib/BsdSocketLib/map_v4v6.c
-       StdLib/BsdSocketLib/inet_net_pton.c StdLib/BsdSocketLib/res_*.c
-       StdLib/BsdSocketLib/sethostname.c StdLib/BsdSocketLib/ns_*.c
-       StdLib/BsdSocketLib/getnetbyht.c StdLib/BsdSocketLib/getproto.c
-       StdLib/BsdSocketLib/gethostname.c StdLib/BsdSocketLib/gethostbydns.c
-       StdLib/BsdSocketLib/herror.c StdLib/BsdSocketLib/getprotoname.c
-       StdLib/BsdSocketLib/inet_neta.c StdLib/BsdSocketLib/getservbyport.c
-       StdLib/BsdSocketLib/inet_pton.c StdLib/BsdSocketLib/getservent.c
-       StdLib/BsdSocketLib/gethostbyht.c StdLib/BsdSocketLib/getservbyname.c
-       StdLib/BsdSocketLib/getnetbydns.c StdLib/BsdSocketLib/getprotoent.c
-Copyright: 1983-1993, Digital Equipment Corporation
-           1982-1994, Regents of the University of California
-           1988, University of Utah
-           1993, Carlos Leandro and Rui Salgueiro
-           1994, Christopher G. Demetriou
-           1994, Winning Strategies, Inc
-           1994-1997, Mark Brinicombe
-           1996, Internet Software Consortium
-           1996-1997, Christos Zoulas
-           1997-2006, The NetBSD Foundation, Inc
-           1998 HD Associates, Inc
-           2000-2001, Artur Grabowski <art@openbsd.org>
-           1999-2012, Intel Corporation
-License: BSD-4-clause
-
-Files: StdLib/LibC/Stdio/fileext.h StdLib/LibC/Stdio/wscanf.c
-       StdLib/LibC/Stdio/vwscanf.c StdLib/LibC/Stdio/*wc.c
-       StdLib/LibC/Stdio/*wchar.c StdLib/LibC/Stdio/fgetws.c
-       StdLib/LibC/Stdio/swscanf.c StdLib/LibC/Stdio/wcio.h
-       StdLib/LibC/Stdio/fwide.c StdLib/LibC/Stdio/fwscanf.c
-       StdLib/LibC/Stdio/wprintf.c StdLib/LibC/Stdio/swprintf.c
-       StdLib/LibC/Stdio/fputws.c StdLib/LibC/Stdio/vwprintf.c
-       StdLib/LibC/Stdio/fwprintf.c
-Copyright: 2001, Citrus Project
-           2002, Tim J. Robbins
-           2010-2012, Intel Corporation
-License: BSD-2-clause
+License: BSD-2-Clause-Patent
 
-Files: StdLib/LibC/String/strlcat.c StdLib/LibC/String/strlcpy.c
-       StdLib/LibC/NetUtil/inet_ntop.c StdLib/BsdSocketLib/base64.c
-       StdLib/BsdSocketLib/inet_net_ntop.c StdLib/BsdSocketLib/res_data.c
-       StdLib/BsdSocketLib/ns_netint.c StdLib/BsdSocketLib/nsap_addr.c
-Copyright: 1998, Todd C. Miller <Todd.Miller@courtesan.com>
-           1996-1999, Internet Software Consortium
-           1995-2000, International Business Machines, Inc
-           2004, Internet Systems Consortium, Inc.
-           2011, Intel Corporation
-License: ISC
-
-Files: CryptoPkg/Library/OpensslLib/openssl-0.9.8w/*
-Copyright: 1998-2004 The OpenSSL Project
+Files: CryptoPkg/Library/OpensslLib/openssl/*
+Copyright: 1998-2019 The OpenSSL Project
            1995-1998 Eric A. Young, Tim J. Hudson
 License: OpenSSL
 
@@ -216,58 +88,81 @@ Files: debian/tests/shell.py
 Copyright: 2019 Canonical Ltd.
 License: GPL-3
 
-License: BSD-2-clause
+License: BSD-2-Clause-Patent
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
  .
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+ Subject to the terms and conditions of this license, each copyright holder
+ and contributor hereby grants to those receiving rights under this license
+ a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except for failure to satisfy the conditions of this license) patent
+ license to make, have made, use, offer to sell, sell, import, and otherwise
+ transfer this software, where such license applies only to those patent
+ claims, already acquired or hereafter acquired, licensable by such copyright
+ holder or contributor that are necessarily infringed by:
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ (a) their Contribution(s) (the licensed copyrights of copyright holders and
+     non-copyrightable additions of contributors, in source or binary form)
+     alone; or
+ .
+ (b) combination of their Contribution(s) with the work of authorship to
+     which such Contribution(s) was added by such copyright holder or
+     contributor, if, at the time the Contribution is added, such addition
+     causes such combination to be necessarily infringed. The patent license
+     shall not apply to any other combinations which include the
+     Contribution.
+ .
+ Except as expressly stated above, no rights or licenses from any copyright
+ holder or contributor is granted under this license, whether expressly, by
+ implication, estoppel or otherwise.
+ .
+ DISCLAIMER
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+ modification, are permitted provided that the following conditions are met:
  .
-   . Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
  .
-   . Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
  .
  . Neither the name of the Intel Corporation nor the names of its
- contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
 License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
index 9af5ff13c3f92ffddcdeb3b360c24f66df2483f8..3a5aafd2a8bc1fc60a0584153eba01220826e77c 100755 (executable)
@@ -122,19 +122,19 @@ if __name__ == '__main__':
     child = pexpect.spawn(' '.join(q.command))
     if args.debug:
         child.logfile = sys.stdout.buffer
-    child.expect(['Press .* or any other key to continue'], timeout=60)
+    child.expect(['Press .* or any other key to continue'], timeout=None)
     child.sendline('\x1b')
-    child.expect(['Shell> '])
+    child.expect(['Shell> '], timeout=None)
     child.sendline('FS0:\r')
-    child.expect(['FS0:\\\\> '])
+    child.expect(['FS0:\\\\> '], timeout=None)
     enrollcmd = ['EnrollDefaultKeys.efi']
     if args.no_default:
         enrollcmd.append("--no-default")
     child.sendline(f'{" ".join(enrollcmd)}\r')
-    child.expect(['FS0:\\\\> '])
+    child.expect(['FS0:\\\\> '], timeout=None)
     # Clear the BootOrder. See #1015759
     child.sendline('setvar BootOrder =\r')
-    child.expect(['FS0:\\\\> '])
+    child.expect(['FS0:\\\\> '], timeout=None)
     child.sendline('reset -s\r')
     child.wait()
     shutil.copy(q.pflash.varfile_path, args.out_file)
index b3f3ddecf8e214dfb06b597be4b737dcb2b689cc..b5774394791774abd1433ade7c57f3ca1d6235b6 100644 (file)
@@ -2,9 +2,10 @@
 
 # Use heuristics to identify new files that maybe binaries.
 # Flagged files need to be manually inspected and either added to the
-# allow list (because they are safe to redistribute), or to the reject list
+# ignore list (because they are safe to redistribute), or to the reject list
 # (so that they'll be removed prior to orig.tar.xz generation).
 
+import glob
 import os
 import re
 import sys
@@ -41,15 +42,26 @@ def extensionOK(name):
 
 
 if __name__ == '__main__':
+    ret = 0
     top = './'
-    for root, dirs, files in os.walk(top):
-        with open('./debian/binary-check.allow', 'r') as f:
-            allowlist = list(map(lambda s: s.strip(), f.readlines()))
 
-        ret = 0
+    ignorelist = []
+    with open('./debian/binary-check.ignore', 'r') as f:
+        ignoreglobs = list(map(lambda s: s.strip(), f.readlines()))
+    for pattern in ignoreglobs:
+        matches = glob.glob(pattern, recursive=True, include_hidden=True)
+        if len(matches) == 0:
+            print(
+                f"WARNING: pattern {pattern} matched no files.",
+                file=sys.stderr,
+            )
+        ignorelist += matches
+
+    for root, dirs, files in os.walk(top):
         for name in files:
             relpath = os.path.join(root, name)[len(top):]
-            if relpath in allowlist:
+            if relpath in ignorelist:
+                print(f"Ignoring: {relpath}", file=sys.stderr)
                 continue
             if nameOK(name):
                 continue
diff --git a/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch b/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch
deleted file mode 100644 (file)
index 1708f40..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 89a12f2a42b989e7925b4a71e503209971eaa271 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 1 Jun 2023 09:57:31 +0200
-Subject: [PATCH] OvmfPkg/PlatformInitLib: limit phys-bits to 46.
-
-Older linux kernels have problems with phys-bits larger than 46,
-ubuntu 18.04 (kernel 4.15) has been reported to be affected.
-
-Reduce phys-bits limit from 47 to 46.
-
-Reported-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- OvmfPkg/Library/PlatformInitLib/MemDetect.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
-index 38cece9173..4d0522ce22 100644
---- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c
-+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
-@@ -657,16 +657,19 @@ PlatformAddressWidthFromCpuid (
-     ));\r
\r
-   if (Valid) {\r
--    if (PhysBits > 47) {\r
-+    if (PhysBits > 46) {\r
-       /*\r
-        * Avoid 5-level paging altogether for now, which limits\r
-        * PhysBits to 48.  Also avoid using address bit 48, due to sign\r
-        * extension we can't identity-map these addresses (and lots of\r
-        * places in edk2 assume we have everything identity-mapped).\r
-        * So the actual limit is 47.\r
-+       *\r
-+       * Also some older linux kernels apparently have problems handling\r
-+       * phys-bits > 46 correctly, so use that as limit.\r
-        */\r
--      DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 47 (avoid 5-level paging)\n", __func__));\r
--      PhysBits = 47;\r
-+      DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 46 (avoid 5-level paging)\n", __func__));\r
-+      PhysBits = 46;\r
-     }\r
\r
-     if (!Page1GSupport && (PhysBits > 40)) {\r
diff --git a/debian/patches/ArmVirtPkg-disable-the-EFI_MEMORY_ATTRIBUTE-protocol.patch b/debian/patches/ArmVirtPkg-disable-the-EFI_MEMORY_ATTRIBUTE-protocol.patch
new file mode 100644 (file)
index 0000000..f5302ea
--- /dev/null
@@ -0,0 +1,58 @@
+Description: ArmVirtPkg: Disable the EFI memory attributes protocol
+ Temporarily disable the EFI_MEMORY_ATTRIBUTE_PROTOCOL to workaround
+ a bug in shim until distributions have had a chance to fix it.
+Author: dann frazier <dannf@debian.org>
+Bug-Debian: https://bugs.debian.org/1042438
+Bug-Ubuntu: https://launchpad.net/bugs/2036604
+Last-Update: 2023-09-23
+
+Index: edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.c
+===================================================================
+--- edk2-2023.05.orig/ArmPkg/Drivers/CpuDxe/CpuDxe.c
++++ edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.c
+@@ -244,8 +244,6 @@ CpuDxeInitialize (
+                   &mCpuHandle,\r
+                   &gEfiCpuArchProtocolGuid,\r
+                   &mCpu,\r
+-                  &gEfiMemoryAttributeProtocolGuid,\r
+-                  &mMemoryAttribute,\r
+                   NULL\r
+                   );\r
\r
+Index: edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.h
+===================================================================
+--- edk2-2023.05.orig/ArmPkg/Drivers/CpuDxe/CpuDxe.h
++++ edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.h
+@@ -30,12 +30,9 @@
+ #include <Protocol/Cpu.h>\r
+ #include <Protocol/DebugSupport.h>\r
+ #include <Protocol/LoadedImage.h>\r
+-#include <Protocol/MemoryAttribute.h>\r
\r
+ extern BOOLEAN  mIsFlushingGCD;\r
\r
+-extern EFI_MEMORY_ATTRIBUTE_PROTOCOL  mMemoryAttribute;\r
+-\r
+ /**\r
+   This function registers and enables the handler specified by InterruptHandler for a processor\r
+   interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the\r
+Index: edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+===================================================================
+--- edk2-2023.05.orig/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
++++ edk2-2023.05/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+@@ -23,7 +23,6 @@
+   CpuDxe.h\r
+   CpuMmuCommon.c\r
+   Exception.c\r
+-  MemoryAttribute.c\r
\r
+ [Sources.ARM]\r
+   Arm/Mmu.c\r
+@@ -54,7 +53,6 @@
\r
+ [Protocols]\r
+   gEfiCpuArchProtocolGuid\r
+-  gEfiMemoryAttributeProtocolGuid\r
\r
+ [Guids]\r
+   gEfiDebugImageInfoTableGuid\r
index 7e1417a350bb3819c2b6408dd0b5289d91e66f65..80f0c43b4393df8eb08c2a9e8f2ae317c7aacde7 100644 (file)
@@ -5,16 +5,16 @@ Description: Revert "ArmVirtPkg: make EFI_LOADER_DATA non-executable"
 Author: dann frazier <dannf@debian.org>
 Bug-Debian: https://bugs.debian.org/1025656
 Forwarded: https://edk2.groups.io/g/devel/message/97814
-Last-Update: 2023-03-09
+Last-Update: 2023-07-21
 
 --- a/ArmVirtPkg/ArmVirt.dsc.inc
 +++ b/ArmVirtPkg/ArmVirt.dsc.inc
-@@ -361,7 +361,7 @@
+@@ -365,7 +365,7 @@
    # reserved ones, with the exception of LoaderData regions, of which OS loaders\r
    # (i.e., GRUB) may assume that its contents are executable.\r
    #\r
 -  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD5\r
 +  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD1\r
  \r
- [Components.common]\r
-   #\r
+   gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard|TRUE\r
\r
index a9ee2be187afcce8c4a65800581de81dbb87a614..c18b4e8e0ec8a035aaa95b9c4f2832e76e3c3aae 100644 (file)
@@ -2,4 +2,4 @@ no-stack-protector-all-archs.diff
 brotlicompress-disable.diff
 x64-baseline-abi.patch
 Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch
-0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch
+ArmVirtPkg-disable-the-EFI_MEMORY_ATTRIBUTE-protocol.patch
index d4d8668480c2e8dca44d384caa7da68e0c0641e3..b0972a85e2041d285ff0937dcb5af9190c244fb1 100644 (file)
@@ -28,6 +28,7 @@ class QemuEfiMachine(enum.Enum):
     OVMF32 = enum.auto()
     AAVMF = enum.auto()
     AAVMF32 = enum.auto()
+    RISCV64 = enum.auto()
 
 
 class QemuEfiVariant(enum.Enum):
@@ -57,6 +58,9 @@ class QemuCommand:
     Aavmf_Common_Params = Qemu_Common_Params + [
         '-machine', 'virt', '-device', 'virtio-serial-device',
     ]
+    RiscV_Common_Params = Qemu_Common_Params + [
+        '-machine', 'virt', '-device', 'virtio-serial-device',
+    ]
     Machine_Base_Command = {
         QemuEfiMachine.AAVMF: [
             'qemu-system-aarch64', '-cpu', 'cortex-a57',
@@ -73,6 +77,9 @@ class QemuCommand:
         QemuEfiMachine.OVMF32: [
             'qemu-system-i386', '-machine', 'q35,accel=tcg',
         ] + Ovmf_Common_Params,
+        QemuEfiMachine.RISCV64: [
+            'qemu-system-riscv64',
+        ] + RiscV_Common_Params,
     }
 
     def _get_default_flash_paths(self, machine, variant, flash_size):
@@ -115,6 +122,13 @@ class QemuCommand:
         # Remaining possibilities are OVMF variants
         if machine == QemuEfiMachine.OVMF_PC:
             assert(variant is None)
+        if machine == QemuEfiMachine.RISCV64:
+            assert(variant is None)
+            assert(flash_size == QemuEfiFlashSize.DEFAULT)
+            return (
+                '/usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd',
+                '/usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd',
+            )
         if variant == QemuEfiVariant.SNAKEOIL:
             # We provide one size - you don't get to pick.
             assert(flash_size == QemuEfiFlashSize.DEFAULT)
@@ -163,18 +177,25 @@ class QemuCommand:
         be automatically cleaned up when the object is destroyed.
         '''
         def __init__(self, code_path, vars_template_path):
+            self.params = [
+                '-drive',
+                'file=%s,if=pflash,format=raw,unit=0,readonly=on' %
+                (code_path),
+            ]
+            if vars_template_path is None:
+                self.varfile_path = None
+                return
             with tempfile.NamedTemporaryFile(delete=False) as varfile:
                 self.varfile_path = varfile.name
                 with open(vars_template_path, 'rb') as template:
                     shutil.copyfileobj(template, varfile)
-                self.params = [
-                    '-drive',
-                    'file=%s,if=pflash,format=raw,unit=0,readonly=on' %
-                    (code_path),
-                    '-drive',
-                    'file=%s,if=pflash,format=raw,unit=1,readonly=off' %
-                    (varfile.name)
-                ]
+                    self.params = self.params + [
+                        '-drive',
+                        'file=%s,if=pflash,format=raw,unit=1,readonly=off' %
+                        (varfile.name)
+                    ]
 
         def __del__(self):
+            if self.varfile_path is None:
+                return
             os.unlink(self.varfile_path)
index fd0a8bbf049c7087e6ac431c6d82d95b1664b537..7fda0b1ddcb7f33c386b29ce5b6ad753e4b151bc 100755 (executable)
@@ -20,26 +20,27 @@ ifeq ($(DEB_BUILD_ARCH),arm64)
        EDK2_BUILD_ARCH=AARCH64
 endif
 
+PCD_RELEASE_DATE = $(shell date -d@$(SOURCE_DATE_EPOCH) "+%m/%d/%Y")
+PCD_FLAGS  = --pcd PcdFirmwareVendor=L"Proxmox distribution of EDK II\\0"
+PCD_FLAGS += --pcd PcdFirmwareVersionString=L"$(DEB_VERSION)\\0"
+PCD_FLAGS += --pcd PcdFirmwareReleaseDateString=L"$(PCD_RELEASE_DATE)\\0"
 COMMON_FLAGS  = -DNETWORK_HTTP_BOOT_ENABLE=TRUE
 COMMON_FLAGS += -DNETWORK_IP6_ENABLE=TRUE
 COMMON_FLAGS += -DNETWORK_TLS_ENABLE
 COMMON_FLAGS += -DSECURE_BOOT_ENABLE=TRUE
-COMMON_FLAGS += -DTPM2_ENABLE=TRUE
-COMMON_FLAGS += -DPVSCSI_ENABLE=TRUE
-OVMF_COMMON_FLAGS = $(COMMON_FLAGS)
+COMMON_FLAGS += $(PCD_FLAGS)
+OVMF_COMMON_FLAGS  = $(COMMON_FLAGS)
+OVMF_COMMON_FLAGS += -DTPM2_ENABLE=TRUE
 OVMF_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB
 OVMF_4M_SMM_FLAGS = $(OVMF_4M_FLAGS) -DSMM_REQUIRE=TRUE
 OVMF32_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB
 OVMF32_4M_SMM_FLAGS =  $(OVMF32_4M_FLAGS) -DSMM_REQUIRE=TRUE
 
-AAVMF_FLAGS  = $(COMMON_FLAGS) -DTPM2_CONFIG_ENABLE=TRUE
+AAVMF_FLAGS  = $(COMMON_FLAGS)
+AAVMF_FLAGS += -DTPM2_ENABLE=TRUE
+AAVMF_FLAGS += -DTPM2_CONFIG_ENABLE=TRUE
 AAVMF_FLAGS += -DCAVIUM_ERRATUM_27456=TRUE
 
-PCD_RELEASE_DATE = $(shell date -d@$(SOURCE_DATE_EPOCH) +%m/%d/%Y)
-
-PCD_OPTIONS  = --pcd PcdFirmwareVendor=L"EFI Development Kit II / OVMF\\0"
-PCD_OPTIONS += --pcd PcdFirmwareVersionString=L"$(DEB_VERSION_UPSTREAM_REVISION)\\0"
-PCD_OPTIONS += --pcd PcdFirmwareReleaseDateString=L"$(PCD_RELEASE_DATE)\\0"
 
 # Clear variables used internally by the edk2 build system
 undefine WORKSPACE
@@ -73,7 +74,7 @@ OVMF32_INSTALL_DIR = debian/ovmf32-install
 OVMF32_BUILD_DIR = Build/OvmfIa32/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN)
 OVMF32_SHELL = $(OVMF32_BUILD_DIR)/IA32/Shell.efi
 OVMF32_BINARIES = $(OVMF32_SHELL)
-OVMF32_IMAGES  := $(addprefix $(OVMF32_INSTALL_DIR)/,OVMF32_CODE_4M.secboot.fd OVMF_VARS_4M.fd)
+OVMF32_IMAGES  := $(addprefix $(OVMF32_INSTALL_DIR)/,OVMF32_CODE_4M.secboot.fd OVMF32_VARS_4M.fd)
 
 QEMU_EFI_BUILD_DIR = Build/ArmVirtQemu-$(EDK2_HOST_ARCH)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN)
 AAVMF_BUILD_DIR = Build/ArmVirtQemu-AARCH64/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN)
@@ -93,7 +94,6 @@ $(OVMF32_BINARIES) $(OVMF32_IMAGES): debian/setup-build-stamp
                build -a IA32 \
                        -t $(EDK2_TOOLCHAIN) \
                        -p OvmfPkg/OvmfPkgIa32.dsc \
-                       $(PCD_OPTIONS) \
                        $(OVMF32_4M_SMM_FLAGS) -b $(BUILD_TYPE)
        cp $(OVMF32_BUILD_DIR)/FV/OVMF_CODE.fd \
                $(OVMF32_INSTALL_DIR)/OVMF32_CODE_4M.secboot.fd
@@ -109,7 +109,6 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
                build -a IA32 -a X64 \
                        -t $(EDK2_TOOLCHAIN) \
                        -p OvmfPkg/OvmfPkgIa32X64.dsc \
-                       $(PCD_OPTIONS) \
                        $(OVMF_4M_FLAGS) -b $(BUILD_TYPE)
        cp $(OVMF3264_BUILD_DIR)/FV/OVMF_CODE.fd \
                $(OVMF_INSTALL_DIR)/OVMF_CODE_4M.fd
@@ -120,7 +119,6 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
                build -a IA32 -a X64 \
                        -t $(EDK2_TOOLCHAIN) \
                        -p OvmfPkg/OvmfPkgIa32X64.dsc \
-                       $(PCD_OPTIONS) \
                        $(OVMF_4M_SMM_FLAGS) -b $(BUILD_TYPE)
        cp $(OVMF3264_BUILD_DIR)/FV/OVMF_CODE.fd \
                $(OVMF_INSTALL_DIR)/OVMF_CODE_4M.secboot.fd
@@ -209,6 +207,7 @@ override_dh_auto_clean:
 EMBEDDED_SUBMODULES += CryptoPkg/Library/OpensslLib/openssl
 EMBEDDED_SUBMODULES += ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
 EMBEDDED_SUBMODULES += MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+EMBEDDED_SUBMODULES += MdePkg/Library/MipiSysTLib/mipisyst
 get-orig-source:
        # Should be executed on a checkout of the upstream master branch,
        # with the debian/ directory manually copied in.
index a851d0fbc760e661f6dadd011edd139cd4934f18..d9f1573d550b312676ec6b8ece72decfaee18478 100644 (file)
@@ -1,4 +1,6 @@
 pve-edk2-firmware source: superfluous-file-pattern * [debian/copyright:*]
 pve-edk2-firmware source: source-is-missing [*/brotli/js/*.js]
-pve-edk2-firmware source: source-is-missing [CryptoPkg/Library/OpensslLib/openssl/krb5/*/*.html]
 pve-edk2-firmware source: source-is-missing [CryptoPkg/Library/OpensslLib/openssl/krb5/*/*.htm]
+pve-edk2-firmware source: source-is-missing [CryptoPkg/Library/OpensslLib/openssl/krb5/*/*.html]
+pve-edk2-firmware source: source-is-missing [MdePkg/Library/MipiSysTLib/mipisyst/external/pugixml/docs/manual.html]
+pve-edk2-firmware source: source-is-missing [MdePkg/Library/MipiSysTLib/mipisyst/external/pugixml/docs/quickstart.html]
index fbfa279f4c3d6b3d03cf6a16e85738c73533adb0..eba17211f5f986c958e9203bf192a08e3357f933 100644 (file)
@@ -12,6 +12,7 @@ Depends:
  qemu-efi-aarch64,
  qemu-efi-arm,
  qemu-system-arm,
+ qemu-system-misc,
  qemu-system-x86,
  sbsigntool [amd64 arm64],
  shim-signed [amd64 arm64],
index de4a699087c493235d6d0734d0c6093da1bb5d2a..8b94b59df1b49400ed84a13a2265e293af3e0715 100755 (executable)
@@ -201,60 +201,6 @@ class BootToShellTest(unittest.TestCase):
         q = Qemu.QemuCommand(QemuEfiMachine.AAVMF32)
         self.run_cmd_check_shell(q.command)
 
-    def test_ovmf_pc(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_PC, flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        self.run_cmd_check_shell(q.command)
-
-    def test_ovmf_q35(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_Q35, flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        self.run_cmd_check_shell(q.command)
-
-    def test_ovmf_secboot(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_Q35,
-            variant=QemuEfiVariant.SECBOOT,
-            flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        self.run_cmd_check_shell(q.command)
-
-    def test_ovmf_ms(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_Q35,
-            variant=QemuEfiVariant.MS,
-            flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        self.run_cmd_check_shell(q.command)
-
-    @unittest.skipUnless(DPKG_ARCH == 'amd64', "amd64-only")
-    def test_ovmf_ms_secure_boot_signed(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_Q35,
-            variant=QemuEfiVariant.MS,
-            flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        grub = get_local_grub_path('X64', signed=True)
-        shim = get_local_shim_path('X64', signed=True)
-        iso = GrubShellBootableIsoImage('X64', shim, grub)
-        q.add_disk(iso.path)
-        self.run_cmd_check_secure_boot(q.command, 'x64', True)
-
-    @unittest.skipUnless(DPKG_ARCH == 'amd64', "amd64-only")
-    def test_ovmf_ms_secure_boot_unsigned(self):
-        q = Qemu.QemuCommand(
-            QemuEfiMachine.OVMF_Q35,
-            variant=QemuEfiVariant.MS,
-            flash_size=QemuEfiFlashSize.SIZE_2MB,
-        )
-        grub = get_local_grub_path('X64', signed=False)
-        shim = get_local_shim_path('X64', signed=False)
-        iso = GrubShellBootableIsoImage('X64', shim, grub)
-        q.add_disk(iso.path)
-        self.run_cmd_check_secure_boot(q.command, 'x64', False)
-
     def test_ovmf_4m(self):
         q = Qemu.QemuCommand(
             QemuEfiMachine.OVMF_Q35,
@@ -354,6 +300,9 @@ class BootToShellTest(unittest.TestCase):
         )
         self.run_cmd_check_shell(q.command)
 
+    def test_riscv64(self):
+        q = Qemu.QemuCommand(QemuEfiMachine.RISCV64)
+        self.run_cmd_check_shell(q.command)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/edk2 b/edk2
index f80f052277c88a67c55e107b550f504eeea947d3..819cfc6b42a68790a23509e4fcc58ceb70e1965e 160000 (submodule)
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit f80f052277c88a67c55e107b550f504eeea947d3
+Subproject commit 819cfc6b42a68790a23509e4fcc58ceb70e1965e