From patchwork Fri Jul 8 14:42:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 14679 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A15A095CE; Fri, 8 Jul 2016 16:42:34 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id E685591B8 for ; Fri, 8 Jul 2016 16:42:32 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id n127so14311313wme.1 for ; Fri, 08 Jul 2016 07:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fx/WCoDwNA3xvhMph4GkIMRf16fzJyTBtXe9Xbm7vic=; b=MDtiYBh3T2ELAkmpvDA+AwvkI9ayel6IyVHbuRFxLZakZ5nDNK5/iIrMIv4Ttp8q2r rZotXPgqyZ6re9ks4b2GxoV9//NL1rPYcMjqN9JcUQY1L/1Kn8BrLAw8vj81H9wlF1r+ 20mxwERPnQXGe52s9oL47ZC2oD2XT2DzYIoGlNx8mwCZZ/v57yweJSD0taDpSZQL5SF5 EYR4CGQMOmqZXU5AEMLamBX33kEh1HueXYLAb3nekC5xiSGmksAGHutoDamPxdTv3Qd+ ZAlbGqxgGT21p7sHbcARdT8tJkmIZjOCCkqnpuwKKLc79Lvh50gamVGe4Pq23y+PISAo j5Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fx/WCoDwNA3xvhMph4GkIMRf16fzJyTBtXe9Xbm7vic=; b=cui2AUfZb2IAwXjV6OhDgSZGF27rWbU+FznPJThDAKkj05CAfSbQGVQ+7qSRWbGYho iu/oAzR6XWOV2M9SMoVKgT+Hvoc0ZPZEiIKwfFqyJWTanL7yPsio2dxkWKx0MF2XhsCz 6f/wL9tmmvj4eCSdBN+bzl+1x1X3Y3aLVAChoKQe8kGArJUDs+/7FMpw9b5Vg+ES79dW b3go3AWITCoe70+wUeuWLarz6ifGdGRTBc5QTV73IoJO9y/C4WJ6ImShoMfaitJjEzBG S9gwTzp6MhUc4f5Vyj67PW2D/SFaRzx4HiyUiiLsncDA44dzgWJOOEE8idCLtyB+N3A8 UD0w== X-Gm-Message-State: ALyK8tINDY/UxT8wZfne7wK5q/t8Oa2rb+pJyeqzZQ5Cue26GLSK7PXINbBcx00e64mSXJtd X-Received: by 10.194.200.136 with SMTP id js8mr5633619wjc.72.1467988952704; Fri, 08 Jul 2016 07:42:32 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id qf7sm1713958wjc.41.2016.07.08.07.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jul 2016 07:42:31 -0700 (PDT) From: Thomas Monjalon To: Neil Horman Cc: dev@dpdk.org Date: Fri, 8 Jul 2016 16:42:18 +0200 Message-Id: <1467988944-25004-5-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467988944-25004-1-git-send-email-thomas.monjalon@6wind.com> References: <1467972855-21873-1-git-send-email-thomas.monjalon@6wind.com> <1467988944-25004-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v3 04/10] mk: fix driver build with installed SDK X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The tool pmdinfogen was called from RTE_OUTPUT/app/ which does not exist if building a driver outside of the SDK build. When building DPDK, RTE_SDK_BIN is RTE_OUTPUT. When building an external driver, RTE_SDK_BIN must point to the installed DPDK directory containing includes, libs, etc. That's why pmdinfogen must be installed in the SDK directory and be part of the SDK installation. Fixes: 3d781ca32874 ("mk: do post processing on objects that register a driver") Signed-off-by: Thomas Monjalon Acked-by: Neil Horman --- mk/internal/rte.compile-pre.mk | 2 +- mk/rte.sdkinstall.mk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk index 5632d6e..87d2d93 100644 --- a/mk/internal/rte.compile-pre.mk +++ b/mk/internal/rte.compile-pre.mk @@ -92,7 +92,7 @@ C_TO_O_DO = @set -e; \ if [ \$$? -eq 0 ]; then \ echo \" PMDINFOGEN\" $@; \ OBJF=`readlink -f $@`; \ - ${RTE_OUTPUT}/app/pmdinfogen \$$OBJF \$$OBJF.pmd.c; \ + $(RTE_SDK_BIN)/app/pmdinfogen \$$OBJF \$$OBJF.pmd.c; \ if [ \$$? -eq 0 ]; \ then \ echo \" PMDINFOBUILD\" $@; \ diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index b0d985c..7cd352c 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -117,6 +117,7 @@ install-runtime: $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) $(Q)tar -cf - -C $O --exclude 'app/*.map' \ + --exclude app/pmdinfogen \ --exclude 'app/cmdline*' --exclude app/test \ --exclude app/testacl --exclude app/testpipeline app | \ tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ @@ -126,10 +127,8 @@ install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py, \ $(DESTDIR)$(sbindir)/dpdk_nic_bind) - $(Q)$(call rte_symlink, $(DESTDIR)$(bindir)/pmdinfogen, \ - $(DESTDIR)$(bindir)/dpdk_pmdinfogen) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/pmdinfo.py, \ - $(DESTDIR)$(bindir)/dpdk_pmdinfo) + $(DESTDIR)$(bindir)/dpdk_pmdinfo) install-kmod: ifneq ($(wildcard $O/kmod/*),) @@ -145,8 +144,9 @@ install-sdk: $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) + $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) + $(Q)cp -a $O/app/pmdinfogen $(DESTDIR)$(targetdir)/app $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib)