From nobody Fri May 3 01:26:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+95553+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95553+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1666687894; cv=none; d=zohomail.com; s=zohoarc; b=IktzRWz9XwbHWpW7YCH1lXwZ2QGD+z5KOmEqmi9ThX4BeBG62xW6PpAvLfBj9M/HS7NphF/L0i75UsESxcAXhWbU5YcDyhtFv5W88WxYBSmUF5TIpNwrmUMqg9j3ltrmrlg20c2quEb+cdCDLBxcowe/y0kMFMiUAlzbHBs3cwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666687894; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=OhfP6ayyeReWjDXrQWmRCwA8/D4rz2Hy1XXwFjb4JTE=; b=Vzp7oB3JkBQXTLbCVzZi6iyVgd4Wz1HpuxCn2wh79FClcGWOrzOdr1lNUrWQbKTboEwL4BiVTJT1/r8rSeBLrqOTksVsxaXW7QQ/TSzFIblpN0O9DqABc+iuutaMqn0c1AquGCALdD8Cdo+c2x79yjW2hyRyzu5qXJjwK+pwLmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95553+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1666687893926228.30365233406303; Tue, 25 Oct 2022 01:51:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SNmjYY1788612xiaMs6uKFSx; Tue, 25 Oct 2022 01:51:33 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.4956.1666687892816411757 for ; Tue, 25 Oct 2022 01:51:32 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10510"; a="393940543" X-IronPort-AV: E=Sophos;i="5.95,211,1661842800"; d="scan'208";a="393940543" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2022 01:51:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10510"; a="631561775" X-IronPort-AV: E=Sophos;i="5.95,211,1661842800"; d="scan'208";a="631561775" X-Received: from yuweipc.ccr.corp.intel.com ([10.239.158.38]) by orsmga002.jf.intel.com with ESMTP; 25 Oct 2022 01:51:31 -0700 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH] BaseTools: Fix build option overrides Pcd Feature Flag issue Date: Tue, 25 Oct 2022 16:51:28 +0800 Message-Id: <20221025085128.1760-1-yuwei.chen@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,yuwei.chen@intel.com X-Gm-Message-State: aSn3romZ1X72cseChkleTEoUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1666687893; bh=WfoYgUFlhedgGXrZA/JX4gEDxodNpVWAFIKkUrapXR8=; h=Cc:Date:From:Reply-To:Subject:To; b=ndht+XJfEGPZ3ErLiSOWqGL0rf5voc49ReGSmP5nqNk8yLi6tDfyTBt3Bat8EfJIZEX GQ5UH3P2qNxARzlfEExjYd6cNf/VTX2sySKvyUkliKFtDMqEvZqwmh5b4e9/U4vo5hzGo Ziz9IUNjFD5U0lgmM1mAjc6nigrYN2aM+G4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1666687895282100002 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4081 INF [Sources] section Feature Flag Expressions do not use override values from build --pcd option currently. This patch fix this issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yuwei Chen --- edk2basetools/Workspace/InfBuildData.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/edk2basetools/Workspace/InfBuildData.py b/edk2basetools/Worksp= ace/InfBuildData.py index c97a70e..8631373 100644 --- a/edk2basetools/Workspace/InfBuildData.py +++ b/edk2basetools/Workspace/InfBuildData.py @@ -1055,6 +1055,7 @@ def IsBinaryModule(self): return False def CheckFeatureFlagPcd(self,Instance): Pcds =3D GlobalData.gPlatformFinalPcds.copy() + BuildOptionPcds =3D GlobalData.BuildOptionPcd if PcdPattern.search(Instance): PcdTuple =3D tuple(Instance.split('.')[::-1]) if PcdTuple in self.Pcds: @@ -1062,6 +1063,14 @@ def CheckFeatureFlagPcd(self,Instance): EdkLogger.error('build', FORMAT_INVALID, "\nFeatureFlagPcd must be defined in a= [PcdsFeatureFlag] or [PcdsFixedAtBuild] section of Dsc or Dec file", File=3Dstr(self), ExtraData=3DInstance) + for item in BuildOptionPcds: + if self.Pcds[PcdTuple].TokenCName in item: + if type(item) =3D=3D type(()): + # ('gEfiCryptoPkgTokenSpaceGuid', 'PcdOpensslE= cEnabled', '', '1', ('build command options', 1) + Pcds[Instance] =3D list(item)[3] + elif type(item) =3D=3D type(''): + # gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnab= led=3D1 + Pcds[Instance] =3D item.split('=3D')[1] if not Instance in Pcds: Pcds[Instance] =3D self.Pcds[PcdTuple].DefaultValue else: #if PcdTuple not in self.Pcds: @@ -1085,6 +1094,14 @@ def CheckFeatureFlagPcd(self,Instance): for Name, Guid in self.Pcds: if self.Pcds[(Name, Guid)].Type =3D=3D 'FeatureFlag' or se= lf.Pcds[(Name, Guid)].Type =3D=3D 'FixedAtBuild': PcdFullName =3D '%s.%s' % (Guid, Name); + for item in BuildOptionPcds: + if Name in item: + if type(item) =3D=3D type(()): + # ('gEfiCryptoPkgTokenSpaceGuid', 'PcdOpen= sslEcEnabled', '', '1', ('build command options', 1) + Pcds[PcdFullName] =3D list(item)[3] + elif type(item) =3D=3D type(''): + # gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEc= Enabled=3D1 + Pcds[PcdFullName] =3D item.split('=3D')[1] if not PcdFullName in Pcds: Pcds[PcdFullName] =3D self.Pcds[(Name, Guid)].Defa= ultValue try: --=20 2.27.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 (#95553): https://edk2.groups.io/g/devel/message/95553 Mute This Topic: https://groups.io/mt/94554387/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-