diff options
Diffstat (limited to 'recipes-extended/vpp-core')
10 files changed, 0 insertions, 679 deletions
diff --git a/recipes-extended/vpp-core/dpdkvpp.bb b/recipes-extended/vpp-core/dpdkvpp.bb deleted file mode 100644 index 309a6101..00000000 --- a/recipes-extended/vpp-core/dpdkvpp.bb +++ /dev/null @@ -1,127 +0,0 @@ -DESCRIPTION = "Data Plane Development Kit" -HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" -LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ - file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://0001-add-Wno-cast-function-type.patch \ - file://0001-Add-RTE_KERNELDIR_OUT.patch \ - file://0004-update-WERROR_FLAGS.patch \ -" -SRCREV = "a36da6a94243015b228c15b8b9aa1e650fd4b96d" - -RDEPENDS_${PN} += "python-subprocess" -DEPENDS = "virtual/kernel openssl" -DEPENDS_append_x86-64 = " numactl" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -inherit module - -COMPATIBLE_HOST = '(aarch64|arm|i.86|x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' -COMPATIBLE_HOST_armv4 = 'null' -COMPATIBLE_HOST_armv5 = 'null' -COMPATIBLE_HOST_armv6 = 'null' - -COMPATIBLE_MACHINE = "(imx|qoriq)" - -DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc" -DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc" -DPDK_RTE_TARGET_armv7a = "${ARCH}-armv7a-linuxapp-gcc" -DPDK_RTE_TARGET_armv7ve = "${ARCH}-armv7a-linuxapp-gcc" -DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc" - -TLSDIALECT ?= "" -TLSDIALECT_aarch64 ?= "-ftls-model=local-dynamic" - -export RTE_TARGET = "${DPDK_RTE_TARGET}" -export RTE_OUTPUT = "${S}/${RTE_TARGET}" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \ - OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \ - RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \ -' -do_configure () { - ############################################################# - ### default value for prefix is "usr", unsetting it, so it - ### will not be concatenated in ${RTE_TARGET}/Makefile - ### which will cause compilation failure - ############################################################# - unset prefix - oe_runmake O=$RTE_TARGET T=$RTE_TARGET config -} - -do_compile () { - unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS - - cd ${S}/${RTE_TARGET} - oe_runmake CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_KNI_KMOD=y \ - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y \ - EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR} -Ofast -fPIC ${TLSDIALECT}" \ - CROSS="${TARGET_PREFIX}" \ - prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1 - - cd ${S}/examples/ - for APP in l2fwd l3fwd cmdif l2fwd-qdma l2fwd-crypto ipsec-secgw vhost kni ip_fragmentation ip_reassembly; do - temp=`basename ${APP}` - if [ ${temp} = "ipsec-secgw" ] || [ ${temp} = "l2fwd-crypto" ]; then - oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \ - CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}" - else - oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ - EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \ - CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}/" - fi - done - -} - -do_install () { - oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D} - oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D} - - # Install examples - install -d 0644 ${D}/${datadir}/dpdk/cmdif/include - install -d 0644 ${D}/${datadir}/dpdk/cmdif/lib - cp examples/cmdif/lib/client/fsl_cmdif_client.h examples/cmdif/lib/server/fsl_cmdif_server.h \ - examples/cmdif/lib/shbp/fsl_shbp.h ${D}/${datadir}/dpdk/cmdif/include - cp examples/cmdif/lib/${RTE_TARGET}/librte_cmdif.a ${D}/${datadir}/dpdk/cmdif/lib - install -d 0644 ${D}/${datadir}/dpdk/examples/ipsec_secgw - cp -r ${S}/examples/ipsec-secgw/*.cfg ${D}/${datadir}/dpdk/examples/ipsec_secgw - cp -rf ${S}/nxp/* ${D}/${datadir}/dpdk - - # Remove the unneeded dir - rm -rf ${D}/${datadir}/${RTE_TARGET}/app -} - -PACKAGES += "${PN}-examples" - -FILES_${PN}-dbg += " \ - ${datadir}/dpdk/.debug \ - ${datadir}/dpdk/examples/*/.debug \ - " -FILES_${PN}-staticdev += "${datadir}/dpdk/cmdif/lib/*.a \ -" -FILES_${PN}-dev += " \ - ${datadir}/dpdk/${RTE_TARGET}/.config \ - ${includedir} \ - ${includedir}/exec-env \ - ${datadir}/dpdk/buildtools/ \ - ${datadir}/dpdk/${RTE_TARGET}/include \ - ${datadir}/dpdk/${RTE_TARGET}/lib \ - ${datadir}/dpdk/mk \ - " - -FILES_${PN} += " ${datadir}/ \ - ${prefix}/sbin/ \ - ${prefix}/bin/ \ - ${libdir}/ \ - " -FILES_${PN}-examples += " \ - ${datadir}/examples/* \ - " diff --git a/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch b/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch deleted file mode 100644 index 64a6876f..00000000 --- a/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ea737c1d5a185d56ee1d6da18172b389ea90760 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Wed, 3 Jul 2019 08:50:45 +0200 -Subject: [PATCH] Add RTE_KERNELDIR_OUT - -Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> ---- - kernel/linux/kni/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile -index 282be7b..dfbebdc 100644 ---- a/kernel/linux/kni/Makefile -+++ b/kernel/linux/kni/Makefile -@@ -20,7 +20,7 @@ MODULE_CFLAGS += -Wall -Werror - - ifeq ($(DISTRIB_ID),Ubuntu) - MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) --UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ -+UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR_OUT)/include/generated/utsrelease.h \ - | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) - MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" - endif --- -2.7.4 - diff --git a/recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch b/recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch deleted file mode 100644 index c074eac6..00000000 --- a/recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch +++ /dev/null @@ -1,27 +0,0 @@ -From beb13be8023beb68499c72e71a79b8f91784e484 Mon Sep 17 00:00:00 2001 -From: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com> -Date: Wed, 27 Mar 2019 09:35:43 +0100 -Subject: [PATCH] add -Wno-cast-function-type - -Upstream-Status: Inappropriate [configuration] - ---- - examples/cmdif/lib/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/cmdif/lib/Makefile b/examples/cmdif/lib/Makefile -index d28badf..4e9851c 100644 ---- a/examples/cmdif/lib/Makefile -+++ b/examples/cmdif/lib/Makefile -@@ -28,7 +28,7 @@ SRCS-y += server/cmdif_srv_gpp.c - SRCS-y += shbp/shbp.c - - CFLAGS += -O3 --CFLAGS += $(WERROR_FLAGS) -+CFLAGS += $(WERROR_FLAGS) -Wno-cast-function-type -Wno-missing-attributes - CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib - CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/client - CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/server --- -2.7.4 - diff --git a/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch b/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch deleted file mode 100644 index 9249b2b5..00000000 --- a/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3828a36fa537a187127a1c9b82ce2f5959b88367 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Thu, 4 Jul 2019 08:03:56 +0200 -Subject: [PATCH] update WERROR_FLAGS - -Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> ---- - kernel/linux/kni/Makefile | 2 +- - mk/toolchain/gcc/rte.vars.mk | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile -index dfbebdc..8b5c13e 100644 ---- a/kernel/linux/kni/Makefile -+++ b/kernel/linux/kni/Makefile -@@ -14,7 +14,7 @@ MODULE = rte_kni - MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 - MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -I$(SRCDIR)/ethtool/ixgbe -I$(SRCDIR)/ethtool/igb - MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h --MODULE_CFLAGS += -Wall -Werror -+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes - - -include /etc/lsb-release - -diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk -index aa94344..81efa1c 100644 ---- a/mk/toolchain/gcc/rte.vars.mk -+++ b/mk/toolchain/gcc/rte.vars.mk -@@ -49,6 +49,7 @@ WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual - WERROR_FLAGS += -Wformat-nonliteral -Wformat-security - WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - WERROR_FLAGS += -Wno-error=pedantic -+WERROR_FLAGS += -Wno-address-of-packed-member - - ifeq ($(RTE_DEVEL_BUILD),y) - WERROR_FLAGS += -Werror --- -2.7.4 - diff --git a/recipes-extended/vpp-core/dpdkvpp/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/recipes-extended/vpp-core/dpdkvpp/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch deleted file mode 100644 index 4657f070..00000000 --- a/recipes-extended/vpp-core/dpdkvpp/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001 -From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> -Date: Fri, 18 Dec 2015 18:30:47 +0800 -Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build - artifact - -Introduce RTE_KERNELDIR_OUT to be the path to which kernel build -artifacts are located. This is for matching the workflow change -since Yocto Project v1.8 onwards whereby tmp/work-shared contains -separate directories for kernel source and kernel artifacts. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> ---- - mk/rte.module.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mk/rte.module.mk b/mk/rte.module.mk -index 53ed4fe..b7a014b 100644 ---- a/mk/rte.module.mk -+++ b/mk/rte.module.mk -@@ -77,7 +77,7 @@ build: _postbuild - # build module - $(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - - # install module in $(RTE_OUTPUT)/kmod -@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - - # install module - modules_install: -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - modules_install - - .PHONY: clean -@@ -98,7 +98,7 @@ clean: _postclean - .PHONY: doclean - doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean -+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi --- -1.9.1 diff --git a/recipes-extended/vpp-core/vpp-core.bb b/recipes-extended/vpp-core/vpp-core.bb deleted file mode 100644 index 53437d1a..00000000 --- a/recipes-extended/vpp-core/vpp-core.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "Vector Packet Processing" - -S = "${WORKDIR}/git/" -PV = "19.01" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" - -OECMAKE_SOURCEPATH = "${S}/src" - -SRCREV = "ea4f900311027e4c50f101e08c12920f6e2ddf8d" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/vpp;nobranch=1 \ - file://0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch \ - 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 cmake -inherit pkgconfig -inherit python-dir pythonnative - -export ARCH="arm64" -export OPENSSL_PATH = "${RECIPE_SYSROOT}" -export DPDK_PATH= "${RECIPE_SYSROOT}" - -EXTRA_OECONF = " \ - --with-libtool-sysroot=${SYSROOT} \ - --srcdir=${S}/src \ - --with-pre-data=128 \ - --without-libnuma \ - --without-ipv6sr \ -" - -CFLAGS += " -mtls-dialect=trad -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I${OPENSSL_PATH}/usr/include -L${OPENSSL_PATH}/lib" - -do_install_append() { - mkdir -p ${D}/etc/vpp - cp ${S}/src/vpp/conf/startup.conf ${D}/etc/vpp/startup.conf -} - -include vpp-pkgs.inc - -BBCLASSEXTEND = "native nativesdk" - -COMPATIBLE_MACHINE_class-target = "(qoriq)" diff --git a/recipes-extended/vpp-core/vpp-core/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 deleted file mode 100644 index 7f838476..00000000 --- a/recipes-extended/vpp-core/vpp-core/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6dab3ad3f91ebcdb16eb9bbb37383718793b675a Mon Sep 17 00:00:00 2001 -From: babak sarashki <babak.sarashki@windriver.com> -Date: Sat, 29 Sep 2018 09:57:05 -0700 -Subject: [PATCH] GCC above 5.4 fails when we specify arch funattribute. - -Here we are as a workaround setting target. ---- - src/vppinfra/cpu.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h -index 110815c..618276c 100644 ---- a/src/vppinfra/cpu.h -+++ b/src/vppinfra/cpu.h -@@ -27,7 +27,7 @@ - - #if __x86_64__ && CLIB_DEBUG == 0 - #define foreach_march_variant(macro, x) \ -- macro(avx2, x, "arch=core-avx2") -+ macro(avx2, x, "avx2") - #else - #define foreach_march_variant(macro, x) - #endif --- -2.7.4 - 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 deleted file mode 100644 index 7f80b75f..00000000 --- a/recipes-extended/vpp-core/vpp-core/0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index a312b49d..00000000 --- a/recipes-extended/vpp-core/vpp-core/0001-vpp-core-fix-package_qa-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index be54e6cd..00000000 --- a/recipes-extended/vpp-core/vpp-pkgs.inc +++ /dev/null @@ -1,264 +0,0 @@ - -PACKAGES += "vpp-core-data vpp-core-plugin-igmp vpp-core-plugin-gtpu vpp-core-plugin-gbp \ - vpp-core-plugin-lb vpp-core-plugin-avf vpp-core-plugin-cdp vpp-core-plugin-map vpp-core-plugin-srv6as \ - vpp-core-plugin-l2e vpp-core-plugin-acl vpp-core-plugin-flowprobe vpp-core-plugin-abf \ - vpp-core-plugin-pppoe vpp-core-plugin-lacp vpp-core-plugin-ioam vpp-core-plugin-memif \ - vpp-core-plugin-stn vpp-core-plugin-srv6ad vpp-core-plugin-mactime vpp-core-plugin-unittest \ - vpp-core-plugin-nat vpp-core-plugin-srv6am vpp-core-plugin-lb_test \ - vpp-core-plugin-ioam_vxlan_gpe_test vpp-core-plugin-map_test vpp-core-plugin-avf_test \ - vpp-core-plugin-mactime_test vpp-core-plugin-udp_ping_test vpp-core-plugin-ioam_trace_test \ - vpp-core-plugin-lacp_test vpp-core-plugin-stn_test vpp-core-plugin-memif_test \ - 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-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 \ - " - -#vpp-core-python -#FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/requires.txt \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/PKG-INFO \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/top_level.txt \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/dependency_links.txt \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/zip-safe \ -# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/SOURCES.txt \ -# " - -FILES_${PN}-test = " ${bindir}/vpp_json_test " -FILES_${PN}-plugin-igmp = " ${libdir}/vpp_plugins/igmp_plugin.so " -FILES_${PN}-plugin-gtpu = " ${libdir}/vpp_plugins/gtpu_plugin.so " -FILES_${PN}-plugin-gbp = " ${libdir}/vpp_plugins/gbp_plugin.so " -FILES_${PN}-plugin-lb = " ${libdir}/vpp_plugins/lb_plugin.so " -FILES_${PN}-plugin-avf = " ${libdir}/vpp_plugins/avf_plugin.so " -FILES_${PN}-plugin-cdp = " ${libdir}/vpp_plugins/cdp_plugin.so " -FILES_${PN}-plugin-map = " ${libdir}/vpp_plugins/map_plugin.so " -FILES_${PN}-plugin-srv6as = " ${libdir}/vpp_plugins/srv6as_plugin.so " -FILES_${PN}-plugin-tlsopenssl = " ${libdir}/vpp_plugins/tlsopenssl_plugin.so " -FILES_${PN}-plugin-ixge = " ${libdir}/vpp_plugins/ixge_plugin.so " -FILES_${PN}-plugin-l2e = " ${libdir}/vpp_plugins/l2e_plugin.so " -FILES_${PN}-plugin-acl = " ${libdir}/vpp_plugins/acl_plugin.so " -FILES_${PN}-plugin-flowprobe = " ${libdir}/vpp_plugins/flowprobe_plugin.so " -FILES_${PN}-plugin-abf = " ${libdir}/vpp_plugins/abf_plugin.so " -FILES_${PN}-plugin-pppoe = " ${libdir}/vpp_plugins/pppoe_plugin.so " -FILES_${PN}-plugin-lacp = " ${libdir}/vpp_plugins/lacp_plugin.so " -FILES_${PN}-plugin-ioam = " ${libdir}/vpp_plugins/ioam_plugin.so " -FILES_${PN}-plugin-memif = " ${libdir}/vpp_plugins/memif_plugin.so " -FILES_${PN}-plugin-stn = " ${libdir}/vpp_plugins/stn_plugin.so " -FILES_${PN}-plugin-srv6ad = " ${libdir}/vpp_plugins/srv6ad_plugin.so " -FILES_${PN}-plugin-mactime = " ${libdir}/vpp_plugins/mactime_plugin.so " -FILES_${PN}-plugin-unittest = " ${libdir}/vpp_plugins/unittest_plugin.so " -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 " -FILES_${PN}-plugin-map_test = " ${libdir}/vpp_api_test_plugins/map_test_plugin.so " -FILES_${PN}-plugin-avf_test = " ${libdir}/vpp_api_test_plugins/avf_test_plugin.so " -FILES_${PN}-plugin-mactime_test = " ${libdir}/vpp_api_test_plugins/mactime_test_plugin.so " -FILES_${PN}-plugin-udp_ping_test = " ${libdir}/vpp_api_test_plugins/udp_ping_test_plugin.so " -FILES_${PN}-plugin-ioam_trace_test = " ${libdir}/vpp_api_test_plugins/ioam_trace_test_plugin.so " -FILES_${PN}-plugin-lacp_test = " ${libdir}/vpp_api_test_plugins/lacp_test_plugin.so " -FILES_${PN}-plugin-stn_test = " ${libdir}/vpp_api_test_plugins/stn_test_plugin.so " -FILES_${PN}-plugin-memif_test = " ${libdir}/vpp_api_test_plugins/memif_test_plugin.so " -FILES_${PN}-plugin-nat_test = " ${libdir}/vpp_api_test_plugins/nat_test_plugin.so " -FILES_${PN}-plugin-acl_test = " ${libdir}/vpp_api_test_plugins/acl_test_plugin.so " -FILES_${PN}-plugin-ioam_export_test = " ${libdir}/vpp_api_test_plugins/ioam_export_test_plugin.so " -FILES_${PN}-plugin-flowprobe_test = " ${libdir}/vpp_api_test_plugins/flowprobe_test_plugin.so " -FILES_${PN}-plugin-ioam_pot_test = " ${libdir}/vpp_api_test_plugins/ioam_pot_test_plugin.so " -FILES_${PN}-plugin-vxlan_gpe_ioam_export_test = " ${libdir}/vpp_api_test_plugins/vxlan_gpe_ioam_export_test_plugin.so " -FILES_${PN}-plugin-pppoe_test = " ${libdir}/vpp_api_test_plugins/pppoe_test_plugin.so " -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 \ - ${datadir}/vpp/api/core/sr.api.json \ - ${datadir}/vpp/api/core/gre.api.json \ - ${datadir}/vpp/api/core/lisp.api.json \ - ${datadir}/vpp/api/core/netmap.api.json \ - ${datadir}/vpp/api/core/tcp.api.json \ - ${datadir}/vpp/api/core/ipsec_gre.api.json \ - ${datadir}/vpp/api/core/bfd.api.json \ - ${datadir}/vpp/api/core/tap.api.json \ - ${datadir}/vpp/api/core/oam.api.json \ - ${datadir}/vpp/api/core/vpe.api.json \ - ${datadir}/vpp/api/core/bier.api.json \ - ${datadir}/vpp/api/core/ipsec.api.json \ - ${datadir}/vpp/api/core/af_packet.api.json \ - ${datadir}/vpp/api/core/vxlan_gpe.api.json \ - ${datadir}/vpp/api/core/session.api.json \ - ${datadir}/vpp/api/core/one.api.json \ - ${datadir}/vpp/api/core/sr_mpls.api.json \ - ${datadir}/vpp/api/core/feature.api.json \ - ${datadir}/vpp/api/core/p2p_ethernet.api.json \ - ${datadir}/vpp/api/core/memclnt.api.json \ - ${datadir}/vpp/api/core/pg.api.json \ - ${datadir}/vpp/api/core/l2.api.json \ - ${datadir}/vpp/api/core/punt.api.json \ - ${datadir}/vpp/api/core/classify.api.json \ - ${datadir}/vpp/api/core/policer.api.json \ - ${datadir}/vpp/api/core/span.api.json \ - ${datadir}/vpp/api/core/udp.api.json \ - ${datadir}/vpp/api/core/vxlan.api.json \ - ${datadir}/vpp/api/core/mpls.api.json \ - ${datadir}/vpp/api/core/qos.api.json \ - ${datadir}/vpp/api/core/ip.api.json \ - ${datadir}/vpp/api/core/ipip.api.json \ - ${datadir}/vpp/api/core/bond.api.json \ - ${datadir}/vpp/api/core/dns.api.json \ - ${datadir}/vpp/api/core/tapv2.api.json \ - ${datadir}/vpp/api/core/pipe.api.json \ - ${datadir}/vpp/api/core/dhcp6_pd_client_cp.api.json \ - ${datadir}/vpp/api/core/l2tp.api.json \ - ${datadir}/vpp/api/core/lisp_gpe.api.json \ - ${datadir}/vpp/api/core/cop.api.json \ - ${datadir}/vpp/api/core/geneve.api.json \ - ${datadir}/vpp/api/core/stats.api.json \ - ${datadir}/vpp/api/core/rd_cp.api.json \ - ${datadir}/vpp/api/core/dhcp.api.json \ - ${datadir}/vpp/api/core/lldp.api.json \ - ${datadir}/vpp/api/core/dhcp6_ia_na_client_cp.api.json \ - ${datadir}/vpp/api/core/ipfix_export.api.json \ - ${datadir}/vpp/api/core/vhost_user.api.json \ - ${datadir}/vpp/api/core/interface.api.json \ - ${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/vppapigen_json.py \ - ${datadir}/vpp/vppapigen_c.py " - - -FILES_${PN} = " \ - ${sysconfdir}/vpp \ - ${sysconfdir}/vpp/startup.conf \ - ${sysconfdir}/vpp/startup.conf.dflt \ - ${sysconfdir}/rc.local \ - ${bindir}/svmdbtool \ - ${bindir}/svmtool \ - ${bindir}/vppapigen \ - ${bindir}/vpp_get_stats \ - ${bindir}/vpp_prometheus_export \ - ${bindir}/elftool \ - ${bindir}/cpelatency \ - ${bindir}/cpelinreg \ - ${bindir}/elog_merge \ - ${bindir}/c2cpel \ - ${bindir}/cpelstate \ - ${bindir}/cpeldump \ - ${bindir}/vpp \ - ${bindir}/vpp_api_test \ - ${bindir}/vpp_get_metrics \ - ${bindir}/vpp_restart \ - ${bindir}/vppctl \ - ${libdir}/libcperf.so.0.0.0 \ - ${libdir}/libcperf.so.0 \ - ${libdir}/libsvm.so.0 \ - ${libdir}/libsvm.so.0.0.0 \ - ${libdir}/libsvmdb.so.0 \ - ${libdir}/libsvmdb.so.0.0.0 \ - ${libdir}/libvapiclient.so.0 \ - ${libdir}/libvapiclient.so.0.0.0 \ - ${libdir}/libvatplugin.so.0 \ - ${libdir}/libvatplugin.so.0.0.0 \ - ${libdir}/libvcl_ldpreload.so.0 \ - ${libdir}/libvcl_ldpreload.so.0.0.0 \ - ${libdir}/libvlib.so.0 \ - ${libdir}/libvlib.so.0.0.0 \ - ${libdir}/libvlibmemory.so.0 \ - ${libdir}/libvlibmemory.so.0.0.0 \ - ${libdir}/libvlibmemoryclient.so.0 \ - ${libdir}/libvlibmemoryclient.so.0.0.0 \ - ${libdir}/libvnet.so.0 \ - ${libdir}/libvnet.so.0.0.0 \ - ${libdir}/libvppapiclient.so.0 \ - ${libdir}/libvppapiclient.so.0.0.0 \ - ${libdir}/libvppcom.so.19.09 \ - ${libdir}/libvppapiclient.so.19.09 \ - ${libdir}/libsvm.so.19.09 \ - ${libdir}/libvcl_ldpreload.so.19.09 \ - ${libdir}/libvlibmemoryclient.so.19.09 \ - ${libdir}/libvnet.so.19.09 \ - ${libdir}/libvapiclient.so.19.09 \ - ${libdir}/libvlibmemory.so.19.09 \ - ${libdir}/libvppinfra.so.19.09 \ - ${libdir}/usr/lib/libvppcom.so.19.09 \ - ${libdir}/libvlib.so.19.09 \ - ${libdir}/libvatplugin.so.19.09 \ - ${libdir}/libsvmdb.so.19.09 \ - ${libdir}/libvppcom.so.0.0.0 \ - ${libdir}/libvppinfra.so.0 \ - ${libdir}/libvppinfra.so.0.0.0 \ - " - -FILES_${PN}-plugin-data = " \ - ${datadir}/vpp/api/plugins/pot.api.json \ - ${datadir}/vpp/api/plugins/pppoe.api.json \ - ${datadir}/vpp/api/plugins/igmp.api.json \ - ${datadir}/vpp/api/plugins/avf.api.json \ - ${datadir}/vpp/api/plugins/mactime.api.json \ - ${datadir}/vpp/api/plugins/gbp.api.json \ - ${datadir}/vpp/api/plugins/map.api.json \ - ${datadir}/vpp/api/plugins/udp_ping.api.json \ - ${datadir}/vpp/api/plugins/l2e.api.json \ - ${datadir}/vpp/api/plugins/ioam_export.api.json \ - ${datadir}/vpp/api/plugins/lb.api.json \ - ${datadir}/vpp/api/plugins/vxlan_gpe_ioam_export.api.json \ - ${datadir}/vpp/api/plugins/ioam_vxlan_gpe.api.json \ - ${datadir}/vpp/api/plugins/acl.api.json \ - ${datadir}/vpp/api/plugins/ioam_cache.api.json \ - ${datadir}/vpp/api/plugins/stn.api.json \ - ${datadir}/vpp/api/plugins/abf.api.json \ - ${datadir}/vpp/api/plugins/nat.api.json \ - ${datadir}/vpp/api/plugins/flowprobe.api.json \ - ${datadir}/vpp/api/plugins/memif.api.json \ - ${datadir}/vpp/api/plugins/lacp.api.json \ - ${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/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}/* \ - ${libdir}/libvcl_ldpreload.so \ - ${libdir}/libvppapiclient.so \ - ${libdir}/libvppcom.so \ - ${libdir}/libvlib.so \ - ${libdir}/libsvm.so \ - ${libdir}/libsvmdb.so \ - ${libdir}/libvatplugin.so \ - ${libdir}/libvlibmemory.so \ - ${libdir}/libvapiclient.so \ - ${libdir}/libvnet.so \ - ${libdir}/libvppinfra.so \ - ${libdir}/libcperf.so \ - ${libdir}/libvlibmemoryclient.so \ - ${libdir}/cmake/vpp/*.cmake " - |