From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 239D22117B57A for ; Thu, 25 Oct 2018 23:19:29 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2018 23:19:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,426,1534834800"; d="scan'208";a="274594283" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga005.fm.intel.com with ESMTP; 25 Oct 2018 23:19:29 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Oct 2018 23:19:29 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Oct 2018 23:19:28 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.117]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.199]) with mapi id 14.03.0415.000; Fri, 26 Oct 2018 14:19:26 +0800 From: "Gao, Liming" To: "Feng, YunhuaX" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880 Thread-Index: AdRs8j5B+eWAExIxTDiJsZXGDLX9gwAAW7vg Date: Fri, 26 Oct 2018 06:19:25 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E35F128@SHSMSX104.ccr.corp.intel.com> References: <47C64442C08CCD4089DC43B6B5E46BC49077EC@shsmsx102.ccr.corp.intel.com> In-Reply-To: <47C64442C08CCD4089DC43B6B5E46BC49077EC@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmMxNTRhMWEtYWY4ZC00MTdlLTk5OWMtZjcxOWEzZTNlNWI1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiY3RMdnBkTlBCVXE1UlRHNXdxVlRGMTF3Y1FqeGlsaE9jUXpScytLMFkxbVpucWtGVTZ5cXpKZTFVa3JOMUtLVCJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2018 06:19:30 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao Because some platform has been broken, I will push this patch soon.=20 > -----Original Message----- > From: Feng, YunhuaX > Sent: Friday, October 26, 2018 2:08 PM > To: edk2-devel@lists.01.org > Cc: Zhu, Yonghong ; Gao, Liming > Subject: [PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90= 880 >=20 > Roll back code modify by commit 9e47e6f90880, > if ForceRebase not False or True, the GenFv command not need add paramete= r >=20 > Cc: Liming Gao > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/Bas= eTools/Source/Python/GenFds/GenFdsGlobalVariable.py > index e867693d7c..ea61f723a7 100644 > --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > @@ -572,13 +572,13 @@ class GenFdsGlobalVariable: >=20 > Cmd =3D ["GenFv"] > if BaseAddress: > Cmd +=3D ("-r", BaseAddress) >=20 > - if not ForceRebase: > + if ForceRebase =3D=3D False: > Cmd +=3D ("-F", "FALSE") > - else: > + elif ForceRebase =3D=3D True: > Cmd +=3D ("-F", "TRUE") >=20 > if Capsule: > Cmd.append("-c") > if Dump: > -- > 2.12.2.windows.2