diff options
-rw-r--r-- | recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch | 38 | ||||
-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 @@ | |||
1 | Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions | ||
2 | |||
3 | glibc 2.25 is warning about it if applications depend on | ||
4 | sys/types.h for these macros, it expects to be included | ||
5 | from <sys/sysmacros.h> | ||
6 | |||
7 | Fixes | ||
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 | |||
24 | Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> | ||
25 | --- | ||
26 | Upstream-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 @@ | |||
1 | DESCRIPTION = "Data Plane Development Kit" | 1 | DESCRIPTION = "Data Plane Development Kit" |
2 | HOMEPAGE = "http://dpdk.org" | 2 | HOMEPAGE = "http://dpdk.org" |
3 | LICENSE = "BSD & LGPLv2 & GPLv2" | 3 | LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492" |
5 | 5 | ||
6 | DEPENDS += "virtual/kernel openssl" | 6 | DEPENDS += "virtual/kernel openssl" |
7 | RDEPENDS_${PN} = "bash python" | 7 | RDEPENDS_${PN} = "bash python" |
@@ -11,9 +11,8 @@ inherit module | |||
11 | 11 | ||
12 | SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ | 12 | SRC_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 | " |
16 | SRCREV = "076aa8e2f9a4ad7e0a020f5c574371d92afe4a60" | 15 | SRCREV = "11d461d88390eb77bbf695eeddaad8e6f6cc25ce" |
17 | 16 | ||
18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
19 | 18 | ||
@@ -38,16 +37,31 @@ do_compile() { | |||
38 | do_install() { | 37 | do_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 | ||
64 | PACKAGES += "${PN}-examples" | 78 | PACKAGES += "${PN}-examples" |
65 | 79 | ||
66 | FILES_${PN} += "${datadir}/* ${bindir}/* ${sbindir}/*" | 80 | FILES_${PN} += "${datadir}/* ${bindir}/* ${sbindir}/* /usr/share/dpdk/cmdif/include/*" |
67 | FILES_${PN}-dbg += "${bindir}/dpdk-example/.debug \ | 81 | FILES_${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 | " |
87 | FILES_${PN}-examples += "${datadir}/examples" | 101 | FILES_${PN}-examples += "${datadir}/examples" |
88 | 102 | ||
103 | FILES_${PN}-staticdev += "/usr/share/dpdk/cmdif/lib/*.a" | ||
89 | COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)" | 104 | COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)" |