From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.10663.1595384894191995554 for ; Tue, 21 Jul 2020 19:28:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=xxAVfZJm; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: bob.c.feng@intel.com) IronPort-SDR: a9PDPEBJSPDyxQ7AZZ3YCTnBJsCmJ1opaZhDPcW2JR5EWKQJ5D67tJh9uJkaeKbMlyV9mY0UcI J4vs9OSiJR6g== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="130343111" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="130343111" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 19:28:13 -0700 IronPort-SDR: VUGAJamHP1tWEJ2PPcuDmEYrOeyBm9fZ52h6ktc/x0o+fHonlSee8Yiic1tjWc5ztN53kLnahG HPCJyMJQ07zA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="310459744" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by fmsmga004.fm.intel.com with ESMTP; 21 Jul 2020 19:28:13 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 21 Jul 2020 19:28:12 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 21 Jul 2020 19:28:11 -0700 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.50) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:28:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UaqHzhnLK1EkBPSQ3636mies0ebuM7UQjUIS99yDBXb2ENWHI5z+kQ3TRLZeq6i9+09sff6lMnSQ620wiAFYC0EZOOt5TTjJjKIsxG+Kbvz8/WAIxL8rAjyyVoc644Ggl5bLoJKN1AV14vIZsUUizSnBxUEChs6fHuaXGniK8BREdRw+2rfF5SMGCFiVF2jKNAVmy0z645W83JK0xl9AFNOrdYlj29WSvccIbTgBFFwFhpjcD1E1nwqX2XALNjSNcNbgZjRTquEt5pnUznZdQU3VzELWX2SAQZm5GxOMU/mai+Ol80wJR0L7jnI4nx676aynW3QjM9R8iNyLJQ1YLg== 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=ow7A0CgmN52h1XGvXO3lwA/MY27Dq0rj/nLucNB0FSI=; b=XELZ25rM63f38wJ3ZHP9R74zKGzn28avDJI2frqCtXgmtlFUuABVUyQ/G3hGLhNBkIoVbbflrBDegGnSsgmmg3Tg8dkeYP47SzeyZio5RUZF+eXlupmE/JLLqrZB4V4N+79k7E8YcFb80jVMhG//Jp6RXCvuxyrzP2TXweXfnDD3CQXTAiN4JtHLITg9EbB4vf5G4JD4+Ukq4eC8vTH85E1vXXWkHhiSyozJ2j5KiIMFaHhcujjJex8NbEsGdnTuCBT1OpwxKYUoyf97iZLihdtlrUYydotJvrKTX4rloXO7GhWwWBoVSDYTyBOGbO8OkFcOocppPuJsH22SVTpRTw== 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=ow7A0CgmN52h1XGvXO3lwA/MY27Dq0rj/nLucNB0FSI=; b=xxAVfZJmzEg6AosQBHWtcW4vYBaBcYiJwJ+mHynqGi9VfMdHDbxpzlp4KWDiQxV2kcNnC+/Zn1SKPpNPUh6hSK6hjwB+z9unogInJLS+8DNLxaV+8+sIxg+M9+xgNr4p8VGQ5p26qY8UBTOA6NP4eE0aibKEPKlmi9N7TQ7qqD8= Received: from BN6PR11MB0068.namprd11.prod.outlook.com (2603:10b6:405:69::17) by BN6PR11MB1474.namprd11.prod.outlook.com (2603:10b6:405:c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.20; Wed, 22 Jul 2020 02:28:07 +0000 Received: from BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::f4b6:406b:26fc:c069]) by BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::f4b6:406b:26fc:c069%3]) with mapi id 15.20.3195.026; Wed, 22 Jul 2020 02:28:07 +0000 From: "Bob Feng" To: "Jiang, Guomin" , "Gao, Liming" , "devel@edk2.groups.io" Subject: Re: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Topic: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Index: AQHWXwrk8vWOY933A0qkonvtL0kQLqkRiVCAgABOv4CAAQHKkIAABZUAgAAA3rA= Date: Wed, 22 Jul 2020 02:28:07 +0000 Message-ID: References: <20200721025846.2249-1-guomin.jiang@intel.com> In-Reply-To: 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.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1bf59d5e-c54e-43be-2484-08d82de6dee4 x-ms-traffictypediagnostic: BN6PR11MB1474: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:590; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: f2P8hcBAzzZSpifmavLDgnCij6gLQ45rjsFQ5WKqB5pmvZy0L79+ZlR8OMrh1RdLp7I836ImA60eg98bKzT1TtV3pPsMnCR0yLJxBwfp4NvXhSwqgJyNVgFk326RujDCXMGukRZY26somF4ear/QVvZr//jMELDEP0muo4Ta/AHtO9HggpbUyDHm1ydQqBCGycLaRhSjI5wVEKqKm3e2nvbNGVmtNskeNcbeIxTZ1WShD0KCC8nlZcxmVMgbfmlvuS5bxGFbl7Z55835kG56XsR2e223yawJPXtz5PZOKwTNUDSuoU+zysEo7DgWHfrhOoNSnfEycJzrZr3ZoE0qhg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB0068.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(346002)(376002)(366004)(396003)(136003)(8936002)(76116006)(71200400001)(66476007)(66556008)(64756008)(66446008)(8676002)(2906002)(66946007)(83380400001)(7696005)(316002)(5660300002)(33656002)(53546011)(6506007)(110136005)(9686003)(55016002)(478600001)(86362001)(26005)(186003)(52536014);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: j5E+JoEyahVteER3O7HBTRJ+FHbEnHUesiScedEs0/k9LB6qip/T+bZ+vaDRrY/w+QsJ5+4MqEXpLNTiu8T6WsCU7wojYl5pqjLAIeDi1h74KClQcAtCeEMuNsik/e+mcG/yPUUmkHp0qD6dyqS90A5EvKRkOVGQe962nAMi2EFjJ7sdKlM6RjH915PE9MI2Ty1utnzHK8WsKeS/XQoHl+ctVfbALRxKvDPOWTRYhxuXB3Ci6tLhuF0yghQjyUlgzwQiwvlUnFAAu56HgcEBP58DnNrp7I/uPcKfzaB4QEvFFB27N4MaPDO4qc6F/p4t1D3JTyPhQ6uckfcNDeLZvLpIMNQqjjhSyfniq4KOLQ8ybsYH8xb7tkD5Uj9LbVz0GXtBzR4I0pvqiJSMgEmuGW7hB7z5cuc4j6DlMqlZg7wBB1t1h7V5ewQ3U3M8ySiEWjVEuR5ui+aF+l8ewEkLr5mBoPtYojlI5NAPHLHfFYPHnOoqCeGuytkmzcrA+9P/ MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0068.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bf59d5e-c54e-43be-2484-08d82de6dee4 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 02:28:07.7377 (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: AAa6ihvcsrvk5BRKeSQ5ny78EMPS/F27Z5oL3K7YH1dlFL0sI4qUCezktuMkX/CzhQGJfsWUL3pw+ybPlmKe2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1474 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Here is a case. diff --git a/BaseTools/BinWrappers/PosixLike/AmlToHex b/BaseTools/BinWrappe= rs/PosixLike/AmlToC similarity index 97% rename from BaseTools/BinWrappers/PosixLike/AmlToHex rename to BaseTools/BinWrappers/PosixLike/AmlToC index 9fb68299e4c67d1f332cd883fd348a896f1bdc50..1dd28e966288f6ea4fc52d42e2d= c7b1f74226c23 100755 self.line_num+1 looks a hard code based on an assumption.=20 Thanks, Bob -----Original Message----- From: Jiang, Guomin =20 Sent: Wednesday, July 22, 2020 10:21 AM To: Feng, Bob C ; Gao, Liming ;= devel@edk2.groups.io Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgr= ade submodule. Hi Bob, Can you provide a sample that the file attribute is not the next line. Even if the case you mentioned is present, I seem that have not affect on t= he current behavior, isn't it? Thanks. Guomin > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, July 22, 2020 10:08 AM > To: Jiang, Guomin ; Gao, Liming=20 > ; devel@edk2.groups.io > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > upgrade submodule. >=20 > Guomin, >=20 > I have two comments. > 1. Please only descript the patch's function in the commit message. > 2. The file attribute is not always the next line of the line starts=20 > with "diff -- git" >=20 > Thanks, > Bob >=20 > -----Original Message----- > From: Jiang, Guomin > Sent: Tuesday, July 21, 2020 6:38 PM > To: Gao, Liming ; devel@edk2.groups.io > Cc: Feng, Bob C > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > upgrade submodule. >=20 > It is used to judge if the current change is for submodule. >=20 > The attribute of submodule is 160000, just like the file attribute of=20 > file is 10644. >=20 > Normally, the changed file will begin with 'diff --git' and the next line= like ' > index 954f66c056e..04300e71f38 100644' which end with the attribute,=20 > and changed submodule is similar. >=20 > > -----Original Message----- > > From: Gao, Liming > > Sent: Tuesday, July 21, 2020 1:57 PM > > To: Jiang, Guomin ; devel@edk2.groups.io > > Cc: Feng, Bob C > > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check=20 > > when upgrade submodule. > > > > Guomin: > > + self.lines[self.line_num+1].endswith('160000\n') = or > > > > What means for this line? > > > > > > Thanks > > Liming > > -----Original Message----- > > From: Jiang, Guomin > > Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B21=1B$BF|=1B(B 10:59 > > To: devel@edk2.groups.io > > Cc: Feng, Bob C ; Gao, Liming=20 > > > > Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > > upgrade submodule. > > > > When i upgrade openssl to 1.1.1g, error occurred when run PatchCheck.py= . > > The reason is that the submodule will end with LF, but it will check=20 > > based on file rule, it make no sense and need ignore the check. > > > > Signed-off-by: Guomin Jiang > > Cc: Bob Feng > > Cc: Liming Gao > > --- > > BaseTools/Scripts/PatchCheck.py | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/BaseTools/Scripts/PatchCheck.py=20 > > b/BaseTools/Scripts/PatchCheck.py index 7db0775d14d1..46b9936c6576 > > 100755 > > --- a/BaseTools/Scripts/PatchCheck.py > > +++ b/BaseTools/Scripts/PatchCheck.py > > @@ -405,12 +405,16 @@ class GitDiffCheck: > > # > > self.force_crlf =3D False > > if self.filename =3D=3D '.gitmodules' or \ > > + self.lines[self.line_num+1].endswith('160000\n') > > + or \ > > self.filename =3D=3D 'BaseTools/Conf/diff.order': > > # > > # .gitmodules and diff orderfiles are used interna= lly by git > > # use tabs and LF line endings. Do not enforce no= tabs and > > # do not enforce CR/LF line endings. > > # > > + # When update submodule, it will encode with LF li= ne and do > > + # not enforce CR/LF line endings. > > + # > > self.force_crlf =3D False > > self.force_notabs =3D False > > elif len(line.rstrip()) !=3D 0: > > -- > > 2.25.1.windows.1