From nobody Tue May 7 14:16:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+65526+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65526+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1600858361; cv=none; d=zohomail.com; s=zohoarc; b=P935rJgFneiJYkLIDi8aj7ywcbCxqruy5YxkkxHCM1TqFpKMjPCltVUnKuu6P2r+70QOR/l5xzTOAD+gErnbu/IfA3+Dqj1JlBeiXiyXVtVj7rtLbieyrivyzK1co7RRrjsd8UXAMLufDW70qIvHn+aR8iXN4oCoQ6u5sY+lwAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600858361; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=ojqOoz593Ri6TWym26TpJCU/jbbr/GaCXOvwFzm6CM4=; b=Z4WHwefZkihxlTpiVRbM5z2FZb1KCQbE7g+8T+zNXQENPp0mmnMRzVD4p0Jz6uNm/n3ULQyodTHM0KoGADgyewgCFHOWSmiq8G8BfkZwf+cpOd/CuZM4VXH/d3edJk8ivi38Hj5fNGkF/v/P08e0rnb6/wBml+qBJYGx6T4p1vI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65526+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1600858361223616.5761569866156; Wed, 23 Sep 2020 03:52:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id k5ndYY1788612xKrr8oFKCSX; Wed, 23 Sep 2020 03:52:40 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.10583.1600858360342164366 for ; Wed, 23 Sep 2020 03:52:40 -0700 IronPort-SDR: 2Sxx84KV4xCf77nhOqMwQA4HPlyueWlinNv4Y4/C+a0HIlA3EZeQq1RH7MgoUYelbjeJXE2jzQ g43ayZu++5ew== X-IronPort-AV: E=McAfee;i="6000,8403,9752"; a="140325207" X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="140325207" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 03:52:39 -0700 IronPort-SDR: 7BlDk7oF59tu4x9JdTljIEjdOe3zyMWkGxm79EhrOfdemF0Fusvo+I/j3bsVvvUbczw6YiyjBB l6t49uYJz3PA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="347309081" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2020 03:52:38 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Mingyue Liang , Liming Gao , Yuwei Chen Subject: [edk2-devel] [PATCH] BaseTools: Add included files to deps_target file. Date: Wed, 23 Sep 2020 18:52:26 +0800 Message-Id: <20200923105226.46336-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com X-Gm-Message-State: DsDwdrFbshQuyPi25j4jTRK6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1600858360; bh=6SYinSJeMG8BlyD/snMQxwTb+o6c1C0hcJi4f+pxZGU=; h=Cc:Date:From:Reply-To:Subject:To; b=E7W9rQSqwHaaoFqPwv9ch64WjcAzmEhQW2xFtA5woj2nXgHwfs/HT4cPG3NpHBct1NN X5tLB85GIluv9zMVkJUZ9HS6PM8zEZJImozZ/CObnHMAeeLswKvwxgFhGXS8nrBT4sn5Q 3BInBe2oA5byqErhYVEeVNuHl6oCMcDXnDw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Mingyue Liang REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2882 After changing the name of the include source file, when doing incremental build, the previous source file is not covered in the. DEPs file, and a build error occurs. The root cause is that the build tools filter out some dependency files, which are listed in inf source section, from the deps_target file.=20 Add those files back to deps_target file to resolve the above problem. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Reviewed-by: Yuwei Chen --- BaseTools/Source/Python/AutoGen/IncludesAutoGen.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py b/BaseTools= /Source/Python/AutoGen/IncludesAutoGen.py index 720d93395a..c3e6333217 100644 --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py @@ -103,7 +103,7 @@ ${END} if os.path.normpath(dependency_file +".deps") =3D=3D a= bspath: continue filename =3D os.path.basename(dependency_file).strip() - if filename not in self.SourceFileList and filename no= t in targetname: + if filename not in targetname: includes.add(dependency_file.strip()) =20 for item in lines[1:]: @@ -116,8 +116,6 @@ ${END} if os.path.normpath(dependency_file +".deps") =3D=3D a= bspath: continue filename =3D os.path.basename(dependency_file).strip() - if filename in self.SourceFileList: - continue if filename in targetname: continue includes.add(dependency_file.strip()) --=20 2.28.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#65526): https://edk2.groups.io/g/devel/message/65526 Mute This Topic: https://groups.io/mt/77032313/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-