UefiPayloadPkg: Fix TerminalDxe build time configurable

[mirror_edk2.git] / .pytool / CISettings.py

diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index 120fa1dcb4336c62d4e301a2059f3ae0745f02c9..bac60ecbaaf51ef4cf2f3ec7616e8ba2caa645ea 100644 (file)
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -1,6 +1,7 @@
 # @file\r
 #\r
 # Copyright (c) Microsoft Corporation.\r
+# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ##\r
 import os\r
@@ -39,7 +40,9 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
         ''' return iterable of edk2 packages supported by this build.\r
         These should be edk2 workspace relative paths '''\r
 \r
-        return ("MdePkg",\r
+        return ("ArmVirtPkg",\r
+                "EmulatorPkg",\r
+                "MdePkg",\r
                 "MdeModulePkg",\r
                 "NetworkPkg",\r
                 "PcAtChipsetPkg",\r
@@ -49,15 +52,18 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
                 "ShellPkg",\r
                 "FatPkg",\r
                 "CryptoPkg",\r
-                "UnitTestFrameworkPkg"\r
+                "UnitTestFrameworkPkg",\r
+                "OvmfPkg"\r
                 )\r
 \r
     def GetArchitecturesSupported(self):\r
         ''' return iterable of edk2 architectures supported by this build '''\r
-        return ("IA32",\r
+        return (\r
+                "IA32",\r
                 "X64",\r
                 "ARM",\r
-                "AARCH64")\r
+                "AARCH64",\r
+                "RISCV64")\r
 \r
     def GetTargetsSupported(self):\r
         ''' return iterable of edk2 target tags supported by this build '''\r
@@ -122,14 +128,13 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
 \r
         self.ActualToolChainTag = shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")\r
 \r
-        if GetHostInfo().os.upper() == "WINDOWS":\r
-            scopes += ('host-test-win',)\r
-\r
         if GetHostInfo().os.upper() == "LINUX" and self.ActualToolChainTag.upper().startswith("GCC"):\r
             if "AARCH64" in self.ActualArchitectures:\r
                 scopes += ("gcc_aarch64_linux",)\r
             if "ARM" in self.ActualArchitectures:\r
                 scopes += ("gcc_arm_linux",)\r
+            if "RISCV64" in self.ActualArchitectures:\r
+                scopes += ("gcc_riscv64_unknown",)\r
 \r
         return scopes\r
 \r
@@ -146,6 +151,10 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
             "UnitTestFrameworkPkg/Library/CmockaLib/cmocka", False))\r
         rs.append(RequiredSubmodule(\r
             "MdeModulePkg/Universal/RegularExpressionDxe/oniguruma", False))\r
+        rs.append(RequiredSubmodule(\r
+            "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli", False))\r
+        rs.append(RequiredSubmodule(\r
+            "BaseTools/Source/C/BrotliCompress/brotli", False))\r
         return rs\r
 \r
     def GetName(self):\r