From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id E98EC940EAD for ; Tue, 28 Nov 2023 01:04:03 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=DzWLnKxJU/MyIwKAlcUrY4DjrE7SOy2W5AUyVHAS7as=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1701133442; v=1; b=gHr0WWzMhDAxUarPVMkW0FM/Yf9lIL+JDFYds18E9JiX6GC0yNdeMC0Pml5IbEVTI5Ou0uyM 1vYnyR2IirNGtMkoIJVYLHgCUlOPgArqwDxOmA4Qp0RMfqM0KUDbjuxExfeQq01NY7yZcrZXBKb 96wftNXlEFN/x0JqQpob2Rto= X-Received: by 127.0.0.2 with SMTP id qKtoYY7687511xVIx3XP0iUR; Mon, 27 Nov 2023 17:04:02 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.5492.1701133441440565922 for ; Mon, 27 Nov 2023 17:04:02 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="383208387" X-IronPort-AV: E=Sophos;i="6.04,232,1695711600"; d="scan'208";a="383208387" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 17:04:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="859243507" X-IronPort-AV: E=Sophos;i="6.04,232,1695711600"; d="scan'208";a="859243507" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.67]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 17:03:59 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Chasel Chiu , Liming Gao , Eric Dong Subject: [edk2-devel] [edk2-platforms][PATCH v1] MinPlatformPkg: Add edk2-platforms/Features to PACKAGES_PATH Date: Mon, 27 Nov 2023 17:03:36 -0800 Message-Id: <20231128010339.1954-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: YxRxquxMjlZIA0Pp2jabaI7Ex7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=gHr0WWzM; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- Platform/Intel/build.cfg | 5 +++-- Platform/Intel/build_bios.py | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/build.cfg b/Platform/Intel/build.cfg index 2ff536bb3e..6ab2ced1a5 100644 --- a/Platform/Intel/build.cfg +++ b/Platform/Intel/build.cfg @@ -1,7 +1,7 @@ # @ build.cfg # This is the main/default build configuration file # -# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.
# Copyright (c) 2021 - 2022, American Megatrends International LLC.
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -13,7 +13,8 @@ WORKSPACE_FSP_BIN = FSP EDK_TOOLS_BIN = edk2-BaseTools-win32 EDK_BASETOOLS = BaseTools WORKSPACE_DRIVERS = edk2-platforms/Drivers -WORKSPACE_FEATURES = edk2-platforms/Features/Intel +WORKSPACE_FEATURES = edk2-platforms/Features +WORKSPACE_FEATURES_INTEL = edk2-platforms/Features/Intel WORKSPACE_PLATFORM = edk2-platforms/Platform/Intel WORKSPACE_SILICON = edk2-platforms/Silicon/Intel WORKSPACE_PLATFORM_BIN = diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 43a241c837..c79a653f4d 100755 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3 # # @ build_bios.py # Builds BIOS using configuration files and dynamically @@ -109,6 +109,8 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["WORKSPACE_SILICON"]) config["WORKSPACE_FEATURES"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_FEATURES"]) + config["WORKSPACE_FEATURES_INTEL"] = os.path.join(config["WORKSPACE"], + config["WORKSPACE_FEATURES_INTEL"]) config["WORKSPACE_DRIVERS"] = os.path.join(config["WORKSPACE"], config["WORKSPACE_DRIVERS"]) config["WORKSPACE_PLATFORM_BIN"] = \ @@ -123,9 +125,10 @@ 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) + config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES_INTEL"] + # add all feature domains in WORKSPACE_FEATURES_INTEL to package path + for filename in os.listdir(config["WORKSPACE_FEATURES_INTEL"]): + filepath = os.path.join(config["WORKSPACE_FEATURES_INTEL"], filename) # feature domains folder does not contain dec file if os.path.isdir(filepath) and \ not glob.glob(os.path.join(filepath, "*.dec")): -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111771): https://edk2.groups.io/g/devel/message/111771 Mute This Topic: https://groups.io/mt/102842749/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-