From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.16185.1595327912025393133 for ; Tue, 21 Jul 2020 03:38:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=m6GAH0/9; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: guomin.jiang@intel.com) IronPort-SDR: KVw0ouV9+bGkEpzzpbbMcRs5zsuPzT6pImzS6OEubWUvYLFioSh64wF6wpcupRPRMw0Cs9lviC WRSIsJdJejtA== X-IronPort-AV: E=McAfee;i="6000,8403,9688"; a="151444560" X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="151444560" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 03:38:31 -0700 IronPort-SDR: vY3iTUijBgbjBKDXCw/6tz1CZZFECO29ouXeM82VuwxKH7PG8Hntb4GjomqLatX3PTXTvoEnTj 0GYYWrXW4WAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="392311576" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga001.fm.intel.com with ESMTP; 21 Jul 2020 03:38:30 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX601.amr.corp.intel.com (10.22.229.14) 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 03:38:30 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx609.amr.corp.intel.com (10.22.229.22) 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 03:38:30 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.109) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 03:38:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bwj1H5wBTpPnVD8dcBgRnbebAzczYWMcFm7c8JbBaLbxyxT+uGMih48Kujh36heXuz0vpb7o8u2RbWKagHEO8yeLkFTl4Yx2m/mIeSLv3VjETs7ksLWrDuYUVMnzJe9cELTbDopbonh2bLfrj2uU0y8Jym4+90EsG3ac0UwRAfLdVVJTFYAGRtU3A7cAPXA8mDue5xmfL8B2aikpStmwB30j1aVZp/7aoube5ZshGAUfq0RyJaKesIQ05/UyFaLFuBHIh3A997HTCAWRf1GzNsY1xc2UsxT/BpI8/eMDvK8Cc9/OmmBDGI2x7hj4L3ne3cdIfuaDm7/p57XpYP/34Q== 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=jHmrambMaqftbdsT7WalqPLqOP/Fx/RRT/DbaIbnlAU=; b=mg86dyfxn8h2HaOUPM2HcxNdE899d3NWajCraEsijdBG/hIqeWXtGewhf13QXf/FWuCLzQbtBH3gsPsBIwnv8hg3fQEEsCYdbUkY6LlR4sItAmbGaLTqwcxb69TMnv+mNN61oD2EWOheIhPut5G4psZjwzoYxJ0F7jzvgGRDH6Ykrge1tFqffrbSNqIu3LJmFcBKeiDCLSkCilcGb2wbGqMlZEAPd2sag+wApMDJq1te4fis91mUX7SV23MXk7maAHNeba7vQCbY465OYFsPE/c6YWqeAnXVPlxhq+/NZ+NLoIgcLZVXad9nB8wvgirySU6rqsOvVL+9VeH70UZplQ== 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=jHmrambMaqftbdsT7WalqPLqOP/Fx/RRT/DbaIbnlAU=; b=m6GAH0/9VOGBGadSR8m//FJP6KcbTJ7qvbjUYjW41btx5hK4upRgHZ0ohM1SmxFuW5B0bywdZ3k5t87tA9/j5VXr4bar5wo+EDNmcpr7h5GrlRpHKlHPuyI2wFiXtwWbktbPshP+idgFK4ijsYmJ0WxnLdWdnau3NynvsLRy8dk= Received: from DM6PR11MB2955.namprd11.prod.outlook.com (2603:10b6:5:65::31) by DM6PR11MB4578.namprd11.prod.outlook.com (2603:10b6:5:2a7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.23; Tue, 21 Jul 2020 10:38:29 +0000 Received: from DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::e916:c766:fc41:b51d]) by DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::e916:c766:fc41:b51d%5]) with mapi id 15.20.3174.027; Tue, 21 Jul 2020 10:38:29 +0000 From: "Guomin Jiang" To: "Gao, Liming" , "devel@edk2.groups.io" CC: "Feng, Bob C" 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: AQHWXwrkYnJRMUcK906BeNpl3KGPPqkRiSKggABNcVA= Date: Tue, 21 Jul 2020 10:38:29 +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: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action 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.198.147.203] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e6efc89a-15db-46b6-de5b-08d82d623537 x-ms-traffictypediagnostic: DM6PR11MB4578: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: M/Vgmh4ssyW6tIaRveXcekifnNtV5lDteZnwH25b1xzC7z4BdDFHzyxgZbasJtSiS+ssRm5cvXxdC2KcJM+OSmFCubbNTnR7/W4LrBIEqDQtP52BKLDqp8py4cnopXeRM3Smjz7hPAQeWlihZy0L03GWWYjHXUdaMEms35jX2xPnWskWuLpFdVA7tRE7kjOP4Gg5P6SFyNaTgvi/36jA57M8lEFvOP4TD6JoaquzMJ7XPAXn0VqzZFGTxMMEq/IMc8PLEyUblaTwu5nTbzsb6IrshmdIV1hot6a0s13MfE8lOlCTFDZtwo+VDIFe9K1/obN/CN/XEEX0EZ351sG+Ng== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2955.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(366004)(26005)(5660300002)(8676002)(52536014)(316002)(8936002)(66446008)(66556008)(66946007)(64756008)(478600001)(66476007)(55016002)(9686003)(110136005)(76116006)(4326008)(7696005)(186003)(2906002)(71200400001)(86362001)(107886003)(53546011)(6506007)(33656002)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: tmz1yrJDvO2Q/UVGN1PCMOp/FDfG4caUnIrmdme6evrYG12kqwkxdF0yFcjFNkGLh/Aoh/EBkGROedmjCIl4IG2u4ZfTKbsCY7tkjtuaqSy26DTu7hR7pXJBQ6yP+T7LZhfsS28SdsbDgSH8RQY7QiYZuC3ADYb8xN79o/XkqNDgD+L8I2m0aS4Ss8jCSBUaQGMDGYU5fMTipRw8FgG8hBmvgTtUuN19KqdD+sBPWtZ+QQJFEI6c9tIeB7Hu97Bqy/YeOy9ns6h9ii/0H2BiFxd8VopQlJEt0pVkQSS8WKcUBtqeqB2Ge8YP5Mmavbqq+MOleCsWRXHqmS3jkhu/Mtjbxzdi1lCw95V9A4BQtj6GDD5fzBkzQbek+31oCzF1BlrUFwzcAtvbtJpjubBLpKY9uNSScRJMYAenj6w6rUPj5fPCPrcDFpwTS5wv7ss1JmNJrjwk/tHPHEV+VUH+5pLxyBNloCXXuJ7JfZ84Jcxsweoh+b2XLvdL6dnl4wmo MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2955.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6efc89a-15db-46b6-de5b-08d82d623537 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2020 10:38:29.4664 (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: QgsVKK+lEbwTNX5kGm2NfkHhkXCnpkfjKv1AD6babI5krK3C7Y0Kscsz1jsRvVwcaWIgKffi+8LCA5K7r+EOoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4578 Return-Path: guomin.jiang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable It is used to judge if the current change is for submodule. The attribute of submodule is 160000, just like the file attribute of file = is 10644. Normally, the changed file will begin with 'diff --git' and the next line l= ike ' index 954f66c056e..04300e71f38 100644' which end with the attribute, = and changed submodule is similar. > -----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 when > upgrade submodule. >=20 > Guomin: > + self.lines[self.line_num+1].endswith('160000\n') or >=20 > What means for this line? >=20 >=20 > 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 > > Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrad= e > submodule. >=20 > 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 base= d on > file rule, it make no sense and need ignore the check. >=20 > Signed-off-by: Guomin Jiang > Cc: Bob Feng > Cc: Liming Gao > --- > BaseTools/Scripts/PatchCheck.py | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/BaseTools/Scripts/PatchCheck.py > 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 internall= y by git > # use tabs and LF line endings. Do not enforce no t= abs and > # do not enforce CR/LF line endings. > # > + # When update submodule, it will encode with LF line= 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