From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by mx.groups.io with SMTP id smtpd.web10.42494.1670850594341658231 for ; Mon, 12 Dec 2022 05:09:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bZGUcRqR; spf=pass (domain: gmail.com, ip: 209.85.208.174, mailfrom: aladyshev22@gmail.com) Received: by mail-lj1-f174.google.com with SMTP id y4so3483750ljc.9 for ; Mon, 12 Dec 2022 05:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Bz7qc7rOKncMOx6gmv1BAM7cU18O287EU4/ZRwcT2JY=; b=bZGUcRqRzEwzlnL9DZSd30TH33IprDMprbrxDOaZXJCg/KwKrzarxEOx+jYK1fdyCn 8jV2VIWZYmyCeXvDHQh+xiv2MUtnPem7kX/WRM4hM4zg8KFtuYVph23HMM16ZWNqxV6Q +4h23zV9RUwiU5XOW/lrhxUarsPXnH7/8l3Pp8Hap95Pw61fWuIGszZ+zcPBHDZ/6hvy 5T62Js3pVpCDZ53CkwOU1d9/8EfjroX8l4U/TMp67Qxf4ITMZhMEXgKiPQy77CWsnghv 1VHBWSXdaAeog5Oomvs3K4XZjILfJv3nzMk1pWkLP0Gy7wY9vREEN1NNK4GleYgrzh3p 95bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Bz7qc7rOKncMOx6gmv1BAM7cU18O287EU4/ZRwcT2JY=; b=L7HCVNYEXxn8kiJ723dl3Kxzpqge2GdLrLeCEQi5RzyvdOvhWW7KkOuibIEXGCGSqg rqATg9+nh5z8on8Rplj2m6JR3hn7UicwNVrqJ7DDZN3NkF5ztdqIwYLtC8arpgF5CaXp +tQ2JRiBYAuFchgp0mTTzAzAEV+mf53f3RxWqvvvvJgu9ecH4Rdm3oNQee5akbdkExPP U5TfcXgDEsHNBhYOLS1Qvz/TUaMsmSpSFMphB5XnEglj0NNMseLbNOQ2VimIYyRbOdk0 BYnOD4DTd2CNQ7pBisAHDY+HJWX5FnAHdo1iZ8fnT0AStORjgQhDHuRH1xfjFZh3hNmI uXAA== X-Gm-Message-State: ANoB5pmb61J1FcZzvxxa0Y7ngWR3M4X44APh1J0qE3aOtNDVJsG2iLTR OJ5vIM15KbvlNl4PIp7Di/7t8AUSa5g= X-Google-Smtp-Source: AA0mqf6cLDIGo9NWg8seszJKuVxQ3F9WSCtQ5ou67JFN1ba32FZHmICzI4maKyijjdaaKYo1l/DGKg== X-Received: by 2002:a05:651c:1947:b0:279:8a9c:ffd4 with SMTP id bs7-20020a05651c194700b002798a9cffd4mr4525201ljb.12.1670850591981; Mon, 12 Dec 2022 05:09:51 -0800 (PST) Return-Path: Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id k3-20020a2ea263000000b0026c4305e5e2sm1213013ljm.53.2022.12.12.05.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:09:50 -0800 (PST) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, jake@nvidia.com, Konstantin Aladyshev Subject: [PATCH] Revert "BaseTools/Conf: Fix Dynamic-Library-File template" Date: Mon, 12 Dec 2022 16:09:24 +0300 Message-Id: <20221212130924.8156-1-aladyshev22@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Revert commit d372ab585a2cdc5348af5f701c56c631235fe698. EdkII build system supports OptionROM generation if particular PCI_* defines are present in the module INF file: ``` [Defines] ... PCI_VENDOR_ID =3D <...> PCI_DEVICE_ID =3D <...> PCI_CLASS_CODE =3D <...> PCI_REVISION =3D <...> ``` Although after the commit d372ab585a2cdc5348af5f701c56c631235fe698 it is no longer possible. The build system fails with the error: ``` Cyclic dependency detected while generating rule for "<...>/DEBUG/<...>.efi" file ``` Revert d372ab585a2cdc5348af5f701c56c631235fe698 until the issue is resolved. --- BaseTools/Conf/build_rule.template | 2 -- 1 file changed, 2 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index af4819de92..32053f6353 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -342,8 +342,6 @@ =0D =0D $(OUTPUT_DIR)(+)$(MODULE_NAME).efi=0D - $(DEBUG_DIR)(+)$(MODULE_NAME).efi=0D - $(OUTPUT_DIR)(+)$(MODULE_NAME).map=0D =0D =0D "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)=0D --=20 2.34.1