From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.2579.1585626574829899205 for ; Mon, 30 Mar 2020 20:49:34 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: heng.luo@intel.com) IronPort-SDR: Y7HODZQ+Ve5xyhhd1k2Iq/VwUL4oFuoRt2L2nKM4XGrccddtWxkWsaA0Q0mkIkRSgv6dUu8R1N x9Upk1+AI7Cw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 20:49:34 -0700 IronPort-SDR: 0+7K4GxW+XtvRvYoZ8szQEQRheZ5xNerofZ5EUHne9n7eTorPdsmqjZ9xHibFSJpfo+rbrWKS2 fe5svf1FZTDA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,326,1580803200"; d="scan'208";a="450020862" Received: from unknown (HELO hengluo-dev.ccr.corp.intel.com) ([10.239.153.154]) by fmsmga006.fm.intel.com with ESMTP; 30 Mar 2020 20:49:32 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Dandan Bi , Liming Gao , Eric Dong , Ray Ni Subject: [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Date: Tue, 31 Mar 2020 11:49:11 +0800 Message-Id: <20200331034913.1986-2-heng.luo@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 In-Reply-To: <20200331034913.1986-1-heng.luo@intel.com> References: <20200331034913.1986-1-heng.luo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 Add all pathes of feature domains to package path in build_bios.py. Cc: Dandan Bi Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- Notes: v2: - Skip adding folders that contains package contents to the PACKAGES_PATH. [Ray Ni] Platform/Intel/build_bios.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 1ef35aca0a..8f855f63eb 100644 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -3,7 +3,7 @@ # Builds BIOS using configuration files and dynamically # imported functions from board directory # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -16,6 +16,7 @@ imported functions from board directory import os import re import sys +import glob import signal import shutil import argparse @@ -120,6 +121,13 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"] + # add all feature domains in WORKSPACE_FEATURES to package path + for filename in os.listdir(config["WORKSPACE_FEATURES"]): + filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) + # feature domains folder does not contain dec file + if os.path.isdir(filepath) and \ + not glob.glob(os.path.join(filepath, "*.dec")): + config["PACKAGES_PATH"] += os.pathsep + filepath config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"] config["PACKAGES_PATH"] += os.pathsep + \ os.path.join(config["WORKSPACE"], "FSP") -- 2.24.0.windows.2