aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunrong Guo <chunrong.guo@nxp.com>2019-07-10 16:01:09 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2019-07-12 17:18:34 -0300
commitb7bf801bf6fc9c7b210602c933bbb8c42b92518d (patch)
treeb41a271be78d3bf8f7834953965c0226b67393bc
parent60585d192208ca1cbebe1c7723ebb4c9d4649046 (diff)
downloadmeta-freescale-b7bf801bf6fc9c7b210602c933bbb8c42b92518d.tar.gz
meta-freescale-b7bf801bf6fc9c7b210602c933bbb8c42b92518d.tar.bz2
meta-freescale-b7bf801bf6fc9c7b210602c933bbb8c42b92518d.zip
vpp-core: update to ff7bf7b
*update to lsdk 1906 tag include the following changes: ff7bf7b - Merge pull request #32 in DQNS/vpp from ~NXA12342/vpp:19.01.1_devel to 19.01.1 5c2b539 - PVT: ipsec: Fixed capability matching for openssl based sha1 authentication a24588f - PVT: dpdk_plugin: introducing ipsec protocol offload 33d0d81 - Fixed Flexbuild integration issues c200b3f - dpdk-ipsec: Fixed ramdom Crash in esp traffic 2a0a031 - Enhanced the VPP startup configuration 05bce64 - Merge pull request #30 in DQNS/vpp from ~NXA19696/vpp:19.01.1 to 19.01.1 c63f8ad - Fixed RPM packaging of VPP libs w.r.t Tag format 85e9d4d - Merge pull request #29 in DQNS/vpp from ~NXA19696/vpp:19.01.1 to 19.01.1 26d2455 - Adding README for NXP platforms 9df88fa - Handled review comments d66c318 - Fixed Debian packing support for arm64 platform 513a05a - Fix for using Best mem pool ops as per platform d0f5fa4 - Updating path for cmake cross compile file fe17e96 - More Compilation Fixes e64c6ca - Cross compilation & RPM pkging known issues cbd68cb - 19.01.1 Release Notes 3262adc - cmake: fix out-of-git-tree build d302022 - Fix vpp crashing when attempting to run in kubernetes Pod 6342e48 - tcp: allow future acks if in window 46ee286 - IPSEC: crash on SA dump when SA are bound to tunnels bad0bcd - Fix crash in barrier sync when vlib_worker_threads is zero 372a33e - buffer chain linearization *update PV to "19.01" *refresh patch *update DEPENDS Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
-rw-r--r--recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch28
-rw-r--r--recipes-extended/vpp-core/files/config.h1
-rw-r--r--recipes-extended/vpp-core/vpp-core.bb54
-rw-r--r--recipes-extended/vpp-core/vpp-core/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch (renamed from recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch)0
-rw-r--r--recipes-extended/vpp-core/vpp-core/0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch42
-rw-r--r--recipes-extended/vpp-core/vpp-core/0001-vpp-core-fix-package_qa-error.patch27
-rw-r--r--recipes-extended/vpp-core/vpp-pkgs.inc49
7 files changed, 129 insertions, 72 deletions
diff --git a/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch b/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch
deleted file mode 100644
index ae1c9cbc..00000000
--- a/recipes-extended/vpp-core/files/0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7005c075cab39c8018d224c2fe56ad2e4f2db340 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 11 Sep 2018 14:08:51 -0700
-Subject: [PATCH] Link vpp-api with shared libs if static is disabled
-
-TODO: this is not complete
----
- src/vpp-api.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vpp-api.am b/src/vpp-api.am
-index 553eafa..30dfe9d 100644
---- a/src/vpp-api.am
-+++ b/src/vpp-api.am
-@@ -23,8 +23,8 @@ libvppapiclient_la_LIBADD = \
- -lpthread -lm -lrt
-
- libvppapiclient_la_LDFLAGS = \
-- -Wl,-L$(top_builddir)/.libs,--whole-archive,-l:libsvm.a,-l:libvppinfra.a,-l:libvlibmemoryclient.a,--no-whole-archive \
-- -Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt
-+ -L$(top_builddir)/.libs -lsvm -lvppinfra -lvlibmemoryclient \
-+ -Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt
-
- libvppapiclient_la_DEPENDENCIES = libvppinfra.la libvlibmemoryclient.la libsvm.la
-
---
-2.7.4
-
diff --git a/recipes-extended/vpp-core/files/config.h b/recipes-extended/vpp-core/files/config.h
deleted file mode 100644
index 2d617618..00000000
--- a/recipes-extended/vpp-core/files/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __PRE_DATA_SIZE 128
diff --git a/recipes-extended/vpp-core/vpp-core.bb b/recipes-extended/vpp-core/vpp-core.bb
index 8274534a..3155543d 100644
--- a/recipes-extended/vpp-core/vpp-core.bb
+++ b/recipes-extended/vpp-core/vpp-core.bb
@@ -1,65 +1,45 @@
DESCRIPTION = "Vector Packet Processing"
-S = "${WORKDIR}/git"
-PV = "18.01"
+S = "${WORKDIR}/git/"
+PV = "19.01"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
-AUTOTOOLS_SCRIPT_PATH = "${S}/src"
+OECMAKE_SOURCEPATH = "${S}/src"
-SRCREV = "d3111f07682585079069b91666afffbc73c79cd8"
+SRCREV = "ff7bf7bdc0fd5a7029abdf9083178d066a42a9fb"
SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/vpp;nobranch=1 \
- file://0001-Link-vpp-api-with-shared-libs-if-static-is-disabled.patch \
file://0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch \
- file://config.h \
- "
-DEPENDS = "dpdk openssl numactl bison-native vpp-core-native"
-DEPENDS_class-native = "bison-native openssl-native"
+ file://0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch \
+ file://0001-vpp-core-fix-package_qa-error.patch \
+"
+DEPENDS = "dpdkvpp openssl python-ply util-linux vpp-core-native"
+
+DEPENDS_class-native = "openssl-native python-ply-native util-linux-native"
-inherit autotools
+inherit cmake
inherit pkgconfig
-inherit python-dir
+inherit python-dir pythonnative
export ARCH="arm64"
+export OPENSSL_PATH = "${RECIPE_SYSROOT}"
+export DPDK_PATH= "${RECIPE_SYSROOT}"
EXTRA_OECONF = " \
- --disable-dependency-tracking \
--with-libtool-sysroot=${SYSROOT} \
--srcdir=${S}/src \
- --enable-perftool \
- --disable-papi \
- --disable-japi \
- --disable-static \
--with-pre-data=128 \
- --disable-flowprobe-plugin --disable-ixge-plugin \
- --disable-memif-plugin --disable-sixrd-plugin --disable-gtpu-plugin \
- --disable-ioam-plugin --disable-lb-plugin --disable-ila-plugin \
- --disable-nat-plugin --disable-l2e-plugin --disable-stn-plugin \
- --disable-pppoe-plugin --disable-kubeproxy-plugin \
- --disable-vom --disable-dpdk-plugin \
+ --without-libnuma \
+ --without-ipv6sr \
"
-EXTRA_OECONF_append_class-native = " --disable-vlib"
-CFLAGS += "-DCLIB_LOG2_CACHE_LINE_BYTES=6"
+CFLAGS += " -mtls-dialect=trad -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I${OPENSSL_PATH}/usr/include -L${OPENSSL_PATH}/lib"
include vpp-pkgs.inc
-
-do_configure_append () {
- ( cd ${B} && mkdir -p vppinfra vpp/app )
- cp ${WORKDIR}/config.h ${S}/src/vlib/config.h
-}
-
-do_install_append() {
- mkdir -p ${D}/etc/vpp
- cp ${S}/src/vpp/conf/startup.conf ${D}/etc/vpp/startup.conf
-}
-
-
BBCLASSEXTEND = "native nativesdk"
COMPATIBLE_MACHINE_class-target = "(qoriq)"
-
diff --git a/recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch b/recipes-extended/vpp-core/vpp-core/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
index 7f838476..7f838476 100644
--- a/recipes-extended/vpp-core/files/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
+++ b/recipes-extended/vpp-core/vpp-core/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch
diff --git a/recipes-extended/vpp-core/vpp-core/0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch b/recipes-extended/vpp-core/vpp-core/0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch
new file mode 100644
index 00000000..7f80b75f
--- /dev/null
+++ b/recipes-extended/vpp-core/vpp-core/0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch
@@ -0,0 +1,42 @@
+From 205ebcd8eed1347330e7ebda616970d880bb03d7 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Tue, 9 Jul 2019 10:36:27 +0200
+Subject: [PATCH] getcpu:rename getcpu to avoid conflict with glibc >= 2.29
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
+---
+ src/vppinfra/linux/syscall.h | 2 +-
+ src/vppinfra/pmalloc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vppinfra/linux/syscall.h b/src/vppinfra/linux/syscall.h
+index 1ae029d..fa65a47 100644
+--- a/src/vppinfra/linux/syscall.h
++++ b/src/vppinfra/linux/syscall.h
+@@ -20,7 +20,7 @@
+ #include <sys/syscall.h>
+
+ static inline int
+-getcpu (unsigned *cpu, unsigned *node, void *tcache)
++getcpu0 (unsigned *cpu, unsigned *node, void *tcache)
+ {
+ return syscall (__NR_getcpu, cpu, node, tcache);
+ }
+diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c
+index 365ee04..7dbca86 100644
+--- a/src/vppinfra/pmalloc.c
++++ b/src/vppinfra/pmalloc.c
+@@ -53,7 +53,7 @@ pmalloc_validate_numa_node (u32 * numa_node)
+ if (*numa_node == CLIB_PMALLOC_NUMA_LOCAL)
+ {
+ u32 cpu;
+- if (getcpu (&cpu, numa_node, 0) != 0)
++ if (getcpu0 (&cpu, numa_node, 0) != 0)
+ return 1;
+ }
+ return 0;
+--
+2.7.4
+
diff --git a/recipes-extended/vpp-core/vpp-core/0001-vpp-core-fix-package_qa-error.patch b/recipes-extended/vpp-core/vpp-core/0001-vpp-core-fix-package_qa-error.patch
new file mode 100644
index 00000000..a312b49d
--- /dev/null
+++ b/recipes-extended/vpp-core/vpp-core/0001-vpp-core-fix-package_qa-error.patch
@@ -0,0 +1,27 @@
+From ba3c9e624cf7ca370d6500c04428116939076bf1 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Wed, 10 Jul 2019 09:44:34 +0200
+Subject: [PATCH] vpp-core:fix package_qa error
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0326dbd..116bec3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -51,7 +51,6 @@ endif()
+ ##############################################################################
+ # install config
+ ##############################################################################
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ set(CMAKE_INSTALL_MESSAGE NEVER)
+
+ include_directories (
+--
+2.7.4
+
diff --git a/recipes-extended/vpp-core/vpp-pkgs.inc b/recipes-extended/vpp-core/vpp-pkgs.inc
index 0dc76092..77257859 100644
--- a/recipes-extended/vpp-core/vpp-pkgs.inc
+++ b/recipes-extended/vpp-core/vpp-pkgs.inc
@@ -11,7 +11,10 @@ PACKAGES += "vpp-core-data vpp-core-plugin-igmp vpp-core-plugin-gtpu vpp-core-pl
vpp-core-plugin-nat_test vpp-core-plugin-acl_test vpp-core-plugin-ioam_export_test \
vpp-core-plugin-flowprobe_test vpp-core-plugin-ioam_pot_test \
vpp-core-plugin-vxlan_gpe_ioam_export_test vpp-core-plugin-pppoe_test vpp-core-plugin-gtpu_test \
- vpp-core-plugin-cdp_test vpp-core-plugin-dpdk vpp-core-plugin-dpdk_test vpp-core-test \
+ vpp-core-plugin-cdp_test vpp-core-plugin-dpdk vpp-core-plugin-dpdk_test vpp-core-plugin-vmxnet3_test \
+ vpp-core-plugin-vmxnet3 vpp-core-plugin-svs vpp-core-test vpp-core-plugin-nsh_test \
+ vpp-core-plugin-ioam_test vpp-core-plugin-nsim_test vpp-core-plugin-nsim vpp-core-plugin-perfmon \
+ vpp-core-plugin-nsh \
vpp-core-plugin-tlsopenssl vpp-core-plugin-ixge vpp-core-plugin-ila vpp-core-plugin-data \
"
@@ -54,6 +57,11 @@ FILES_${PN}-plugin-nat = " ${libdir}/vpp_plugins/nat_plugin.so "
FILES_${PN}-plugin-srv6am = " ${libdir}/vpp_plugins/srv6am_plugin.so "
FILES_${PN}-plugin-dpdk = " ${libdir}/vpp_plugins/dpdk_plugin.so "
FILES_${PN}-plugin-ila = " ${libdir}/vpp_plugins/ila_plugin.so "
+FILES_${PN}-plugin-svs = " ${libdir}/vpp_plugins/svs_plugin.so "
+FILES_${PN}-plugin-nsh = " ${libdir}/vpp_plugins/nsh_plugin.so "
+FILES_${PN}-plugin-vmxnet3 = " ${libdir}/vpp_plugins/vmxnet3_plugin.so "
+FILES_${PN}-plugin-perfmon = " ${libdir}/vpp_plugins/perfmon_plugin.so "
+FILES_${PN}-plugin-nsim = " ${libdir}/vpp_plugins/nsim_plugin.so"
FILES_${PN}-plugin-lb_test = " ${libdir}/vpp_api_test_plugins/lb_test_plugin.so "
FILES_${PN}-plugin-ioam_vxlan_gpe_test = " ${libdir}/vpp_api_test_plugins/ioam_vxlan_gpe_test_plugin.so "
@@ -75,6 +83,11 @@ FILES_${PN}-plugin-pppoe_test = " ${libdir}/vpp_api_test_plugins/pppoe_test_plu
FILES_${PN}-plugin-gtpu_test = " ${libdir}/vpp_api_test_plugins/gtpu_test_plugin.so "
FILES_${PN}-plugin-cdp_test = " ${libdir}/vpp_api_test_plugins/cdp_test_plugin.so "
FILES_${PN}-plugin-dpdk_test = " ${libdir}/vpp_api_test_plugins/dpdk_test_plugin.so "
+FILES_${PN}-plugin-nsh_test = " ${libdir}/vpp_api_test_plugins/nsh_test_plugin.so "
+FILES_${PN}-plugin-ioam_test = " ${libdir}/vpp_api_test_plugins/ioam_test_plugin.so "
+FILES_${PN}-plugin-vmxnet3_test = " ${libdir}/vpp_api_test_plugins/vmxnet3_test_plugin.so "
+FILES_${PN}-plugin-nsim_test = " ${libdir}/vpp_api_test_plugins/nsim_test_plugin.so "
+
FILES_${PN}-data = " \
${datadir}/vpp/api/core/sctp.api.json \
@@ -130,8 +143,10 @@ FILES_${PN}-data = " \
${datadir}/vpp/C.py \
${datadir}/vpp/api/core/flow.api.json \
${datadir}/vpp/api/core/map.api.json \
- ${datadir}/vpp/api/core/dpdk.api.json \
- ${datadir}/vpp/JSON.py "
+ ${datadir}/vpp/api/core/dpdk.api.json \
+ ${datadir}/vpp/JSON.py \
+ ${datadir}/vpp/vppapigen_json.py \
+ ${datadir}/vpp/vppapigen_c.py "
FILES_${PN} = " \
@@ -142,6 +157,8 @@ FILES_${PN} = " \
${bindir}/svmdbtool \
${bindir}/svmtool \
${bindir}/vppapigen \
+ ${bindir}/vpp_get_stats \
+ ${bindir}/vpp_prometheus_export \
${bindir}/elftool \
${bindir}/cpelatency \
${bindir}/cpelinreg \
@@ -176,7 +193,19 @@ FILES_${PN} = " \
${libdir}/libvnet.so.0.0.0 \
${libdir}/libvppapiclient.so.0 \
${libdir}/libvppapiclient.so.0.0.0 \
- ${libdir}/libvppcom.so.0 \
+ ${libdir}/libvppcom.so.19.06 \
+ ${libdir}/libvppapiclient.so.19.06 \
+ ${libdir}/libsvm.so.19.06 \
+ ${libdir}/libvcl_ldpreload.so.19.06 \
+ ${libdir}/libvlibmemoryclient.so.19.06 \
+ ${libdir}/libvnet.so.19.06 \
+ ${libdir}/libvapiclient.so.19.06 \
+ ${libdir}/libvlibmemory.so.19.06 \
+ ${libdir}/libvppinfra.so.19.06 \
+ ${libdir}/usr/lib/libvppcom.so.19.06 \
+ ${libdir}/libvlib.so.19.06 \
+ ${libdir}/libvatplugin.so.19.06 \
+ ${libdir}/libsvmdb.so.19.06 \
${libdir}/libvppcom.so.0.0.0 \
${libdir}/libvppinfra.so.0 \
${libdir}/libvppinfra.so.0.0.0 \
@@ -207,7 +236,14 @@ FILES_${PN}-plugin-data = " \
${datadir}/vpp/api/plugins/gtpu.api.json \
${datadir}/vpp/api/plugins/trace.api.json \
${datadir}/vpp/api/plugins/dpdk.api.json \
- ${datadir}/vpp/api/plugins/cdp.api.json "
+ ${datadir}/vpp/api/plugins/cdp.api.json \
+ ${datadir}/vpp/api/plugins/nsh.api.json \
+ ${datadir}/vpp/api/plugins/nsim.api.json \
+ ${datadir}/vpp/api/plugins/svs.api.json \
+ ${datadir}/vpp/api/plugins/vmxnet3.api.json \
+ ${datadir}/vpp/api/core/syslog.api.json \
+ ${datadir}/vpp/api/core/vxlan_gbp.api.json \
+ ${datadir}/vpp/plugins/perfmon/PerfmonTables.tar.xz "
FILES_${PN}-dev = " \
${includedir}/* \
@@ -223,5 +259,6 @@ FILES_${PN}-dev = " \
${libdir}/libvnet.so \
${libdir}/libvppinfra.so \
${libdir}/libcperf.so \
- ${libdir}/libvlibmemoryclient.so "
+ ${libdir}/libvlibmemoryclient.so \
+ ${libdir}/cmake/vpp/*.cmake "