From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.5480.1606969204005542081 for ; Wed, 02 Dec 2020 20:20:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=aOu+Eaz+; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) IronPort-SDR: BO2t2KsA1kPYb/rSik+jz1mtxiJ/0Aqlq84NCO3X8DACTHIr6K9DPw/b73feuu1+X56+mBEU01 H5GPK4ZjXiGw== X-IronPort-AV: E=McAfee;i="6000,8403,9823"; a="172350963" X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="172350963" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2020 20:20:02 -0800 IronPort-SDR: 2oAAKdJJ3iMH2yrvC5Ir0/hdqu1z6Ht4bnH2+y35YDVoYXtuOIEvokbPcTlnKHqUQ+fJrdHj+n bYD3rwCaRQCQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="435266292" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga001.fm.intel.com with ESMTP; 02 Dec 2020 20:20:02 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 2 Dec 2020 20:20:02 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 2 Dec 2020 20:20:02 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.170) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 2 Dec 2020 20:20:01 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIHXqv6OkNAwgLsb5vza6e74G+QX3tfqkQXcgYn5gMO68uOS5UUzreTxxICXlSJSCjOVUO8z14Td3tjew6d6xJvBQi4KOAcv+/4VCf4Jb6kAGN0iz8ifZfz7Yaxlx88RsOv4zkNgjTkYS3BuTYFKZoF7ce2Y/3SKtHgjqke8mIz0ERCzelwzcKY+7P0az2rJIQK9K0VX1otWRM/zqy8HhiAvjxfFOjIFy92kfSgGY+n17j3Px6xncLq+fzwiQWiUTTg5daK8HE6nKUAabnkUG4FecRsiT96YwBDD2EbMsqBRy3dpNBjW+6KbcoIIfbYEAne1Z041Z6Pm0XmzTRXioA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jzdtwB6LXEsbQZgmtsZe6WLptN+ipQU1Jj/LlnM8gQg=; b=iFY8lZ9wWleoDhHoZ9kTHcfJkYnW3HDwYykfhiyf0M1f0w2LelL7YfJH/KGNAakWt6MhB8bSb8PdsBLHxm7xqHU7WF+1Ej6K9PZdx/ofkJFCXG9pmiJwU6nYX3lmcFzk1S9qis5V7jEGFe6kB7vfV6zln0wfHQoAmmTmEmBsfVhjRGmYQytR0k/hIvPYECKsvsjIvHB0ot8NCIAX/+VklT6J5erKOc1KngQZhoI+weXK/ND470PXTSEN0jFCMI34enX7h6Y3w1cWtEe480eTHA95PHbC/gTJ/eiOD6m/Y1IHaF+OJxiNQECWS9MDyWOGmYbMCAszBL0MQfQoY7F9Bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jzdtwB6LXEsbQZgmtsZe6WLptN+ipQU1Jj/LlnM8gQg=; b=aOu+Eaz+Bgq4+KnJXKy3eUyYsim09h/djmeWcsAAeIRAvdK91lXF0HlnOYI5OwtJSzpO1NIVz+jJ9ZS94xxqOdOjjiNBUjy52qcwJztfTHSKq1SlV1SBDvKKf8ifx6UrQa9acMdCylS4tCDcfHeYOAK4E5KzXQKt7IwesnOJtwA= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3147.namprd11.prod.outlook.com (2603:10b6:5:64::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Thu, 3 Dec 2020 04:20:00 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3611.032; Thu, 3 Dec 2020 04:20:00 +0000 From: "Bob Feng" To: "Chen, Christine" , "devel@edk2.groups.io" CC: Liming Gao Subject: Re: [PATCH 1/1] BaseTools: Add commits in generated StructurePcd files. Thread-Topic: [PATCH 1/1] BaseTools: Add commits in generated StructurePcd files. Thread-Index: AQHWxuKBmL8qH5Vjo0ed/JPpfNd4iankyUpg Date: Thu, 3 Dec 2020 04:20:00 +0000 Message-ID: References: <20201130063149.216-1-yuwei.chen@intel.com> In-Reply-To: <20201130063149.216-1-yuwei.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e6b7b8ac-6c8c-4034-73ec-08d89742b375 x-ms-traffictypediagnostic: DM6PR11MB3147: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:155; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: J3THjfJauS+vZH2V8ClSGHCShWTLNfbZZl0g6CTM/MnljFLjl0pgAfdjey5vwNp43jMtnb1QVd740P5xFDruh2a6ffyU99i9YXmR0m2/kSQxr1ztaaxubEubMSCJ4llOFRMy2rMXQtSfwYz/g157j/uGan5XWr70roDxrqfrZ48uPFgcxpsjnL7LXXbBQdYUJ/fDKyEhk3V1lpLisn7jw75LlM/WFXe6br0knlcF16Gj9HoBIpTsh1y32dA0na2lhRCZ53VebCGTndCP5vWBP5sG3kyKARY8AMeDsm8qnZc7fNZsHmvXgam4kdj0O1nctLx5wyF4NxKJSfWf9EuMBw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(39860400002)(376002)(136003)(346002)(52536014)(7696005)(110136005)(26005)(9686003)(66446008)(66556008)(5660300002)(64756008)(8936002)(71200400001)(4326008)(86362001)(66476007)(83380400001)(186003)(66946007)(8676002)(316002)(478600001)(55016002)(76116006)(53546011)(6506007)(33656002)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?2dXX2NHDSsFzQUqz3spOck1qQ1iHkl9moIqBZNMgG2sH8NOJnnsRDCZVdjfk?= =?us-ascii?Q?i5Y4VJRs0senQGCyShW7PQOIR3JXaM8Ed0to2x/YhDwhwdesLQXMHPctomFA?= =?us-ascii?Q?dAwQDQKCPw3abpKuLBCDilC/oktnoVcZjfqCf2SAVbr3k0MB3+4AuR0kB8K6?= =?us-ascii?Q?+6BJbb35XhJdKAEOPm5ht5rP3pZLdXSGjGhdk1bXAMGpCgBNKP/0tIkEP0aU?= =?us-ascii?Q?3z3ufxhmBWAhcY+I4N/UpEpBvRFrqKuuKxiDlvolZdSyh/xqkb/6x8am1BYq?= =?us-ascii?Q?bkog6PCrTdgjfzKR8bQo4BPtkFxl+ZibUP2tDhr8sN2lOWD9pZbjtuBU4ldM?= =?us-ascii?Q?xS0uJ3gzTvLlCcpYph44O66hIXoKGeDaysF6tYJRFV3xcRJqG1LRelRevrs7?= =?us-ascii?Q?RqRcgSWjOgORMLHKgttmpnQpUTtFpayNvwTeEOnWleak/26M+5UPYUXnRp6Z?= =?us-ascii?Q?5lFeX9E0bQBbK/s3+erK7UIa3QiI0v8mU6sMq4bCBtI1mXTfQER0nC7/7VRo?= =?us-ascii?Q?BD/yAjv137JH5oxKM4xyQoiCtPqHy6FZwD5qmVRr5Ob71oqnHjyk1Z0bEnuw?= =?us-ascii?Q?7bL1DEAavo937TtD8nPm66uySO53YWUQZLVHtwpV5qYWVP0sXde6rqOVxSYT?= =?us-ascii?Q?nUGpPl41DS+5nHRQ0SPRqs9cGWy/g7oeKJ6ny/xepZMhJKwbZbavX9c2C9Ti?= =?us-ascii?Q?wpg5Tfod6eAKifVRzLpWIoYUULSAs2PIdSVoZqSXkiErU/WES5eDzr6I7P7i?= =?us-ascii?Q?ZcltMxWJ5YJhS3kwfZUuNUVTY/EmI8rfkYsa3A0mry4HpZ2GJH6+R3qPIZxY?= =?us-ascii?Q?wyduX5K7JvlNXYBU7VyXAgT474irBR6ZE3lzRiAcs4APPE9Wddwj6aVISDie?= =?us-ascii?Q?XIC7TZAb9Rt+iP3MNpd8aPzb3YHkE1s8lWHivOgeA63Vph+cIlSSxBYOuMMp?= =?us-ascii?Q?hGHiQLAhgbi58wjUHDl64GueUawcJFMPrW/7+vjhUJw=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6b7b8ac-6c8c-4034-73ec-08d89742b375 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2020 04:20:00.6590 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: gJQQyohG7VgDgCxvrrynMu/LBsueaQ+7g1okMKt1uyZlqOzdCi1P0Jd06tvTa1ix/iAfviY3KU/vyohF/LX1dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3147 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Chen, Christine =20 Sent: Monday, November 30, 2020 2:32 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao Subject: [PATCH 1/1] BaseTools: Add commits in generated StructurePcd files= . Currently the generated StructurePcd.dsc file does not have the commits wro= te in VFR files, which is not convenient for developer to modify. To solve = this problem, The commits will be added after the Pcd values in StructurePc= d.dsc file. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yuwei Chen --- BaseTools/Scripts/ConvertFceToStructurePcd.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scri= pts/ConvertFceToStructurePcd.py index aeda3ff26dfe..45762f579b83 100644 --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py @@ -278,6 +278,7 @@ class Config(object): part =3D [] for x in section[1:]: line=3Dx.split('\n')[0] + commit =3D value_re.findall(line) # the string \\... in "Q...."=20 + line line=3Dvalue_re.sub('',line) #delete \\... in "Q...." line list1=3Dline.split(' ') value=3Dself.value_parser(list1) @@ -289,7 +290,7 @@ class Config(object): if attribute[0] in ['0x3','0x7']: offset =3D int(offset[0], 16) #help =3D help_re.findall(x) - text =3D offset, name[0], guid[0], value, attribute[0] + text =3D offset, name[0], guid[0], value, attribute[0],=20 + commit[0] part.append(text) return(part) =20 @@ -479,10 +480,10 @@ class mainprocess(object): tmp_id=3D[id_key] #['0_0',[(struct,[name...]),(struct,[name...])]] tmp_info=3D{} #{name:struct} for section in config_dict[id_key]: - c_offset,c_name,c_guid,c_value,c_attribute =3D section + c_offset,c_name,c_guid,c_value,c_attribute,c_commit =3D section if c_name in efi_dict: struct =3D efi_dict[c_name] - title=3D'%s%s|L"%s"|%s|0x00||%s\n'%(PCD_NAME,c_name,c_name,self.= guid.guid_parser(c_guid),self.attribute_dict[c_attribute]) + title=3D'%s%s|L"%s"|%s|0x00||%s #%s\n'%(PCD_NAME,c_na= me,c_name,self.guid.guid_parser(c_guid),self.attribute_dict[c_attribute],c_= commit) if struct in all_struct: lstfile =3D stru_lst[struct] struct_dict=3Dall_struct[struct] @@ -498,7 +499,7 @@ class mai= nprocess(object): ERRORMSG.append("ERROR: Struct %s can't found in lst file" %st= ruct) if c_offset in struct_dict: offset_name=3Dstruct_dict[c_offset] - info =3D "%s%s.%s|%s\n"%(PCD_NAME,c_name,offset_name,c_value) + info =3D "%s%s.%s|%s #%s\n"%(PCD_NAME,c_name,offset= _name,c_value,c_commit) inf =3D "%s%s\n"%(PCD_NAME,c_name) inf_list.append(inf) tmp_info[info]=3Dtitle -- 2.27.0.windows.1