From patchwork Thu Jul 7 15:36:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 14636 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 41E2F4AAD; Thu, 7 Jul 2016 17:36:41 +0200 (CEST) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 70213379B for ; Thu, 7 Jul 2016 17:36:39 +0200 (CEST) Received: by mail-wm0-f53.google.com with SMTP id 187so3561440wmz.1 for ; Thu, 07 Jul 2016 08:36:39 -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=KNVpziw+A8peArlvL5Eu9r1pNjntUdlKSbaqtpCKCgwkiGZD3ioyzOdVUD82O3EAog sF7VQGXFT7qqaNyJG3BvTlwbX1O3L3vntoJcq1ZV3VPWPxaPwnX9MC6YhXwTxTEMoVjH 1fgiFRldBne+cVn7Ei0J+FbUIFkNU532cJbiQRFgFlQTCAGLbdHwocGYhY668E49Erhs 3S58u11hTneiwzuxUeNwx8jqB15eTZRNvXEP/rUNOC7BrUsFm2ZKwK0A+kJjKaglbLWV EzHc0Ir90Y/7fe9aC2i+cIW1bgxN4RSaTrJIZYlzxRrpgJ7KgcCqMYKul+qcp8ntz5OY cNcg== 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=B1GnX3Cq46dpAMAVgCUf81x+PoxnHftJzO12ylpzezI39INZQGh9GD7jL4NYxV9dVV Q5aOIZE1QrKErClMC9PsgyRRdcYC1RNYw+y087CyzC1N4S9iOhsB4RcMN3t/4x7CD+nI uNSTpMcWewPYaJTVVM0W/5kdZXOq1ShOpP7Z9no7zDvdoBvkNCPZZ/nRqcirLoO670lK BjoDejlLihSQeegJ8MeNWgEyAWtYA5A9yuo9XAkJHjWmFJFiFyNmiPotycdK3dyYKPkK ZhnoYUbSi/mDQF8M90bKxQgOWdtlszyJgdiju+unVKBgZ2EYn48FVE+H9psna2PZr6L9 2axg== X-Gm-Message-State: ALyK8tKV/F4bCD0Xr69dMERkC1opwqjCK2r60AOrFdGyokA/8iHIvpK10z5/VGxOGlzNyYgg X-Received: by 10.28.101.134 with SMTP id z128mr27904032wmb.71.1467905799230; Thu, 07 Jul 2016 08:36:39 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id p126sm559331wmp.13.2016.07.07.08.36.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 08:36:38 -0700 (PDT) From: Thomas Monjalon To: Neil Horman Cc: dev@dpdk.org Date: Thu, 7 Jul 2016 17:36:24 +0200 Message-Id: <1467905790-10597-6-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467905790-10597-1-git-send-email-thomas.monjalon@6wind.com> References: <1467905790-10597-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 05/11] 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 --- 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)