From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.13684.1595402992765692789 for ; Wed, 22 Jul 2020 00:29:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=y3S9ruxC; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: liming.gao@intel.com) IronPort-SDR: jAmzOzRdJUqCfxacEXZvPk9+/jp4MyfMJL2X6mAIkHWkw6rQ6DXoTr2cCzwmYjyRe5SshwzWn7 spjZ3qvhryeQ== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="150263754" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="150263754" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2020 00:29:51 -0700 IronPort-SDR: dqUhENL3LQXCzQ9bz6+iB7VxvVV7q77cTyZs+WKKjt5BqXjGPWaQEf+yuDD8j9QS0kQC7i8kaT tA+vwaapm7yQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="310531762" Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by fmsmga004.fm.intel.com with ESMTP; 22 Jul 2020 00:29:51 -0700 Received: from orsmsx116.amr.corp.intel.com (10.22.240.14) by ORSMSX109.amr.corp.intel.com (10.22.240.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jul 2020 00:29:51 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX116.amr.corp.intel.com (10.22.240.14) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jul 2020 00:29:50 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.171) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jul 2020 00:29:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIobGN7xyOxGVyQOGOAjTE7KiW3UXMkBRGHxHB61/NUnIV7YpHxASeZSPxWsRhTojvhjM6B1Xu1p6Kh71XGjATdjEjdCMeot2bBZkihZRR4O+cRq7QHelR6iAOeBbj2eDPY43Rs0Xr/bwAi9FfEu8/RNby4ZtY6IJpRle5BI6g4JC0IZLYntcfoILzcW460JA2hhhfvue9tpY2PpdASsPH/sms3ggvUS5gyx7wVxRvAEs3Lj06Mhrn95opO3qqGcPZv2vYTSRQHCZ7ylfq5uBCGAB4PyFKT6+GnYFxRa2TvA0bt5Xpsjg2OKFc8c7098+ECsdYiMDFzfSOV2HJVH3Q== 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=2FUq8v9guG+/vY6kXH/gxyQQTaeSqkSYK2hidWJ+C0g=; b=QS6xeeAj0BnDK3b8lahLkU2mcvnR5ZQbP5179j1+z9x21EQhiThj5u0H2szEmX5lXIDHC4zSFcfm2FvOqv3ZBLQ/PQWeojbdalIiuYZXtx+X3dF6pxGGqMWYiYEBA/qNiaNQihJVyC3fulejaBoGjU7g3XAjnRBKlbYZ5EimR+90AFGvV3SoVUSDNqrTv6PHrK7Wesyao3WmHnU3lTseADHkYownB75k/KPnyHbQjZEIx2O8RJQyiEJCcJoIkt/vpaO8Y1VWNxvdeEaY0GhVTkw8S2hI7nYImAK9dLr+e9ePphQGxEgg5OFOD9s4Y7PIUFQJz+tulbU/pApCunnKnA== 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=2FUq8v9guG+/vY6kXH/gxyQQTaeSqkSYK2hidWJ+C0g=; b=y3S9ruxC8CdiRdPv7N/S+49X6mhrpWUmOz8MjIntM+tXPADP6tGPEcUrXcIglnz5keUpJHTYZXM1x92yjV683jFdx7IxCM6hLJatq2mKo7ufscNsMyEmkh/OJLayKP25yfiSILav/c9mtZpqhbyp5iKrjr5fFYdvw+6Kl4mHLYU= Received: from MWHPR11MB1630.namprd11.prod.outlook.com (2603:10b6:301:e::7) by MWHPR11MB1582.namprd11.prod.outlook.com (2603:10b6:301:c::15) 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 07:29:49 +0000 Received: from MWHPR11MB1630.namprd11.prod.outlook.com ([fe80::7847:b564:1b55:b67e]) by MWHPR11MB1630.namprd11.prod.outlook.com ([fe80::7847:b564:1b55:b67e%6]) with mapi id 15.20.3216.020; Wed, 22 Jul 2020 07:29:49 +0000 From: "Liming Gao" To: "Feng, Bob C" , "Jiang, Guomin" , "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: AQHWXwrkYnJRMUcK906BeNpl3KGPPqkRiSKggABNcVCAAQVCgIAAAZTwgAAD+YCAAFQPIA== Date: Wed, 22 Jul 2020 07:29:48 +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.217] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2d772b0b-cd09-4da0-da1c-08d82e110427 x-ms-traffictypediagnostic: MWHPR11MB1582: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1079; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 16w7oiIW0a6FMZIBCPIdOq3dfIzgit2A28PDjbqnQD+mejgQuYPfNm+GS2VatmMhS55HcpKRNuN1Kv3ETv9//3wzdHxLVrO59cd3ItzkH2Sez+dqKoU3+jtmPaBwOXFaIPC4f/EJ6/etQeMyvqWia8D+SQd8AEC1uzAk2lXYNXleWjNPA0iRlNIEodpTBzU6AT8HmFIDeUo+OzBNpt8MPmOvNDesVTNZ9reOwfaiR/XNPtzhaG2nK/pG/vVdlxDRQIH7gebgRrg9mi+5Va6nLawldHD0OcyjiZourR4TRHm7pC5R0TFzSbHHbANJrzyrE7jV89Hf2VIwmnEGEyAP6w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1630.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(396003)(136003)(346002)(39860400002)(366004)(71200400001)(83380400001)(26005)(55016002)(478600001)(5660300002)(186003)(6506007)(53546011)(86362001)(8936002)(7696005)(33656002)(2906002)(316002)(9686003)(8676002)(52536014)(66946007)(66446008)(66556008)(64756008)(66476007)(76116006)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 2tPrZOYCwBugzVNggUbCLnnX1XlqlXPTPGq5cxiO7l6zK8ehzaQo6qlKV4YBaJckt/a3lDVDH2Yzf763LOGErx4CF85IyAIOPH39ViesfKGm2qViVh3/HYH0sAj1/XLxKE5++2bda5Wp03QHKfCTrYQYdy1hD4WaYKPLk9yLFBMCTd28LjFMzNrJ5u24YOTvf1uliAIX58k/tyfAFTtfC/g1c0zLyXTHUbLKIK2bAFj0fJMdNImQQdXjhcBD066ivvergH7KnGpKptbHbMXnqspEuOI/tr9616vpHpWfnXv9kjLa6ODPeabkxBni+cKy4mcGnC1pFOHHlKWF0H+ufI+svGu35Az9o4zydlPpPS64CnaZ+3wDP55D+SBDV7maGKVm+bY21L3ihxRTGoWkOQXVkaAX+8A9FxjhKYFGlj9bP3XrctFS5Mu3OXiDq+qj31RgLwacbSAxHpkqg8lljVx55F1NeMeaTFwfmrhV3jt90DO6Kn2H1EcjJQb9WKiy MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1630.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d772b0b-cd09-4da0-da1c-08d82e110427 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 07:29:48.9718 (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: h/U1g5Hv9LeY6yneDiHcaCyhp/HNeqm0Z6txzQ3ue4DlY6WJyCy6Hqi7KEFMy0sK59ViBUAnLnaQOH3m13SETA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1582 Return-Path: liming.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable For submodule, I see the diff content. So, can we use "Subproject commit" a= s key to ignore it? -Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc +Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 Thanks Liming -----Original Message----- From: Feng, Bob C =20 Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B22=1B$BF|=1B(B 10:28 To: Jiang, Guomin ; Gao, Liming ; devel@edk2.groups.io Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgr= ade submodule. 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 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