From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.13346.1595311002053039921 for ; Mon, 20 Jul 2020 22:56:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Pae7vYYb; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: liming.gao@intel.com) IronPort-SDR: XULCR22qy08VpJ8MjKo4P6NDdTbtaHRkDYgcD3h+DzhOtZWQvINDBCBRvg3voFRrfzvGkoRyeR sPFrlVPJLGGA== X-IronPort-AV: E=McAfee;i="6000,8403,9688"; a="149223645" X-IronPort-AV: E=Sophos;i="5.75,377,1589266800"; d="scan'208";a="149223645" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2020 22:56:41 -0700 IronPort-SDR: l7Dv07y9/f7QsrhPkZ+6HoB3eJEUwzMtaNJzE+ku743/DxQ5qjm9iieVgmqwOnzG0HM78+pvf6 trGNmvX6d2VQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,377,1589266800"; d="scan'208";a="283756611" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga003.jf.intel.com with ESMTP; 20 Jul 2020 22:56:41 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 20 Jul 2020 22:56:41 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 20 Jul 2020 22:56:40 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 20 Jul 2020 22:56:40 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.172) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 20 Jul 2020 22:56:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tw2MNsr3sGK997LxXsbbSh728VRHVkm+D8OFplQigxMCyqleE+O+Pp4QURwkANZsI2KvXYE7D7XReQQHukXkLwZFa5I4FMNg2iC51qWG3iAMrNaJMdUtdwBLcDka1yzSIcatHq6w6jnmeQhPkFDzfSzhKLFXctp5IRXHHhoLOl3ZngzKzND38t8k1LygLGuO3HiFlJEEclCqaTyWbx1TgwKJ6bEAbSO8k918rHEsds7rlXCJyjwHbQVWjWq9A7Jv2dCIF+9OsNMViFXNkBd5t7KjkYTfXEX76pFcNh4SDrvhIlCnIdsrndj7Q/PzTnkJD0xCg+VX1dSDzvocfj3lsg== 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=GCtO7d6bLeZKwDL77qf920HV4up9CZEvRJmTDIm7EQk=; b=FjYtwhgobs1Lu/cfwofa3TcUpF0lPYZdPCeVfxIDCO8GAaygEDqFtJNKICov/vhCFB42DMhR72y79xkAzdXmtFKBq4EJpJwdYU0plRP87aQ3JPOqRIvxa7N19z06ksREGO4Sy9gu0VfuDx/en4tNrcXR83daEIAPhgkylULT99e8J8gQyycZaKu5SSItMBJ/TX+cRfdV4MlPXhxJo4+TezvzxS9C6/iXZNJcEBf8wzsNiq/g/VQDMDZx/rmIUJIDr3B6vTHRMIB9W2DNrXjbvYTNBsmwDzO+cT2w1r/EYCFVBNR04G71rEw3cdz6JUWxNF6Pp5l491xUrLXAmp7U2w== 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=GCtO7d6bLeZKwDL77qf920HV4up9CZEvRJmTDIm7EQk=; b=Pae7vYYbA4X0r35Sle+kZl2osrgazjV4KhzG2RyWAKryei2Xmjl294lKT8oQBX6LQtNiJAkiwtUsf3/vEvHUxd4YAc0yjVojYe7TKwdfMYnrEMaFWS/wi7hkSe0A1qoxjDT7jtZECVVsrt7zr8gA+m1kDZsQdQCfZJNu99w9UzU= Received: from MWHPR11MB1630.namprd11.prod.outlook.com (2603:10b6:301:e::7) by MW3PR11MB4620.namprd11.prod.outlook.com (2603:10b6:303:54::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Tue, 21 Jul 2020 05:56:39 +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.3195.025; Tue, 21 Jul 2020 05:56:39 +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: AQHWXwrkYnJRMUcK906BeNpl3KGPPqkRiSKg Date: Tue, 21 Jul 2020 05:56:39 +0000 Message-ID: References: <20200721025846.2249-1-guomin.jiang@intel.com> In-Reply-To: <20200721025846.2249-1-guomin.jiang@intel.com> 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: da85f60e-c777-4963-3637-08d82d3ad605 x-ms-traffictypediagnostic: MW3PR11MB4620: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: qWYyNgaLzkEJfigVMEiHgTUFMZrWGyKX1TCeRnRkt1EBuhDAPDK/gMkjkSAITxQ3xtykc+p7LGqvw8YbJot0L5V8sJlPRVPBa7mVXxxd6pFK+6R1KTKYnYvENItnsKvGquKG73A4Zio8E7Dh4Jo6TWvwBtQK8WCV5/7tJH+eodIZFt1INyfyheQP0zCCxeq1qoA3oYLL8jR8ZFg33b1DEePJVNsZeASiHaI2a3H7tjiQ3NZRMEozPVEzJuLj5YxIesXPXDz/ua2DtV1PQwkqd90fk1hC0lLl6U2caSDA9RlnmhxWOjvZPUzob4p8fRxTfyYbq359+SRTwuRSAPJW6Q== 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)(39860400002)(366004)(376002)(396003)(346002)(136003)(55016002)(2906002)(9686003)(52536014)(66556008)(66476007)(33656002)(76116006)(64756008)(316002)(7696005)(86362001)(66446008)(66946007)(110136005)(53546011)(26005)(4326008)(6506007)(107886003)(83380400001)(8936002)(8676002)(5660300002)(478600001)(186003)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 1EuZf3xMN6o3kPWIEhMiPKkgNPxF/jl8mkWfALX7/TdjvxoDkMmdpXrSb+HPlsf/MfufmYkzRrF/D90lQ+p6FaPtUVlNA55LuGNfUu4dHDs+b1yFoXs5aZ3a2PqO+zxlwTCWODlpav/kf+qFxRkZQKlQ+CXGYZ0kRPo27xcQOswQFa+LVb4Wr0O+grvFbaMz9iosage1Fuc2BEjYB1Ccx/8yvLXctpOR0nd/XiB1yNCE1E58g07/ZwEYFi5k/DifWf2sao1fuZTag0N+KdufXYbrbjrIKI9i775FFfz/yaq79MmDuUbPVFA1usEHTGvc0+6I6bJrL+Tox/PwNJFcUDuuwvlFTzs/FCUi4SzKW+ptO0urJka2/h7BP/Yazm3kEchEZxeqX1ZSQaY7FVfw/8H7Sx1L9x+v0y25iOyVOU+oGYnl14CTMB4eU/jyOlpgGk8oUrBE44IkKYO4bu/lqiiWErjJoa+U/Re2RwhmA+HFd+vBKFPLQLciP+n4rvIm 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: da85f60e-c777-4963-3637-08d82d3ad605 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2020 05:56:39.3394 (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: QsKXZr1O5g340LFBo4SQ2nnOCJjcMSg00XveJ7OZZCqOxpVFBd/xDgjl7c68lFZMscfDwsfE+PwC/UMnr/JDWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4620 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: + self.lines[self.line_num+1].endswith('160000\n') or =20 What means for this line?=20 Thanks Liming -----Original Message----- From: Jiang, Guomin =20 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 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 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 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=20 + \ self.filename =3D=3D 'BaseTools/Conf/diff.order': # # .gitmodules and diff orderfiles are used internally = by git # use tabs and LF line endings. Do not enforce no tab= s and # do not enforce CR/LF line endings. # + # When update submodule, it will encode with LF line a= nd 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