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.10247.1595383215762460867 for ; Tue, 21 Jul 2020 19:00:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Bhs6ZHV4; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: liming.gao@intel.com) IronPort-SDR: I7Hp/gPRlwoMZN69Rnduj29uXXJMgNwfP6/w3E9y5Rs3P6iSb6GoSxyPvC2ErgPXG8qfqXfYki hYAWgPv1q/0A== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="130340827" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="130340827" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 19:00:14 -0700 IronPort-SDR: wTKti+N0aSEX0+1kYLehqh3SLUCKD1cG/TucIk4W+A0bys/hGUyw8acTQnQCkGC97wck5z78Pr qelbGfJSwIdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="392533831" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 21 Jul 2020 19:00:14 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:00:14 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:00:12 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.44) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:00:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tn4elCb5zOqcYLzXzbZsasVtAfBTRN1auMpRsG07ab2IAw5KBV4rsk8iXs8XkMOXtjEwxvUn+1hEhh5kJVrK4CpxUtfnbjGK//+OrTWxE5yzaVO8g+Fb2wp2pGMpJ6NnGFRpJh7krfFX/T+qftPCsDi/tZpaTeNBOqwAyDLiyxpMgimLG1pQRq5+TuSj/0K0CJ3kULSo0nIFuTU90+CjJCVxnfzv9j/M1FBetogoTN3MqPfBRo4IQ/fjg1f81Hw6ZSj1V5CLwiHEDbyrx7XXycRvyjXVDFVDgjmdGuJQvPWElXxSfrbhhOWciO01lkKcxr+zyIxL/NPO/UXDW9T6Xg== 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=B5Fe9PETfMS/Qu5Ga+PXrMf+ZtupYbMc2LojGs/uFho=; b=RGyjMWkFBblI1euBHUYp7XAHMuH6QG0ZdPg3AUJv1uFsUomYhxa7rH6ZRe/MEljbM6Fs29JG5AFZOs3CVoOxgu2804IpbZk5jFNBLi2IKEoGFXgbDiq071Pb9ox5u+1p9yfqXqaxl6FjW+w1m5vtWZGf7PtkX/Q0aTsa84AgsHNV9mvDVqRJqQPN6q3BuYafeET/G+bAWCL0WWH6x6InAZkYk76cTnutaaBUu9jyhe3IqjZ12y+aRFzGrnWA+R46rYvt2ux0jRLkJQ4mXhtLQDxt/2lvm6Y+rzTNzljRscHGm1cIcKk4l15BHF1NZXkhDbEUPMZDq+mMYYmzmqku0A== 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=B5Fe9PETfMS/Qu5Ga+PXrMf+ZtupYbMc2LojGs/uFho=; b=Bhs6ZHV4FyZjjwBxK9106hfIHx68XN/AOSmOcV8Wb+vq99Eod+uy9aLyJ/EIcGOovdlH8KIquQbnqMrFa6eNYc82EqIO2FBFlGkH4GRJ8wGvojXe/Wa/aJLjQppTV53cDFz4XNd9F7VxMfT6+kWoAyMfyXwexR6+jMlivxJ2Zbo= Received: from MWHPR11MB1630.namprd11.prod.outlook.com (2603:10b6:301:e::7) by MWHPR11MB1310.namprd11.prod.outlook.com (2603:10b6:300:28::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Wed, 22 Jul 2020 02:00:10 +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 02:00:05 +0000 From: "Liming Gao" 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. Thread-Topic: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Index: AQHWXwrkYnJRMUcK906BeNpl3KGPPqkRiSKggABNcVCAAQKosA== Date: Wed, 22 Jul 2020 02:00:04 +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: 4561abbf-210a-4be1-2543-08d82de2f3e5 x-ms-traffictypediagnostic: MWHPR11MB1310: 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: BLhBDrbq9Ck0v311ZdUwMtzoMJQWl/rjYHv8i/+Vci0HRhmfhmqZEZdkTWFz6gi5QZi7EBQ6HjrTYTwqK+JWbWJZY4o4zq6fWXqGQuLaIOC1EYf8seC12ZzshY9k2I5N54/S3ps03SkgW8tXb+UQWCsON6n/Y9XYzUwFHsart4KkucyWWyg1ZckEWQ8FVIKPwfKOWOzs5RmDsbJjtUMacL2RTEWu26hc7vy7B+9Lm7I+mFUaxA3a069AntNDekXomh9AtucRgQhvRhkTd9FEGK0YmqfZV/bMuYAGrLX4e+7CODu92+XweBASALDZawsUjj1xRiAbSY85PItZrePkmA== 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)(346002)(39860400002)(136003)(396003)(366004)(2906002)(9686003)(4326008)(107886003)(55016002)(7696005)(33656002)(6506007)(26005)(186003)(53546011)(76116006)(478600001)(52536014)(8936002)(66446008)(64756008)(8676002)(66556008)(66476007)(86362001)(5660300002)(110136005)(83380400001)(66946007)(71200400001)(316002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: nS0Mo/q0u+AcHfZ26huD+zLW7q35IV1Lyj6OQA7P1eS+xHp1htkPmarW3YdE1PtzWGjKLh6Tv0Tw+BdZReWjszyRHA+Xvjgk9XrN3yn+2/qvatttb42WJ79ZwdNr5QY6D5Etk8IM3hhTVkAcis23yfRqYnVhV9lFuvMNlld1NZgUupDxBDPIvOy4l8WXb9Y5FIdqtvSAVLrSi3paBoV+xHdapWQXuR4AmxAS3o8jZ7VGNba+XwbVD/BHyvXqpTO7BHk5IpULYrxSrWU7SKHKnZGJQ8KpjpduWTob5AZ0qb3ZkgaiVInqA2uzvYQe0vaEA6mUw8XBq8j30Bpwt+n/uKnLiheRDZs4XgtFnBUp9BGWmY7I7AjBMF2hpm8zAMHdl8ZwrDE01OLvLJqJiC87IdTJQlNetjtwBqoAqSaQxtMrpMwsMnkJdFKlpQw4kKETfbMnYtcWAu2weVi7qGGc1G4uNo/LwfXTpbhVP/kgXEkCkFQafEkclZR+Qe/ukQ0R 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: 4561abbf-210a-4be1-2543-08d82de2f3e5 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 02:00:04.8505 (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: gPRJAjqOan9j1KM/u7188cJUSuC8WWMoe/i7iOCnw372Jmi1Exea48YZf9IQJ/cQPCfseynLOgWbYB5wLJdWAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1310 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 Guomin: OK. Please add this information in the patch for better reading. With thi= s change, Reviewed-by: Liming Gao Thanks Liming -----Original Message----- From: Jiang, Guomin =20 Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B21=1B$BF|=1B(B 18:38 To: Gao, Liming ; devel@edk2.groups.io Cc: Feng, Bob C Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgr= ade submodule. 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=20 > 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=20 > > Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when=20 > upgrade 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=20 > based 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=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')=20 > + 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