aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>2016-09-07 11:24:09 +0800
committerTom Zanussi <tom.zanussi@linux.intel.com>2016-09-08 12:49:29 -0500
commit9a06fc5bce051c47816d139184753ecdcc29987c (patch)
tree1e4e5f7dc5a3776b82c45ac2047f61c893fc906b
parent9a2d3d844c9650697846dc2bbfe5005af83e2af4 (diff)
downloadmeta-intel-9a06fc5bce051c47816d139184753ecdcc29987c.tar.gz
meta-intel-9a06fc5bce051c47816d139184753ecdcc29987c.tar.bz2
meta-intel-9a06fc5bce051c47816d139184753ecdcc29987c.zip
meta-isg/dpdk: Update v16.04 -> v16.07
Update the dpdk recipe from v16.04 to v16.07. Renamed and modified the patches: dpdk-16.04-add-sysroot-option-within-app-makefile.patch dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch accordingly since these patches don't apply cleanly on top of dpdk v16.07. Fixed compilation by adding examples/ethtool/lib directory in DEPDIRS-y and by adding lib path in LDLIBS. Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk.inc6
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch33
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch32
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch42
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch (renamed from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch)52
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb (renamed from meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb)4
6 files changed, 105 insertions, 64 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index 6f3593bc..f9720291 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -5,11 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
- file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \
+ file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \
file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
- file://dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch \
+ file://dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch \
file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \
+ file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
"
COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
@@ -44,6 +45,7 @@ export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}"
export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}"
export INSTALL_PATH = "${prefix}/share"
export RTE_OUTPUT = "${S}/${RTE_TARGET}"
+export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/"
export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac"
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch
deleted file mode 100644
index db762e9e..00000000
--- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 893d208cc66fbe533ab4e3e66907c5f63266579b Mon Sep 17 00:00:00 2001
-From: Ong Boon Leong <boon.leong.ong@intel.com>
-Date: Thu, 2 Jul 2015 23:51:01 +0800
-Subject: [PATCH] dpdk: add --sysroot option within app makefile
-
-Upstream-Status: Inappropriate [configuration]
-
-rte.app.mk has been changed to add -Wl, to all items listed
-under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup
-correctly when we depends on gcc to setup for GNU ld.
-
-Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
----
- mk/rte.app.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.app.mk b/mk/rte.app.mk
-index 8ecab41..35fcd8d 100644
---- a/mk/rte.app.mk
-+++ b/mk/rte.app.mk
-@@ -186,7 +186,7 @@ ifeq ($(LINK_USING_CC),1)
- override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
- O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \
- -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \
-- $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS))
-+ $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS))
- else
- O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
- -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS)
---
-1.9.1
-
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch
new file mode 100644
index 00000000..a4c47112
--- /dev/null
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch
@@ -0,0 +1,32 @@
+From a33a9e7559b59bc5fb0988af85062436ec4389a4 Mon Sep 17 00:00:00 2001
+From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+Date: Fri, 19 Aug 2016 11:57:49 +0800
+Subject: [PATCH] dpdk: add --sysroot option within app makefile
+
+Upstream-Status: Inappropriate [configuration]
+
+rte.app.mk has been changed to add -Wl, to all items listed
+under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup
+correctly when we depends on gcc to setup for GNU ld.
+
+Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+---
+ mk/rte.app.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/rte.app.mk b/mk/rte.app.mk
+index eb28e11..296c8c7 100644
+--- a/mk/rte.app.mk
++++ b/mk/rte.app.mk
+@@ -195,7 +195,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
+ ifeq ($(LINK_USING_CC),1)
+ O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(OBJS-y) $(call linkerprefix, \
+ $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
+- $(MAPFLAGS))
++ $(MAPFLAGS)) $(SYSROOTPATH)
+ else
+ O_TO_EXE = $(LD) -o $@ $(OBJS-y) \
+ $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
+--
+1.9.1
+
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch
new file mode 100644
index 00000000..e17d80d1
--- /dev/null
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch
@@ -0,0 +1,42 @@
+From 4cdcb5ea4af9677677a007c4f9b286948123be87 Mon Sep 17 00:00:00 2001
+From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+Date: Fri, 2 Sep 2016 15:48:52 +0800
+Subject: [PATCH] dpdk: fix for parellel make issue
+
+To make sure that the path of libraries should be correct and
+libraries will be build before, And available at the time of
+linking example apps.
+
+Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+---
+ examples/Makefile | 1 +
+ examples/ethtool/ethtool-app/Makefile | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index 18b41b9..c7c2beb 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
+ ifneq ($(ICP_ROOT),)
+ DIRS-y += dpdk_qat
+ endif
++DEPDIRS-y += examples/ethtool/lib
+ DIRS-y += ethtool
+ DIRS-y += exception_path
+ DIRS-y += helloworld
+diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile
+index 09c66ad..ec068e6 100644
+--- a/examples/ethtool/ethtool-app/Makefile
++++ b/examples/ethtool/ethtool-app/Makefile
+@@ -47,6 +47,7 @@ SRCS-y := main.c ethapp.c
+ CFLAGS += -O3 -D_GNU_SOURCE -pthread -I$(SRCDIR)/../lib
+ CFLAGS += $(WERROR_FLAGS)
+
++LDLIBS += -L$(ETHTOOL_LIB_PATH)/
+ LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib
+ LDLIBS += -lrte_ethtool
+
+--
+1.9.1
+
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch
index 1c880cf1..9fc30381 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch
@@ -1,47 +1,48 @@
-From 2b0979ce523e33f8c2744f8c021b8722b7571a3d Mon Sep 17 00:00:00 2001
+From 7af593cfca897a0f17d33aba95dd3e3d22a65444 Mon Sep 17 00:00:00 2001
From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Thu, 21 Jul 2016 09:39:51 +0800
-Subject: [PATCH 2/2] dpdk: fix installation warning and issue
+Date: Fri, 19 Aug 2016 11:50:46 +0800
+Subject: [PATCH] dpdk: fix installation warning and issue
Upstream-Status: Inappropriate [configuration]
Ensure that all compiled libs should be installed to correct location.
For cross compiling cp -r and extra tar flags used to avoid QA warning
[host-user-contaminated].
-Added excluded files from bin and removing mk file installation since it
-is not needed as a part of image.
+Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files
+installation since it is not needed as a part of image.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
---
- mk/rte.sdkinstall.mk | 24 +++++++++++-------------
- 1 file changed, 11 insertions(+), 13 deletions(-)
+ mk/rte.sdkinstall.mk | 25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index 68e56b6..7674b47 100644
+index 5217063..7036a32 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
-@@ -114,15 +114,13 @@ endif
+@@ -114,16 +114,13 @@ endif
install-runtime:
$(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
- $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir)
+ $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir)
$(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
-- $(Q)tar -cf - -C $O app --exclude 'app/*.map' \
+- $(Q)tar -cf - -C $O --exclude 'app/*.map' \
+- --exclude app/dpdk-pmdinfogen \
- --exclude 'app/cmdline*' --exclude app/test \
-- --exclude app/testacl --exclude app/testpipeline | \
+- --exclude app/testacl --exclude app/testpipeline app | \
- tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \
- --keep-newer-files --warning=no-ignore-newer
-+ $(Q)tar -cf - -C $O app | \
-+ tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \
++ $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \
++ tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \
+ --strip-components=1 --keep-newer-files --warning=no-ignore-newer
$(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
- $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir)
+ $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir))
- $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py, \
- $(DESTDIR)$(sbindir)/dpdk_nic_bind)
-@@ -130,7 +128,7 @@ install-runtime:
+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \
+ $(DESTDIR)$(datadir)/tools/setup.sh)
+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \
+@@ -137,7 +134,7 @@ install-runtime:
install-kmod:
ifneq ($(wildcard $O/kmod/*),)
$(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir))
@@ -50,26 +51,23 @@ index 68e56b6..7674b47 100644
endif
install-sdk:
-@@ -139,10 +137,10 @@ install-sdk:
+@@ -146,11 +143,9 @@ install-sdk:
tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \
--keep-newer-files --warning=no-ignore-newer
$(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir))
- $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir)
- $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir)
-+ $(Q)cp -r $(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/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app
++ $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir)
++ $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir))
+ $(Q)cp -r $O/.config $(DESTDIR)$(targetdir)
-+ $(Q)cp -r $(RTE_SDK)/examples/ethtool/lib/$(RTE_TARGET)/lib/* $(DESTDIR)$(libdir)
$(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
$(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib)
-@@ -155,7 +153,7 @@ ifneq ($(wildcard $O/doc),)
- endif
- ifneq ($(wildcard $O/doc/*/*/*pdf),)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides)
-- $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
-+ $(Q)cp -r $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
+@@ -166,4 +161,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),)
+ $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
endif
$(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
- $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir)
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb
index 2cef10db..55729cd9 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb
@@ -5,8 +5,8 @@ SRC_URI += "\
file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
"
-SRC_URI[dpdk.md5sum] = "0728d506d7f56eb64233e824fa3c098a"
-SRC_URI[dpdk.sha256sum] = "d631495bc6e8d4c4aec72999ac03c3ce213bb996cb88f3bf14bb980dad1d3f7b"
+SRC_URI[dpdk.md5sum] = "4afdc7951e21ff878a85ecade7f6f488"
+SRC_URI[dpdk.sha256sum] = "cc982455a74357e465112bede5c29451b6eeb35f8c1c0dcea280dd3e7829f0e9"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"