]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Update edk2 headers to stable202005
authorMitchell Horne <mhorne@FreeBSD.org>
Thu, 4 Jun 2020 19:21:41 +0000 (19:21 +0000)
committerMitchell Horne <mhorne@FreeBSD.org>
Thu, 4 Jun 2020 19:21:41 +0000 (19:21 +0000)
commit3245fa215aca18d135839a15c80ae1c905666a37
treec5c66744f1c6591063117820b79af6356afe56c0
parent30296c428acea5cb1d13c786f7aa9bf78e8f3638
parent4a14dfcc1110b35118d5be8054fecf59ffb83032
Update edk2 headers to stable202005

We use these to compile libefivar. The particular motivation for this update is
the inclusion of the RISC-V machine definitions that allow us to build the
library on the platform. This support could easily have been submitted as a
small local diff, but the timing of the release coincided with this work, and
it has been over 3 years since these sources were initially imported.

Note that this comes with a license change from regular BSD 2-clause to the
BSD+Patent license. This has been approved by core@ for this particular
project [1].

As with the original import, we retain only the subset of headers that we
actually need to build libefivar. I adapted imp@'s process slightly for this
update:

    # Generate list of the headers needed to build
    cp -r ../vendor/edk2/dist/MdePkg/Include sys/contrib/edk2
    cd lib/libefivar
    make
    pushd `make -V .OBJDIR`
    cat .depend*.o | grep sys/contrib | cut -d' ' -f 3 |
        sort -u | sed -e 's=/full/path/sys/contrib/edk2/==' > /tmp/xxx
    popd

    # Merge the needed files
    cd ../../sys/contrib/edk2
    svn revert -R .
    for i in `cat /tmp/xxx`; do
        svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/$i $i
    done
    svn merge -c VendorRevision svn+ssh://repo.freebsd.org/base/vendor/edk2/dist/MdePkg/MdePkg.dec MdePkg.dec

[1] https://www.freebsd.org/internal/software-license.html
37 files changed:
sys/contrib/edk2/Include/Base.h
sys/contrib/edk2/Include/Guid/HiiFormMapMethodGuid.h
sys/contrib/edk2/Include/Guid/PcAnsi.h
sys/contrib/edk2/Include/Guid/WinCertificate.h
sys/contrib/edk2/Include/IndustryStandard/Acpi10.h
sys/contrib/edk2/Include/IndustryStandard/Acpi20.h
sys/contrib/edk2/Include/IndustryStandard/Acpi30.h
sys/contrib/edk2/Include/IndustryStandard/Acpi40.h
sys/contrib/edk2/Include/IndustryStandard/Acpi50.h
sys/contrib/edk2/Include/IndustryStandard/Acpi51.h
sys/contrib/edk2/Include/IndustryStandard/Acpi60.h
sys/contrib/edk2/Include/IndustryStandard/AcpiAml.h
sys/contrib/edk2/Include/IndustryStandard/Bluetooth.h
sys/contrib/edk2/Include/Library/BaseLib.h
sys/contrib/edk2/Include/Library/BaseMemoryLib.h
sys/contrib/edk2/Include/Library/DebugLib.h
sys/contrib/edk2/Include/Library/DevicePathLib.h
sys/contrib/edk2/Include/Library/MemoryAllocationLib.h
sys/contrib/edk2/Include/Library/PcdLib.h
sys/contrib/edk2/Include/Library/PrintLib.h
sys/contrib/edk2/Include/Library/UefiBootServicesTableLib.h
sys/contrib/edk2/Include/Protocol/DebugPort.h
sys/contrib/edk2/Include/Protocol/DevicePath.h
sys/contrib/edk2/Include/Protocol/DevicePathFromText.h
sys/contrib/edk2/Include/Protocol/DevicePathToText.h
sys/contrib/edk2/Include/Protocol/DevicePathUtilities.h
sys/contrib/edk2/Include/Protocol/SimpleTextIn.h
sys/contrib/edk2/Include/Protocol/SimpleTextInEx.h
sys/contrib/edk2/Include/Protocol/SimpleTextOut.h
sys/contrib/edk2/Include/Uefi.h
sys/contrib/edk2/Include/Uefi/UefiBaseType.h
sys/contrib/edk2/Include/Uefi/UefiGpt.h
sys/contrib/edk2/Include/Uefi/UefiInternalFormRepresentation.h
sys/contrib/edk2/Include/Uefi/UefiMultiPhase.h
sys/contrib/edk2/Include/Uefi/UefiPxe.h
sys/contrib/edk2/Include/Uefi/UefiSpec.h
sys/contrib/edk2/MdePkg.dec