summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorC.R. Guo <chunrong.guo@nxp.com>2018-03-16 13:03:34 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2018-04-02 10:30:13 -0300
commitee326e566ba00a8494ee19cbad465d022f577c80 (patch)
treed8d0968da430cc4506bb24eb6003b10abb026e08 /recipes-extended
parent5291ef0bab056e617bda716971a8f980a9c6dfbf (diff)
downloadmeta-freescale-ee326e566ba00a8494ee19cbad465d022f577c80.tar.gz
dpdk : Upgrade to v17.11
1. Rename the recipe version 2. Remove add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch 3. Add cmdif demo and lib 4. Enable openssl and kni 5. Changes: 11d461d - PVT: dpaa: Coverity fixes f48f745 - PVT: dpaa2: Coverity fixes 4294b65 - Merge pull request #581 in GITAM/dpdk from bugfix/DPDK-1236-vhost to 17.11-next-qoriq ea9e9f5 - PVT:examples/vhost: add NXP NON upstream compilation flag fa63d1a - PVT: dpaa2: add dynamic AIOP DPL script 0c5d852 - PVT: crypto/dpaa_sec: Adding a check to verify portal configuration 3be54a7 - PVT: crypto/dpaa_sec: adding a check to create mempool only once per device 09dc340 - PVT: test/test: add macro for dpaa_sec device name edd313f - PVT: crypto/dpaa_sec: add macro for device name cad0a33 - Merge pull request #571 in GITAM/dpdk from bugfix/DPDK-1222 to 17.11-next-qoriq 0057e69 - dpaa/event: rearranging of atomic queue support code 2a43d84 - Merge pull request #569 in GITAM/dpdk from feature/DPDK-781 to 17.11-next-qoriq 214085e - README: Update for l3fwd with eventdev config 5ab4786 - PVT: mbuf: change mempool set from register 4ecd97c - license: introduce SPDX identifiers e762ed7 - doc: add DPAA eventdev guide 84956ed - crypto/dpaa2_sec: fix build with GCC < 7 e716b6f - crypto/dpaa2_sec: fix build with GCC 7 a38ca35 - lib: remove unused map symbols 4d8a6de - net/dpaa2: remove unused global variable 513dac2 - bus/fslmc: fix build with latest glibc ae9a891 - bus/dpaa: fix default IOVA mode 3d4dacb - bus/fslmc: fix DPCI compare in scan 080fda4 - bus/dpaa: fix clang warnings d82a750 - crypto/dpaa2_sec: fix enum conversion for GCM 17ae857 - crypto/dpaa_sec: fix enum conversion for GCM 2e1e748 - net/dpaa: fix potential memory leak 18a9fad - Merge pull request #566 in GITAM/dpdk from ~NXA15309/dpdk:DPDK-781-l3fwd-event to 17.11-next-qoriq 6acd7a7 - PVT: doc: update the cmdif doc with correct AIOP ELF path 0056df7 - PVT: examples/l3fwd: adding CLI parameters for eventdev config 46aaafa - PVT: raw/dpaa2_cmdif: use iova-vaddr conversion macros e7933b2 - PVT: bus/fslmc: add typecast in iova-vaddr conversion macros fa06a86 - PVT: doc: add DPAA2 based CMDIF demo 5fcd632 - PVT: examples/cmdif: add the command interface demo application 3bcae6d - PVT: examples/cmdif: add CMDIF SHBP library a8ff22c - PVT: examples/cmdif: add CMDIF server library 86a71f5 - PVT: examples/cmdif: add CMDIF client library Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch38
-rw-r--r--recipes-extended/dpdk/dpdk_17.11.bb (renamed from recipes-extended/dpdk/dpdk_16.07.bb)29
2 files changed, 22 insertions, 45 deletions
diff --git a/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch b/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
deleted file mode 100644
index c8940446..00000000
--- a/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions
2
3glibc 2.25 is warning about it if applications depend on
4sys/types.h for these macros, it expects to be included
5from <sys/sysmacros.h>
6
7Fixes
8| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
9| by <sys/sysmacros.h>. For historical compatibility, it is
10| currently defined by <sys/types.h> as well, but we plan to
11| remove this soon. To use "minor", include <sys/sysmacros.h>
12| directly. If you did not intend to use a system-defined macro
13| "minor", you should undefine it after including <sys/types.h>. [-Werror]
14| Query.c: In function 'Query':
15| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
16| by <sys/sysmacros.h>. For historical compatibility, it is
17| currently defined by <sys/types.h> as well, but we plan to
18| remove this soon. To use "makedev", include <sys/sysmacros.h>
19| directly. If you did not intend to use a system-defined macro
20| "makedev", you should undefine it after including <sys/types.h>. [-Werror]
21| makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
22| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23
24Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
25---
26Upstream-Status: Pending
27
28
29--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.cold 2017-02-27 17:36:15.984931159 +0800
30+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c 2017-02-27 17:36:57.520929721 +0800
31@@ -39,6 +39,7 @@
32 #include <sys/stat.h>
33 #include <sys/mman.h>
34 #include <linux/pci_regs.h>
35+#include <sys/sysmacros.h>
36
37 #if defined(RTE_ARCH_X86)
38 #include <sys/io.h>
diff --git a/recipes-extended/dpdk/dpdk_16.07.bb b/recipes-extended/dpdk/dpdk_17.11.bb
index 78328c44..43a18599 100644
--- a/recipes-extended/dpdk/dpdk_16.07.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Data Plane Development Kit" 1DESCRIPTION = "Data Plane Development Kit"
2HOMEPAGE = "http://dpdk.org" 2HOMEPAGE = "http://dpdk.org"
3LICENSE = "BSD & LGPLv2 & GPLv2" 3LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2"
4LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492"
5 5
6DEPENDS += "virtual/kernel openssl" 6DEPENDS += "virtual/kernel openssl"
7RDEPENDS_${PN} = "bash python" 7RDEPENDS_${PN} = "bash python"
@@ -11,9 +11,8 @@ inherit module
11 11
12SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ 12SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \
13 file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ 13 file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
14 file://0001-include-sys-sysmacros.h-for-major-minor-defintions.patch \
15" 14"
16SRCREV = "076aa8e2f9a4ad7e0a020f5c574371d92afe4a60" 15SRCREV = "11d461d88390eb77bbf695eeddaad8e6f6cc25ce"
17 16
18S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
19 18
@@ -38,16 +37,31 @@ do_compile() {
38do_install() { 37do_install() {
39 unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS 38 unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
40 39
41 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" WERROR_FLAGS="-w" V=1 T="${RTE_TARGET}" DESTDIR="${D}" install 40 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" WERROR_FLAGS="-w" V=1 T="${RTE_TARGET}" DESTDIR="${D}" install CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_KNI_KMOD=y CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
42 41
43 # Build and install the DPDK examples 42 # Build and install the DPDK examples
44 for APP in examples/l2fwd examples/l3fwd examples/l2fwd-crypto examples/ipsec-secgw examples/kni examples/ip_fragmentation examples/ip_reassembly; do 43 for APP in examples/l2fwd examples/l3fwd examples/l2fwd-crypto examples/ipsec-secgw examples/kni examples/ip_fragmentation examples/ip_reassembly; do
45 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C ${APP} 44 temp=`basename ${APP}`
45 if [ ${temp} = "ipsec-secgw" ] || [ ${temp} = "l2fwd-crypto" ]; then
46 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
47 else
48 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C ${APP}
49 fi
46 50
47 [ ! -d ${D}/${bindir}/dpdk-example ] && install -d 0644 ${D}/${bindir}/dpdk-example 51 [ ! -d ${D}/${bindir}/dpdk-example ] && install -d 0644 ${D}/${bindir}/dpdk-example
48 install -m 0755 ${S}/examples/`basename ${APP}`/build/`basename ${APP}` \ 52 install -m 0755 ${S}/examples/`basename ${APP}`/build/`basename ${APP}` \
49 ${D}/${bindir}/dpdk-example/ 53 ${D}/${bindir}/dpdk-example/
50 done 54 done
55 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C examples/vhost
56 install -m 0755 ${S}/examples/vhost/build/vhost-switch ${D}/${bindir}/dpdk-example/
57 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C examples/cmdif
58
59 install -d 0644 ${D}/usr/share/dpdk/cmdif/include
60 install -d 0644 ${D}/usr/share/dpdk/cmdif/lib
61 cp examples/cmdif/lib/client/fsl_cmdif_client.h examples/cmdif/lib/server/fsl_cmdif_server.h \
62 examples/cmdif/lib/shbp/fsl_shbp.h ${D}/usr/share/dpdk/cmdif/include
63 cp examples/cmdif/lib/${RTE_TARGET}/librte_cmdif.a ${D}/usr/share/dpdk/cmdif/lib
64
51 install -m 0755 ${S}/${RTE_TARGET}/app/testpmd ${D}/${bindir}/dpdk-example/ 65 install -m 0755 ${S}/${RTE_TARGET}/app/testpmd ${D}/${bindir}/dpdk-example/
52 rm -fr ${D}/lib/modules/* 66 rm -fr ${D}/lib/modules/*
53 install -d ${D}/lib/modules/${KERNEL_VERSION}/dpdk 67 install -d ${D}/lib/modules/${KERNEL_VERSION}/dpdk
@@ -63,7 +77,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
63 77
64PACKAGES += "${PN}-examples" 78PACKAGES += "${PN}-examples"
65 79
66FILES_${PN} += "${datadir}/* ${bindir}/* ${sbindir}/*" 80FILES_${PN} += "${datadir}/* ${bindir}/* ${sbindir}/* /usr/share/dpdk/cmdif/include/*"
67FILES_${PN}-dbg += "${bindir}/dpdk-example/.debug \ 81FILES_${PN}-dbg += "${bindir}/dpdk-example/.debug \
68 ${datadir}/examples/kni/build/.debug \ 82 ${datadir}/examples/kni/build/.debug \
69 ${datadir}/examples/kni/build/app/.debug \ 83 ${datadir}/examples/kni/build/app/.debug \
@@ -86,4 +100,5 @@ FILES_${PN}-dev += "${datadir}/mk ${datadir}/scripts \
86" 100"
87FILES_${PN}-examples += "${datadir}/examples" 101FILES_${PN}-examples += "${datadir}/examples"
88 102
103FILES_${PN}-staticdev += "/usr/share/dpdk/cmdif/lib/*.a"
89COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)" 104COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)"