* [edk2-FdfSpecification PATCH] Allow nested !include statements
@ 2017-04-25 20:31 Michael Kinney
2017-04-25 20:31 ` Michael Kinney
2017-04-26 2:12 ` Zhu, Yonghong
0 siblings, 2 replies; 3+ messages in thread
From: Michael Kinney @ 2017-04-25 20:31 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Yonghong Zhu, Kevin W Shaw
https://bugzilla.tianocore.org/show_bug.cgi?id=353
GitHub branch for review:
* https://github.com/mdkinney/edk2-FdfSpecification/tree/Bugzilla_353_AllowNestedIncludes
GitHub word diff view of the patches in this series:
* [1/1] https://github.com/mdkinney/edk2-FdfSpecification/commit/8617c1500dd5377e47bc1b60dcba3515c2eab537?w=1
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Michael Kinney (1):
Allow nested !include statements
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(-)
--
2.6.3.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [edk2-FdfSpecification PATCH] Allow nested !include statements
2017-04-25 20:31 [edk2-FdfSpecification PATCH] Allow nested !include statements Michael Kinney
@ 2017-04-25 20:31 ` Michael Kinney
2017-04-26 2:12 ` Zhu, Yonghong
1 sibling, 0 replies; 3+ messages in thread
From: Michael Kinney @ 2017-04-25 20:31 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Yonghong Zhu, Kevin W Shaw
https://bugzilla.tianocore.org/show_bug.cgi?id=353
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
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
`<IncludeStatement> ::= <TS> "!include" <MTS> <Filename> <EOL>`
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 <FmpFileData> to support <FvStatements> and <FdStatenents> | |
+| | [#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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-FdfSpecification PATCH] Allow nested !include statements
2017-04-25 20:31 [edk2-FdfSpecification PATCH] Allow nested !include statements Michael Kinney
2017-04-25 20:31 ` Michael Kinney
@ 2017-04-26 2:12 ` Zhu, Yonghong
1 sibling, 0 replies; 3+ messages in thread
From: Zhu, Yonghong @ 2017-04-26 2:12 UTC (permalink / raw)
To: Kinney, Michael D, edk2-devel@lists.01.org
Cc: Gao, Liming, Shaw, Kevin W, Zhu, Yonghong
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Kinney, Michael D
Sent: Wednesday, April 26, 2017 4:31 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Shaw, Kevin W <kevin.w.shaw@intel.com>
Subject: [edk2-FdfSpecification PATCH] Allow nested !include statements
https://bugzilla.tianocore.org/show_bug.cgi?id=353
GitHub branch for review:
* https://github.com/mdkinney/edk2-FdfSpecification/tree/Bugzilla_353_AllowNestedIncludes
GitHub word diff view of the patches in this series:
* [1/1] https://github.com/mdkinney/edk2-FdfSpecification/commit/8617c1500dd5377e47bc1b60dcba3515c2eab537?w=1
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Michael Kinney (1):
Allow nested !include statements
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(-)
--
2.6.3.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-26 2:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-25 20:31 [edk2-FdfSpecification PATCH] Allow nested !include statements Michael Kinney
2017-04-25 20:31 ` Michael Kinney
2017-04-26 2:12 ` Zhu, Yonghong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox