From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 447A3211A43AB for ; Fri, 14 Dec 2018 03:23:00 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id m22so5443308wml.3 for ; Fri, 14 Dec 2018 03:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=zJG3fQFJ68348nJtc2O/dZ8O7OXtazNzUaois+o+xSk=; b=Wjh78SUKMm9XNKEKm0Sm5FReqHW4msq91z5AcPDntPqyrWW2C/56WwfmxMgAsNDxY/ YQv1Ue/jhKACnnrzpTBWFqZDgEytbRxTyp9rqZU0F5ZTTHKatuT27lJIlv4Iwwevrnn7 4ICnCfFgup0uRCuNb64LD0otoH+aveAZWFt9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zJG3fQFJ68348nJtc2O/dZ8O7OXtazNzUaois+o+xSk=; b=iSDzreIoHkxyJ2J/N7dYESpurFtoXK9YqV8tqSG5d3uQOPs9cAPWKUpXUSyBNRQtUs HShQjyBzmPnl0T+8NvNq+YBykGjlN4lsr2jzOw7wZuXpgSYPfO1um6fnyleK/NUr9/jg qkz6jmhO82xLeYrydCacRqGtB5My+OlaEbNTnuUlvhFf7Ynt8DoNEguKUkej3sorMYMJ 4/Pit4DgyrYYoPjDr/um1/+R+sYHjLU6vaWqiLvukxBK8ibpNoKJicCMEEv4vZuxUa4M k9YdQSAQc6mWSsyJopLUQ/BDQ9A1bvy+fuC2gj556bGQRYcDUHTuZuZKOp+yvb0tL76B H/BA== X-Gm-Message-State: AA+aEWZ6AOFg/lwTtjJwOq5IxRsKcWCCN0GFIA08fdd0IAd1PWOxvbl/ i6rSt5g6HhZ0Pp4fNGHTtDi4p/82nUyDxA== X-Google-Smtp-Source: AFSGD/Wnrc5E0GvZqtd71V6/12cvUzvwjoTqx1A0Gw6UZ0I8w0LaJ97uSA1BVKSr7BOh0qROH6KIOQ== X-Received: by 2002:a1c:b53:: with SMTP id 80mr2675407wml.121.1544786578337; Fri, 14 Dec 2018 03:22:58 -0800 (PST) Received: from mba13.nice.aeroport.fr (68.21.90.92.rev.sfr.net. [92.90.21.68]) by smtp.gmail.com with ESMTPSA id v132sm5472712wme.20.2018.12.14.03.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 03:22:57 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: lersek@redhat.com, julien.grall@linaro.org, siyuan.fu@intel.com, Ard Biesheuvel Date: Fri, 14 Dec 2018 12:22:53 +0100 Message-Id: <20181214112253.10372-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [PATCH] ArmVirtPkg/ArmVirt.dsc.inc: define TcpIoLib resolution unconditionally X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 11:23:00 -0000 Commit 9a67ba261fe9 ("ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF") failed to take into account that the now unconditionally included IScsiDxe.inf from NetworkPkg requires a resolution for TcpIoLib. Since specifying such a resolution is harmless for platforms that have no networking enabled, let's just fix things by dropping the conditionals around it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index c3549c84d4c6..89c2db074711 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -80,9 +80,7 @@ DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf !endif -- 2.17.1