From: "Fan, ZhijuX" <zhijux.fan@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Gao, Liming" <liming.gao@intel.com>,
"Feng, Bob C" <bob.c.feng@intel.com>
Subject: [PATCH] BaseTools:Delete FrameworkDatabase.template from BaseTools/Conf
Date: Tue, 30 Apr 2019 01:57:04 +0000 [thread overview]
Message-ID: <FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5@SHSMSX101.ccr.corp.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 4516 bytes --]
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1627
The FrameworkDatabase.template was already obsolete,
So, FrameworkDatabase.template can be removed.
This patch is going to fix this issue.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
ArmPlatformPkg/Scripts/Makefile | 1 -
BaseTools/Conf/FrameworkDatabase.template | 23 -----------------------
Conf/ReadMe.txt | 1 -
Vlv2TbltDevicePkg/bldX64.bat | 1 -
Vlv2TbltDevicePkg/bld_vlv.bat | 1 -
5 files changed, 27 deletions(-)
delete mode 100644 BaseTools/Conf/FrameworkDatabase.template
diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
index 09f1c90923..76f25e35e8 100644
--- a/ArmPlatformPkg/Scripts/Makefile
+++ b/ArmPlatformPkg/Scripts/Makefile
@@ -65,7 +65,6 @@ endif
$(EDK2_CONF):
ifeq ("$(OS)","Windows_NT")
copy $(EDK_TOOLS_PATH)\Conf\build_rule.template Conf\build_rule.txt
- copy $(EDK_TOOLS_PATH)\Conf\FrameworkDatabase.template Conf\FrameworkDatabase.txt
copy $(EDK_TOOLS_PATH)\Conf\target.template Conf\target.txt
copy $(EDK_TOOLS_PATH)\Conf\tools_def.template Conf\tools_def.txt
else
diff --git a/BaseTools/Conf/FrameworkDatabase.template b/BaseTools/Conf/FrameworkDatabase.template
deleted file mode 100644
index 89b0976d0a..0000000000
--- a/BaseTools/Conf/FrameworkDatabase.template
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FrameworkDatabase xmlns="http://www.TianoCore.org/2006/Edk2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <FdbHeader>
- <DatabaseName>FrameworkDatabase</DatabaseName>
- <GuidValue>DD6913E0-3E4E-4B83-8838-57EE7FB71DD1</GuidValue>
- <Version>0.3</Version>
- <Abstract>The Framework Module Development Packaging System Database</Abstract>
- <Description>
- This Database tracks all packages and archives installed in this workspace.
- </Description>
- <Copyright>Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.</Copyright>
- <License>
- SPDX-License-Identifier: BSD-2-Clause-Patent
- </License>
- <Specification>FRAMEWORK_PACKAGING_SPECIFICATION 0x00090000</Specification>
- </FdbHeader>
- <PackageList>
- <Filename>MdePkg/MdePkg.dec</Filename>
- <Filename>MdeModulePkg/MdeModulePkg.dec</Filename>
- <Filename>IntelFrameworkPkg/IntelFrameworkPkg.dec</Filename>
- <Filename>IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec</Filename>
- </PackageList>
-</FrameworkDatabase>
diff --git a/Conf/ReadMe.txt b/Conf/ReadMe.txt
index 338ab81443..d4c16f5a7f 100644
--- a/Conf/ReadMe.txt
+++ b/Conf/ReadMe.txt
@@ -1,5 +1,4 @@
This directory will be used to contain the new EDK II files:
- FrameworkDatabase.db - Second generation XML workspace info
target.txt - Restricts a build to defined values
tools_def.txt - Information about 3rd party tools
diff --git a/Vlv2TbltDevicePkg/bldX64.bat b/Vlv2TbltDevicePkg/bldX64.bat
index 50dc5b1f07..14001ae71b 100644
--- a/Vlv2TbltDevicePkg/bldX64.bat
+++ b/Vlv2TbltDevicePkg/bldX64.bat
@@ -12,7 +12,6 @@
@if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
@if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
@if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
-@if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db
@if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
@if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
@if exist conf\.cache rmdir /q /s conf\.cache
diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index c5314833c0..746b0f4696 100644
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -32,7 +32,6 @@ if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log
if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt
if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt
if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.txt
-if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\FrameworkDatabase.db
if exist conf\.cache rmdir /q/s conf\.cache
:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
--
2.14.1.windows.1
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 5120 bytes --]
reply other threads:[~2019-04-30 1:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox