From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web08.10169.1604661523211015261 for ; Fri, 06 Nov 2020 03:18:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=NyPjU25/; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: bob.c.feng@intel.com) IronPort-SDR: RJiGWP3v81m+PaK7jD6n62zqkvqzhbpIo2dcPoteEMhaovJDa45uWpe3VpO0gFLvqvF+wuvL72 6JbuBk5Y3Oxg== X-IronPort-AV: E=McAfee;i="6000,8403,9796"; a="166942052" X-IronPort-AV: E=Sophos;i="5.77,456,1596524400"; d="scan'208";a="166942052" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2020 03:18:42 -0800 IronPort-SDR: a8d/pe+HMZsMetJw0Ny8iJHoX7gh4L6biAOG5YqRJPNkibibqwdrbgESHTndA5ziT2FawVS7J2 y05WU4dKzSGQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,456,1596524400"; d="scan'208";a="321562156" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga003.jf.intel.com with ESMTP; 06 Nov 2020 03:18:42 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 6 Nov 2020 03:18:41 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 6 Nov 2020 03:18:41 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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 via Frontend Transport; Fri, 6 Nov 2020 03:18:41 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.174) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Fri, 6 Nov 2020 03:18:40 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jtO+h71YJrwnYmHOvuh3kui7iVv519yzfET2SOWD9uCM1S5MBCBLr/FnaDDL46EvSo5lEHBSsIfNKg8x6ZauJU353U1Ql9B92TZchqy4NHw6YC5NV7Cz1PjgEmQVCa11kJotOxU+HcxpqGK+HHcdcNCTQC48R2HbMz6rOKUb2eixRsAdNixtvcIvKbNFNxLoNp5PfXX/hUpNhh6iEQcJgH/CQhF4JjmKnnHyLVsGv0DBM5y+daG2boPnzDfiP5F4Y8zH2DZ1VfKKuyEbaMB4COFdjTPrmVkhOCuQHJ9KiYyh97cht3fRYd0cV1I+t/uBGECcS+kMc0cYYvQgfB5lGw== 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=1pMQR85xxgh2nmh0J8zE/nNu9yZLSNCPyGf25YDDlW8=; b=mCceZq2Hxd3pWLPppvUU4vUAhVjWUR+NmOgUI+4Ybr4d2jgVxl0QaUGO4sNDXGBAusczR2Hq723qTome7Ba2wSNFMB+0ZInA/yViShgbzozW86bvi9vZ4W0mFBDvaIRixHMzR3DCxD+F4k0FORdRF1nRS02FBh4bCKRV0pVvJTaZonoiUT1ab2sueMILuw31/x2+8BzStDLe7Yt2QKEvICoskuG2nakRPV/NQiwpn9Yi015rywb3avHnmr3QvJ2bK8ov3k8gX/UOrtBo67ayA4ErhOhYake/4DadVezvibndqpIR7WZRRO+Zy/DFvGMRLoKi1qkqsI9cMjs8Iisnyw== 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=1pMQR85xxgh2nmh0J8zE/nNu9yZLSNCPyGf25YDDlW8=; b=NyPjU25/RpdbbBOtNpM14KzHGRzsXfOO6+ie0r5o9vS9HW0NNdJaSPmETaJJUaV/0eBQ7A7zYMsP3bSFyFnEZbHEX46XLlY6kIuhFMJmVrHrSYMbGWb2lFTYr0Kzze8PgvETM9rt0pVzN2NWKAacBWpvUEtzI9Wo4pKX6oKoFKc= Received: from BY5PR11MB4070.namprd11.prod.outlook.com (10.255.154.144) by BYAPR11MB3799.namprd11.prod.outlook.com (20.178.238.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Fri, 6 Nov 2020 11:18:37 +0000 Received: from BY5PR11MB4070.namprd11.prod.outlook.com ([fe80::8842:3f1e:4ffc:32c1]) by BY5PR11MB4070.namprd11.prod.outlook.com ([fe80::8842:3f1e:4ffc:32c1%3]) with mapi id 15.20.3499.032; Fri, 6 Nov 2020 11:18:37 +0000 From: "Bob Feng" To: "Liang, MingyueX" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" Subject: Re: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Topic: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Index: AQHWtAF2AjsMRvF07EuCrav6FWAJpqm69BuA Date: Fri, 6 Nov 2020 11:18:36 +0000 Message-ID: References: <20201106055527.722-1-mingyuex.liang@intel.com> In-Reply-To: <20201106055527.722-1-mingyuex.liang@intel.com> 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.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d31c172a-a326-4baf-b5c9-08d88245b4c5 x-ms-traffictypediagnostic: BYAPR11MB3799: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: L2WtIC1LSQu9qklhZZoJHAR4Zi3bUzz/q8wKTBNWrpcN64FVcVwh5v6lqw7jLH7HsuPAA9es/AAgqLhRSvfuVAmuRk18fkv+jf2fJ8DACUC3oO6yOIFUWs2Smf1wpKzCEuaQLle86f5or+DXf8Tz3KUwgyu911097CriPjyyxR+N9fSRUjRLy87HYeAIET93w+s7MF7XOUoLxZZW5raeYTfpG2DiqKzEELSmmATdoAZMlOrgfaqmDDXLSGniN4gqdpDFZXdIU3YyfVxF3lsx6HzqFIj3mkPXJ8PTvYTgVERAPv5yhIwSCltmfehqf67A5PRlAwzM5wwjabYfQFDlJG8CZCiTDk//cIvsZPe7MNpwofUnG51wTNh5JKreyDGNarnGfKOrwCpVwtiOlLcLpuEOv7sJQ0xZ/3mwHLGEEVr7zQ4XG0cb7UhXHhrnW1b0yVzN6/do2LqEnYiRzds3Ag== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB4070.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(39860400002)(376002)(346002)(136003)(396003)(4326008)(83380400001)(478600001)(86362001)(107886003)(53546011)(186003)(52536014)(966005)(5660300002)(2906002)(9686003)(26005)(6506007)(76116006)(110136005)(316002)(66446008)(7696005)(64756008)(66476007)(33656002)(55016002)(71200400001)(8676002)(54906003)(66556008)(66946007)(8936002)(21314003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: sPvvsxH06An9KtUTZ48BkXyHLifHYUcXAj8FVJFGre5WWgK7WPOHLAJdXejOKO5dcpxhvNtR2NZvJmLYucOB2QgdzFDCp46Lqy5oWvSYzVTR3jQ8W07JVk0ISQqhE+Iy1RZeQFXgo2E8ua+88rFAJSRwXs9FLuKAwzgBHHMQFQM4H1xzli8NxPiEU9W20tPwBnmUXhmVKXlI+VcEDeth+5DNI63jxdEpGSW3jrikYyUYMun1SgTuF6b+doqhfvUtYDPKnf5rLPy2Y5v/pYiYwB3pcCRP8QMvUGezt5DAtujpoUcn5j0jMy6U7fP+4nwmu++lzVaUHrmZHKa4jFkyhKf2pWGuNsJHcOplxBlyC3qOfrDlopqV9xDz9k7pc6ZSD5wrYn0rW7qQ4+zilvMr8tCfYqCKXp7wOEbJF8OSwiCliV4CgjI62faewAqF4txK2OUMndQ/7Ygeu4o9BeGEukpFFeA10mph6jakSZSZyS9qhR8izMlLUWfdix6GWE6uY+ulfI0cgLB3qAkO42+J7t5yaG+BY/QXAAKZ7eSHWMJiK7l7sB9N78hyWCtIncStYGbi/YklCIuftZF3MeLUw0lIXIcSW00EePIpMSWzAVOOoCVjaMf70YDSvD8RMfmgkcF/9uWanyA9doWoN6fRjg== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB4070.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d31c172a-a326-4baf-b5c9-08d88245b4c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2020 11:18:36.8706 (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: fpXsorZz6QoeZ29OARCECrY1OgVcz4FGrooqKHqIEGTXfKR7zih9mrKc7tCBwA+RHcSyDHVMEI2AjuKGH27rpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3799 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please add this BZ to the patch commit message. https://bugzilla.tianocore.org/show_bug.cgi?id=3D2972 Thanks, Bob -----Original Message----- From: Mingyue Liang =20 Sent: Friday, November 6, 2020 1:55 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [PATCH 1/1] BaseTools: Incremental build issue for included ASI fi= le's deletion. When using incremental build to delete an included xxx.asi file from the AS= L file, the xxx.asl.trim.deps file generated by previous build process will= not be deleted from the OUTPUT directory, which caused the dependency file= still include the xxx.asl.trim.deps file. If the include file is deleted and DEPs is empty, the DEPs file is deleted. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- BaseTools/Source/Python/Trim/Trim.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index 776474b20349..c479f7d2b2e7 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -372,8 +372,7 @@ def TrimAslFile(Source, Target, IncludePathFile,AslDeps= =3D False): AslIncludes =3D [] Lines =3D DoInclude(Source, '', IncludePathList,IncludeFileList=3DAslI= ncludes,filetype=3D'ASL') AslIncludes =3D [item for item in AslIncludes if item !=3DSource] - if AslDeps and AslIncludes: - SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.base= name(Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False) + =20 + SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.basename + (Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False) =20 # # Undef MIN and MAX to avoid collision in ASL source code -- 2.28.0.windows.1