From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4DE4421951C86 for ; Tue, 25 Apr 2017 13:31:21 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2017 13:31:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,251,1488873600"; d="scan'208";a="93743012" Received: from mdkinney-mobl.amr.corp.intel.com ([10.241.98.55]) by fmsmga005.fm.intel.com with ESMTP; 25 Apr 2017 13:31:08 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu , Kevin W Shaw Date: Tue, 25 Apr 2017 13:31:05 -0700 Message-Id: <1493152265-12132-2-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1493152265-12132-1-git-send-email-michael.d.kinney@intel.com> References: <1493152265-12132-1-git-send-email-michael.d.kinney@intel.com> Subject: [edk2-FdfSpecification PATCH] Allow nested !include statements X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2017 20:31:21 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=353 Cc: Liming Gao Cc: Yonghong Zhu Cc: Kevin W Shaw Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Kinney --- 2_fdf_design_discussion/22_flash_description_file_format.md | 2 -- 3_edk_ii_fdf_file_format/32_fdf_definition.md | 2 -- README.md | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/2_fdf_design_discussion/22_flash_description_file_format.md b/2_fdf_design_discussion/22_flash_description_file_format.md index 3eade61..368ce32 100644 --- a/2_fdf_design_discussion/22_flash_description_file_format.md +++ b/2_fdf_design_discussion/22_flash_description_file_format.md @@ -227,8 +227,6 @@ to processing the file for macros. The system environment variables, be used; only these system environment variables are permitted to start the path of the included file. -Files specified by `!include` statements may not contain `!include` statements. - Statements in !include files must not break the integrity of the FDF file, the included file is read in by tools in the exact position of the file, and is functionally equivalent of copying the contents of the included file and diff --git a/3_edk_ii_fdf_file_format/32_fdf_definition.md b/3_edk_ii_fdf_file_format/32_fdf_definition.md index b8dffa8..67976b5 100644 --- a/3_edk_ii_fdf_file_format/32_fdf_definition.md +++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md @@ -651,8 +651,6 @@ If none of these methods find the file, and a directory separator is in listed in the PACKAGES_PATH) relative path. If the file cannot be found, the build system must exit with an appropriate error message. -The `!include` file cannot contain additional `!include` statements. - #### Prototype ` ::= "!include" ` diff --git a/README.md b/README.md index 15eca26..131246d 100644 --- a/README.md +++ b/README.md @@ -205,3 +205,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved. | | Changed section 3.8 [FmpPayload] to add definitions for MONOTONIC_COUNT and CERTIFICATE_GUID, plus some notes about how these are used. | | | | [#142](https://bugzilla.tianocore.org/show_bug.cgi?id=142) Update EDK II FDF Specification to allow sections in any order | | | | [#478](https://bugzilla.tianocore.org/show_bug.cgi?id=478) FDF spec: extend the to support and | | +| | [#353](https://bugzilla.tianocore.org/show_bug.cgi?id=353) Build spec: Allow nested includes in DSC and FDF files | | -- 2.6.3.windows.1