### 20200712

* update EDK2 source to `edk2-stable202005` * fix https://edk2.groups.io/g/devel/message/62295?p=,,,20,0,0,0::Created,,4000,20,2,0,75394040 * add workaround for suddenly disappeared https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip
tianocore · Jul 12, 2020 · 5c2c766 · 5c2c766
1 parent 1293134
commit 5c2c766
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/CdeMnwPkg/PlatformPkgX64.dsc b/CdeMnwPkg/PlatformPkgX64.dsc
@@ -66,6 +66,10 @@
 #
 ################################################################################
 [LibraryClasses.common]
+  FmpDependencyLib|FmpDevicePkg\Library\FmpDependencyLib\FmpDependencyLib.inf
+  FmpDependencyCheckLib|FmpDevicePkg\Library\FmpDependencyCheckLibNull\FmpDependencyCheckLibNull.inf
+  FmpDependencyDeviceLib|FmpDevicePkg\Library\FmpDependencyDeviceLibNull\FmpDependencyDeviceLibNull.inf
+
   #
   # Entry point
   #

diff --git a/README.md b/README.md
@@ -227,6 +227,15 @@ Therefore the **CdePkg**'s C library will be validated by simple tests only, in
 |[Visual HWTools for UEFI Shell](https://github.com/KilianKegel/Visual-HWTools-for-UEFI-Shell#visual-hwtools-for-uefi-shell)|HWTools: PCI- and GPIOSpy for Baytrail. MemSpy for all.|
 
 ## Revision history
+### 20200712
+* update EDK2 source to `edk2-stable202005`
+* fix ["Error 4000" EDK II Build Issue ](https://edk2.groups.io/g/devel/message/62295?p=,,,20,0,0,0::Created,,4000,20,2,0,75394040)
+    * add to PlatformPkgX64.dsc `[LibraryClasses.common]` to prevent build failure: 
+        * `  FmpDependencyLib|FmpDevicePkg\Library\FmpDependencyLib\FmpDependencyLib.inf`
+        * `  FmpDependencyCheckLib|FmpDevicePkg\Library\FmpDependencyCheckLibNull\FmpDependencyCheckLibNull.inf`
+        * `  FmpDependencyDeviceLib|FmpDevicePkg\Library\FmpDependencyDeviceLibNull\FmpDependencyDeviceLibNull.inf`
+* add workaround for suddenly disappeared `https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip`
+
 ### 20191202
 * add ASSERT.H and LOCALE.H function validation for EmulationMode and MinnowBoard for PEI and DXE POST drivers
 * assert(), setlocale(), localeconv()

diff --git a/launch.bat b/launch.bat
@@ -69,6 +69,15 @@ rem ### local tools #######################################################
 rem #######################################################################
 if not exist openssl-1.0.2r-x64_86-win64 (
     powershell "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri "https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip -OutFile openssl-1.0.2r-x64_86-win64.zip"}"
+
+    if not exist openssl-1.0.2r-x64_86-win64.zip (
+    rem #######################################################################
+    rem ### if https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip not available
+    rem #######################################################################
+        git clone https://github.com/KilianKegel/openSSLBinary.git
+        move openSSLBinary\openssl-1.0.2r-x64_86-win64.zip .
+        rd /s /q openSSLBinary
+    )
     powershell Expand-Archive openssl-1.0.2r-x64_86-win64.zip)
 )
 if not exist nasm-2.13.03 (
@@ -108,6 +117,11 @@ for /F  %%a in ('where python.exe') do set PYTHON_HOME=%%~dpa
 
 cd %WORKSPACE%\edk2
 
+rem ######################################################################
+rem ### checkout latest stable tag
+rem ######################################################################
+git checkout edk2-stable202005
+
 call edksetup.bat Rebuild
 
 cd %WORKSPACE%\edk2\BaseTools\Source\C