From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: zhijux.fan@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 29 Apr 2019 18:57:09 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:57:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,412,1549958400"; d="dat'59?scan'59,208,59";a="341964351" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga005.fm.intel.com with ESMTP; 29 Apr 2019 18:57:08 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Apr 2019 18:57:08 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Apr 2019 18:57:08 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.18]) with mapi id 14.03.0415.000; Tue, 30 Apr 2019 09:57:05 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Delete FrameworkDatabase.template from BaseTools/Conf Thread-Topic: [PATCH] BaseTools:Delete FrameworkDatabase.template from BaseTools/Conf Thread-Index: AdT++AERRCFRn0DsQpK+TYRmrKsw1Q== Date: Tue, 30 Apr 2019 01:57:04 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 39811 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1627 The FrameworkDatabase.template was already obsolete, So, FrameworkDatabase.template can be removed. This patch is going to fix this issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- 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/Makef= ile 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\FrameworkData= base.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/Fra= meworkDatabase.template deleted file mode 100644 index 89b0976d0a..0000000000 --- a/BaseTools/Conf/FrameworkDatabase.template +++ /dev/null @@ -1,23 +0,0 @@ - - - - FrameworkDatabase - DD6913E0-3E4E-4B83-8838-57EE7FB71DD1 - 0.3 - The Framework Module Development Packaging System Database - - This Database tracks all packages and archives installed in this wor= kspace. - - Copyright (c) 2007 - 2009, Intel Corporation. All rights re= served. - - SPDX-License-Identifier: BSD-2-Clause-Patent - - FRAMEWORK_PACKAGING_SPECIFICATION 0x00090000 - - - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - - 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 =20 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\Frame= workDatabase.db @if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt @if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.tx= t @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.t= xt -if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\Framew= orkDatabase.db if exist conf\.cache rmdir /q/s conf\.cache =20 :: Setup EDK environment. Edksetup puts new copies of target.txt, tools_de= f.txt, build_rule.txt in WorkSpace\Conf --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IshvAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADJCQ0VCNDQw MkJDRjdGNDJBQjBFOUIwN0JEMTdGMDVFAG4HAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBAAeAAEA OQAEAAIATAEBIIADAA4AAADjBwQAHgABADkABAACAEwBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEgAAABbUEFUQ0hdIEJhc2VUb29sczpEZWxldGUgRnJhbWV3b3JrRGF0 YWJhc2UudGVtcGxhdGUgZnJvbSBCYXNlVG9vbHMvQ29uZgADGgELgAEAIQAAADJCQ0VCNDQwMkJD RjdGNDJBQjBFOUIwN0JEMTdGMDVFAG4HAQOQBgDAEgAAMwAAAAIBfwABAAAASAAAADxGQUQwRDdF MEFFMEZBNTREOTg3RjZFNzI0MzVDQUZENTBBRjU2MEU1QFNIU01TWDEwMS5jY3IuY29ycC5pbnRl bC5jb20+AAsAHw4BAAAAAgEJEAEAAADwCAAA7AgAAB8VAABMWkZ1G04tiWEACmZiaWQEAABjY8Bw ZzEyNTIA/gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwli MTkOwL8JwxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhBy AMB0fQhQbhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsG cwGQACAgQk1fQuBFR0lOfQr8AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEF sGcvc2hvd19BIlEuY2dpPw3QPUAxNjI3XGwLgGXTCoElFFRoGeBGGHAHgLJ3BbBrRBiAAaBhEgCZ ItBlbQtRECAgdycABiAHQAlwYWR5IG8uYhkgHnAQICwlBVNv3iwmHycpHlADoGIZ4AlwswRgGjBk LiUOBAAgCrBKdBHAIC1xZ28LgGflHMBvHHBpeBzALWIEAeMKUCxtQ2M6H7AokCnAKwnwLnA8BuBi JEAuZm0xIUALgBAgbCRAA3A+TTApTAdwLlJHYS6gPHMlEDOSLmcz8DIfFMBpEmcYUGQtGTBmLWIK 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 WgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBUAFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+k vqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBq AHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUA eAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBo AGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEA bgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBu AHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAAAFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAA AACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6 AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgA aQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBu ACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4A dABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAAUwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAA AIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoA aABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABp AGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIA AABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAACwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAA ACvOtEArz39Cqw6bB70X8F4DABcAAQAAAEAAOQAA2AcC+P7UAUAACDDmQlYC+P7UAR8AAICGAwIA AAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAAdABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAM AAAAZQBuAC0AVQBTAAAAHwA3AAEAAACQAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8A bABzADoARABlAGwAZQB0AGUAIABGAHIAYQBtAGUAdwBvAHIAawBEAGEAdABhAGIAYQBzAGUALgB0 AGUAbQBwAGwAYQB0AGUAIABmAHIAbwBtACAAQgBhAHMAZQBUAG8AbwBsAHMALwBDAG8AbgBmAAAA HwA9AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdT++AERRCFRn0DsQpK+TYRmrKsw 1QAAHwBwAAEAAACQAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoARABlAGwA ZQB0AGUAIABGAHIAYQBtAGUAdwBvAHIAawBEAGEAdABhAGIAYQBzAGUALgB0AGUAbQBwAGwAYQB0 AGUAIABmAHIAbwBtACAAQgBhAHMAZQBUAG8AbwBsAHMALwBDAG8AbgBmAAAAHwA1EAEAAACQAAAA PABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMANQBD AEEARgBEADUAMABBAEYANQA2ADAARQA1AEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAuAGMA bwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwUXJSAvj+1AECAQsAAQAA ABAAAAArzrRAK89/QqsOmwe9F/BeAwAmAAAAAAACAUcAAQAAADIAAABjPVVTO2E9TUNJO3A9SW50 ZWw7bD1TSFNNU1gxMDEtMTkwNDMwMDE1NzA0Wi0xNDQyAAAAAgEQMAEAAABGAAAAAAAAACZ3vTk7 7DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQAAAlU j1kAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACACCAG AAAAAADAAAAAAAAARgAAAAC/hQAAQMEWAfj+1AELAACACCAGAAAAAADAAAAAAAAARgAAAACChQAA AAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAAB AAAAGgAAAGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEA AAAYAAAAZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABYAAAAxADEALgAwAC4ANgAwADAALgA3 AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBjAHQAaQBvAG4A AAAAAAEAAAAUAAAAbgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAA AABGAQAAACAAAAB4AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8A AICGAwIAAAAAAMAAAAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBw AAAAAAABAAAAIAAAAFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAkv0= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF560E5SHSMSX101ccrcor_--