summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2020-04-21 07:51:55 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2020-05-06 15:52:35 -0300
commit316ba4d676ab078b6a29d7da7d718b18d8b96d27 (patch)
tree5b3898799178e412796ee51bc8698374a6eeced2 /recipes-extended
parentd831eedd0f57833691361f79d2585e66e91ece24 (diff)
downloadmeta-freescale-316ba4d676ab078b6a29d7da7d718b18d8b96d27.tar.gz
vpp-core/dpdkvpp: rm as it is not supported now
vpp-core fails to build now, no plan to fix it. And no test is done on it with kernel 5.4. Remove it to avoid confusion. dpdkvpp is required for vpp-core compilation. Comparing to dpdk, it changes the thread local storage (TLS) models via -ftls-model option. Remove it along with vpp-core. Signed-off-by: Ting Liu <ting.liu@nxp.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/vpp-core/dpdkvpp.bb126
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch26
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch26
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch39
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch51
-rw-r--r--recipes-extended/vpp-core/vpp-core.bb50
-rw-r--r--recipes-extended/vpp-core/vpp-core/0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch26
-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.inc264
10 files changed, 0 insertions, 677 deletions
diff --git a/recipes-extended/vpp-core/dpdkvpp.bb b/recipes-extended/vpp-core/dpdkvpp.bb
deleted file mode 100644
index 8e8abe86..00000000
--- a/recipes-extended/vpp-core/dpdkvpp.bb
+++ /dev/null
@@ -1,126 +0,0 @@
1DESCRIPTION = "Data Plane Development Kit"
2HOMEPAGE = "http://dpdk.org"
3LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2"
4LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492"
5
6SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \
7 file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
8 file://0001-add-Wno-cast-function-type.patch \
9 file://0001-Add-RTE_KERNELDIR_OUT.patch \
10 file://0004-update-WERROR_FLAGS.patch \
11"
12SRCREV = "4110a5fed09fa034963cfc246a6285911ecbd540"
13
14DEPENDS = "virtual/kernel openssl"
15DEPENDS_append_x86-64 = " numactl"
16do_configure[depends] += "virtual/kernel:do_shared_workdir"
17
18inherit module
19
20COMPATIBLE_HOST = '(aarch64|arm|i.86|x86_64).*-linux'
21COMPATIBLE_HOST_libc-musl = 'null'
22COMPATIBLE_HOST_armv4 = 'null'
23COMPATIBLE_HOST_armv5 = 'null'
24COMPATIBLE_HOST_armv6 = 'null'
25
26COMPATIBLE_MACHINE = "(imx|qoriq)"
27
28DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
29DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc"
30DPDK_RTE_TARGET_armv7a = "${ARCH}-armv7a-linuxapp-gcc"
31DPDK_RTE_TARGET_armv7ve = "${ARCH}-armv7a-linuxapp-gcc"
32DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc"
33
34TLSDIALECT ?= ""
35TLSDIALECT_aarch64 ?= "-ftls-model=local-dynamic"
36
37export RTE_TARGET = "${DPDK_RTE_TARGET}"
38export RTE_OUTPUT = "${S}/${RTE_TARGET}"
39
40S = "${WORKDIR}/git"
41
42EXTRA_OEMAKE += 'ETHTOOL_LIB_PATH="${S}/examples/ethtool/lib/${RTE_TARGET}" RTE_SDK="${S}" \
43 OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
44 RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" EXAMPLES_BUILD_DIR="${RTE_TARGET}" \
45'
46do_configure () {
47 #############################################################
48 ### default value for prefix is "usr", unsetting it, so it
49 ### will not be concatenated in ${RTE_TARGET}/Makefile
50 ### which will cause compilation failure
51 #############################################################
52 unset prefix
53 oe_runmake O=$RTE_TARGET T=$RTE_TARGET config
54}
55
56do_compile () {
57 unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
58
59 cd ${S}/${RTE_TARGET}
60 oe_runmake CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_KNI_KMOD=y \
61 CONFIG_RTE_LIBRTE_PMD_OPENSSL=y \
62 EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \
63 EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR} -Ofast -fPIC ${TLSDIALECT}" \
64 CROSS="${TARGET_PREFIX}" \
65 prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1
66
67 cd ${S}/examples/
68 for APP in l2fwd l3fwd cmdif l2fwd-qdma l2fwd-crypto ipsec-secgw vhost kni ip_fragmentation ip_reassembly; do
69 temp=`basename ${APP}`
70 if [ ${temp} = "ipsec-secgw" ] || [ ${temp} = "l2fwd-crypto" ]; then
71 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
72 EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
73 CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}"
74 else
75 oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
76 EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
77 CROSS="${TARGET_PREFIX}" -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y O="${S}/examples/${temp}/"
78 fi
79 done
80
81}
82
83do_install () {
84 oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D}
85 oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D}
86
87 # Install examples
88 install -d 0644 ${D}/${datadir}/dpdk/cmdif/include
89 install -d 0644 ${D}/${datadir}/dpdk/cmdif/lib
90 cp examples/cmdif/lib/client/fsl_cmdif_client.h examples/cmdif/lib/server/fsl_cmdif_server.h \
91 examples/cmdif/lib/shbp/fsl_shbp.h ${D}/${datadir}/dpdk/cmdif/include
92 cp examples/cmdif/lib/${RTE_TARGET}/librte_cmdif.a ${D}/${datadir}/dpdk/cmdif/lib
93 install -d 0644 ${D}/${datadir}/dpdk/examples/ipsec_secgw
94 cp -r ${S}/examples/ipsec-secgw/*.cfg ${D}/${datadir}/dpdk/examples/ipsec_secgw
95 cp -rf ${S}/nxp/* ${D}/${datadir}/dpdk
96
97 # Remove the unneeded dir
98 rm -rf ${D}/${datadir}/${RTE_TARGET}/app
99}
100
101PACKAGES += "${PN}-examples"
102
103FILES_${PN}-dbg += " \
104 ${datadir}/dpdk/.debug \
105 ${datadir}/dpdk/examples/*/.debug \
106 "
107FILES_${PN}-staticdev += "${datadir}/dpdk/cmdif/lib/*.a \
108"
109FILES_${PN}-dev += " \
110 ${datadir}/dpdk/${RTE_TARGET}/.config \
111 ${includedir} \
112 ${includedir}/exec-env \
113 ${datadir}/dpdk/buildtools/ \
114 ${datadir}/dpdk/${RTE_TARGET}/include \
115 ${datadir}/dpdk/${RTE_TARGET}/lib \
116 ${datadir}/dpdk/mk \
117 "
118
119FILES_${PN} += " ${datadir}/ \
120 ${prefix}/sbin/ \
121 ${prefix}/bin/ \
122 ${libdir}/ \
123 "
124FILES_${PN}-examples += " \
125 ${datadir}/examples/* \
126 "
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 5ee48a59..00000000
--- a/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 9c2b840a1c8ac0fbb638b5cd481909a3f832eed4 Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Wed, 3 Jul 2019 08:50:45 +0200
4Subject: [PATCH] Add RTE_KERNELDIR_OUT
5
6Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
7---
8 kernel/linux/kni/Makefile | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
12index 595bac261..28a31f36a 100644
13--- a/kernel/linux/kni/Makefile
14+++ b/kernel/linux/kni/Makefile
15@@ -20,7 +20,7 @@ MODULE_CFLAGS += -Wall -Werror
16
17 ifeq ($(DISTRIB_ID),Ubuntu)
18 MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE))
19-UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \
20+UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR_OUT)/include/generated/utsrelease.h \
21 | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1)
22 MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"
23 endif
24--
252.17.1
26
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 fa0eda87..00000000
--- a/recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 354c2d1570ddf83a99c4ac711c884644c6dd1cef Mon Sep 17 00:00:00 2001
2From: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com>
3Date: Wed, 27 Mar 2019 09:35:43 +0100
4Subject: [PATCH] add -Wno-cast-function-type
5
6Upstream-Status: Inappropriate [configuration]
7---
8 examples/cmdif/lib/Makefile | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/examples/cmdif/lib/Makefile b/examples/cmdif/lib/Makefile
12index 235c3adbf..230f17b0a 100644
13--- a/examples/cmdif/lib/Makefile
14+++ b/examples/cmdif/lib/Makefile
15@@ -28,7 +28,7 @@ SRCS-y += server/cmdif_srv_gpp.c
16 SRCS-y += shbp/shbp.c
17
18 CFLAGS += -O3
19-CFLAGS += $(WERROR_FLAGS)
20+CFLAGS += $(WERROR_FLAGS) -Wno-cast-function-type -Wno-missing-attributes
21 CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib
22 CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/client
23 CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/server
24--
252.17.1
26
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 61467377..00000000
--- a/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From aa97b9162b68780ca912a226b5045a3ddab41d3c Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Thu, 4 Jul 2019 08:03:56 +0200
4Subject: [PATCH] update WERROR_FLAGS
5
6Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
7---
8 kernel/linux/kni/Makefile | 2 +-
9 mk/toolchain/gcc/rte.vars.mk | 1 +
10 2 files changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
13index 595bac261..a17939996 100644
14--- a/kernel/linux/kni/Makefile
15+++ b/kernel/linux/kni/Makefile
16@@ -14,7 +14,7 @@ MODULE = rte_kni
17 MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50
18 MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
19 MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
20-MODULE_CFLAGS += -Wall -Werror
21+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes
22
23 -include /etc/lsb-release
24
25diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
26index de5e0d24d..ca2cb5fcd 100644
27--- a/mk/toolchain/gcc/rte.vars.mk
28+++ b/mk/toolchain/gcc/rte.vars.mk
29@@ -49,6 +49,7 @@ WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
30 WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
31 WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated
32 WERROR_FLAGS += -Wno-error=pedantic
33+WERROR_FLAGS += -Wno-address-of-packed-member
34
35 ifeq ($(RTE_DEVEL_BUILD),y)
36 WERROR_FLAGS += -Werror
37--
382.17.1
39
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 @@
1From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001
2From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
3Date: Fri, 18 Dec 2015 18:30:47 +0800
4Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build
5 artifact
6
7Introduce RTE_KERNELDIR_OUT to be the path to which kernel build
8artifacts are located. This is for matching the workflow change
9since Yocto Project v1.8 onwards whereby tmp/work-shared contains
10separate directories for kernel source and kernel artifacts.
11
12Upstream-Status: Inappropriate [configuration]
13
14Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
15---
16 mk/rte.module.mk | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/mk/rte.module.mk b/mk/rte.module.mk
20index 53ed4fe..b7a014b 100644
21--- a/mk/rte.module.mk
22+++ b/mk/rte.module.mk
23@@ -77,7 +77,7 @@ build: _postbuild
24 # build module
25 $(MODULE).ko: $(SRCS_LINKS)
26 @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
27- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
28+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
29 CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
30
31 # install module in $(RTE_OUTPUT)/kmod
32@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
33
34 # install module
35 modules_install:
36- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
37+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
38 modules_install
39
40 .PHONY: clean
41@@ -98,7 +98,7 @@ clean: _postclean
42 .PHONY: doclean
43 doclean:
44 @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
45- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
46+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean
47 @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
48 if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
49 @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
50--
511.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 5c7a3560..00000000
--- a/recipes-extended/vpp-core/vpp-core.bb
+++ /dev/null
@@ -1,50 +0,0 @@
1DESCRIPTION = "Vector Packet Processing"
2
3S = "${WORKDIR}/git/"
4PV = "19.01"
5
6LICENSE = "Apache-2.0"
7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
9
10OECMAKE_SOURCEPATH = "${S}/src"
11
12SRCREV = "ea4f900311027e4c50f101e08c12920f6e2ddf8d"
13
14SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/vpp;nobranch=1 \
15 file://0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch \
16 file://0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch \
17 file://0001-vpp-core-fix-package_qa-error.patch \
18"
19DEPENDS = "dpdkvpp openssl python3-ply util-linux vpp-core-native"
20
21DEPENDS_class-native = "openssl-native python3-ply-native util-linux-native"
22
23inherit cmake
24inherit pkgconfig
25inherit python3-dir python3native
26
27export ARCH="arm64"
28export OPENSSL_PATH = "${RECIPE_SYSROOT}"
29export DPDK_PATH= "${RECIPE_SYSROOT}"
30
31EXTRA_OECONF = " \
32 --with-libtool-sysroot=${SYSROOT} \
33 --srcdir=${S}/src \
34 --with-pre-data=128 \
35 --without-libnuma \
36 --without-ipv6sr \
37"
38
39CFLAGS += " -mtls-dialect=trad -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I${OPENSSL_PATH}/usr/include -L${OPENSSL_PATH}/lib"
40
41do_install_append() {
42 mkdir -p ${D}/etc/vpp
43 cp ${S}/src/vpp/conf/startup.conf ${D}/etc/vpp/startup.conf
44}
45
46include vpp-pkgs.inc
47
48BBCLASSEXTEND = "native nativesdk"
49
50COMPATIBLE_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 @@
1From 6dab3ad3f91ebcdb16eb9bbb37383718793b675a Mon Sep 17 00:00:00 2001
2From: babak sarashki <babak.sarashki@windriver.com>
3Date: Sat, 29 Sep 2018 09:57:05 -0700
4Subject: [PATCH] GCC above 5.4 fails when we specify arch funattribute.
5
6Here we are as a workaround setting target.
7---
8 src/vppinfra/cpu.h | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
12index 110815c..618276c 100644
13--- a/src/vppinfra/cpu.h
14+++ b/src/vppinfra/cpu.h
15@@ -27,7 +27,7 @@
16
17 #if __x86_64__ && CLIB_DEBUG == 0
18 #define foreach_march_variant(macro, x) \
19- macro(avx2, x, "arch=core-avx2")
20+ macro(avx2, x, "avx2")
21 #else
22 #define foreach_march_variant(macro, x)
23 #endif
24--
252.7.4
26
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 @@
1From 205ebcd8eed1347330e7ebda616970d880bb03d7 Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Tue, 9 Jul 2019 10:36:27 +0200
4Subject: [PATCH] getcpu:rename getcpu to avoid conflict with glibc >= 2.29
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
9---
10 src/vppinfra/linux/syscall.h | 2 +-
11 src/vppinfra/pmalloc.c | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/vppinfra/linux/syscall.h b/src/vppinfra/linux/syscall.h
15index 1ae029d..fa65a47 100644
16--- a/src/vppinfra/linux/syscall.h
17+++ b/src/vppinfra/linux/syscall.h
18@@ -20,7 +20,7 @@
19 #include <sys/syscall.h>
20
21 static inline int
22-getcpu (unsigned *cpu, unsigned *node, void *tcache)
23+getcpu0 (unsigned *cpu, unsigned *node, void *tcache)
24 {
25 return syscall (__NR_getcpu, cpu, node, tcache);
26 }
27diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c
28index 365ee04..7dbca86 100644
29--- a/src/vppinfra/pmalloc.c
30+++ b/src/vppinfra/pmalloc.c
31@@ -53,7 +53,7 @@ pmalloc_validate_numa_node (u32 * numa_node)
32 if (*numa_node == CLIB_PMALLOC_NUMA_LOCAL)
33 {
34 u32 cpu;
35- if (getcpu (&cpu, numa_node, 0) != 0)
36+ if (getcpu0 (&cpu, numa_node, 0) != 0)
37 return 1;
38 }
39 return 0;
40--
412.7.4
42
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 @@
1From ba3c9e624cf7ca370d6500c04428116939076bf1 Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Wed, 10 Jul 2019 09:44:34 +0200
4Subject: [PATCH] vpp-core:fix package_qa error
5
6Upstream-Status: Inappropriate[oe-specific]
7
8Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
9---
10 src/CMakeLists.txt | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
14index 0326dbd..116bec3 100644
15--- a/src/CMakeLists.txt
16+++ b/src/CMakeLists.txt
17@@ -51,7 +51,6 @@ endif()
18 ##############################################################################
19 # install config
20 ##############################################################################
21-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
22 set(CMAKE_INSTALL_MESSAGE NEVER)
23
24 include_directories (
25--
262.7.4
27
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 @@
1
2PACKAGES += "vpp-core-data vpp-core-plugin-igmp vpp-core-plugin-gtpu vpp-core-plugin-gbp \
3 vpp-core-plugin-lb vpp-core-plugin-avf vpp-core-plugin-cdp vpp-core-plugin-map vpp-core-plugin-srv6as \
4 vpp-core-plugin-l2e vpp-core-plugin-acl vpp-core-plugin-flowprobe vpp-core-plugin-abf \
5 vpp-core-plugin-pppoe vpp-core-plugin-lacp vpp-core-plugin-ioam vpp-core-plugin-memif \
6 vpp-core-plugin-stn vpp-core-plugin-srv6ad vpp-core-plugin-mactime vpp-core-plugin-unittest \
7 vpp-core-plugin-nat vpp-core-plugin-srv6am vpp-core-plugin-lb_test \
8 vpp-core-plugin-ioam_vxlan_gpe_test vpp-core-plugin-map_test vpp-core-plugin-avf_test \
9 vpp-core-plugin-mactime_test vpp-core-plugin-udp_ping_test vpp-core-plugin-ioam_trace_test \
10 vpp-core-plugin-lacp_test vpp-core-plugin-stn_test vpp-core-plugin-memif_test \
11 vpp-core-plugin-nat_test vpp-core-plugin-acl_test vpp-core-plugin-ioam_export_test \
12 vpp-core-plugin-flowprobe_test vpp-core-plugin-ioam_pot_test \
13 vpp-core-plugin-vxlan_gpe_ioam_export_test vpp-core-plugin-pppoe_test vpp-core-plugin-gtpu_test \
14 vpp-core-plugin-cdp_test vpp-core-plugin-dpdk vpp-core-plugin-dpdk_test vpp-core-plugin-vmxnet3_test \
15 vpp-core-plugin-vmxnet3 vpp-core-plugin-svs vpp-core-test vpp-core-plugin-nsh_test \
16 vpp-core-plugin-ioam_test vpp-core-plugin-nsim_test vpp-core-plugin-nsim vpp-core-plugin-perfmon \
17 vpp-core-plugin-nsh \
18 vpp-core-plugin-tlsopenssl vpp-core-plugin-ixge vpp-core-plugin-ila vpp-core-plugin-data \
19 "
20
21#vpp-core-python
22#FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} \
23# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg \
24# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info \
25# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/requires.txt \
26# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/PKG-INFO \
27# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/top_level.txt \
28# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/dependency_links.txt \
29# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/zip-safe \
30# ${PYTHON_SITEPACKAGES_DIR}/vpp_papi-1.6.1-py2.7.egg-info/SOURCES.txt \
31# "
32
33FILES_${PN}-test = " ${bindir}/vpp_json_test "
34FILES_${PN}-plugin-igmp = " ${libdir}/vpp_plugins/igmp_plugin.so "
35FILES_${PN}-plugin-gtpu = " ${libdir}/vpp_plugins/gtpu_plugin.so "
36FILES_${PN}-plugin-gbp = " ${libdir}/vpp_plugins/gbp_plugin.so "
37FILES_${PN}-plugin-lb = " ${libdir}/vpp_plugins/lb_plugin.so "
38FILES_${PN}-plugin-avf = " ${libdir}/vpp_plugins/avf_plugin.so "
39FILES_${PN}-plugin-cdp = " ${libdir}/vpp_plugins/cdp_plugin.so "
40FILES_${PN}-plugin-map = " ${libdir}/vpp_plugins/map_plugin.so "
41FILES_${PN}-plugin-srv6as = " ${libdir}/vpp_plugins/srv6as_plugin.so "
42FILES_${PN}-plugin-tlsopenssl = " ${libdir}/vpp_plugins/tlsopenssl_plugin.so "
43FILES_${PN}-plugin-ixge = " ${libdir}/vpp_plugins/ixge_plugin.so "
44FILES_${PN}-plugin-l2e = " ${libdir}/vpp_plugins/l2e_plugin.so "
45FILES_${PN}-plugin-acl = " ${libdir}/vpp_plugins/acl_plugin.so "
46FILES_${PN}-plugin-flowprobe = " ${libdir}/vpp_plugins/flowprobe_plugin.so "
47FILES_${PN}-plugin-abf = " ${libdir}/vpp_plugins/abf_plugin.so "
48FILES_${PN}-plugin-pppoe = " ${libdir}/vpp_plugins/pppoe_plugin.so "
49FILES_${PN}-plugin-lacp = " ${libdir}/vpp_plugins/lacp_plugin.so "
50FILES_${PN}-plugin-ioam = " ${libdir}/vpp_plugins/ioam_plugin.so "
51FILES_${PN}-plugin-memif = " ${libdir}/vpp_plugins/memif_plugin.so "
52FILES_${PN}-plugin-stn = " ${libdir}/vpp_plugins/stn_plugin.so "
53FILES_${PN}-plugin-srv6ad = " ${libdir}/vpp_plugins/srv6ad_plugin.so "
54FILES_${PN}-plugin-mactime = " ${libdir}/vpp_plugins/mactime_plugin.so "
55FILES_${PN}-plugin-unittest = " ${libdir}/vpp_plugins/unittest_plugin.so "
56FILES_${PN}-plugin-nat = " ${libdir}/vpp_plugins/nat_plugin.so "
57FILES_${PN}-plugin-srv6am = " ${libdir}/vpp_plugins/srv6am_plugin.so "
58FILES_${PN}-plugin-dpdk = " ${libdir}/vpp_plugins/dpdk_plugin.so "
59FILES_${PN}-plugin-ila = " ${libdir}/vpp_plugins/ila_plugin.so "
60FILES_${PN}-plugin-svs = " ${libdir}/vpp_plugins/svs_plugin.so "
61FILES_${PN}-plugin-nsh = " ${libdir}/vpp_plugins/nsh_plugin.so "
62FILES_${PN}-plugin-vmxnet3 = " ${libdir}/vpp_plugins/vmxnet3_plugin.so "
63FILES_${PN}-plugin-perfmon = " ${libdir}/vpp_plugins/perfmon_plugin.so "
64FILES_${PN}-plugin-nsim = " ${libdir}/vpp_plugins/nsim_plugin.so"
65
66FILES_${PN}-plugin-lb_test = " ${libdir}/vpp_api_test_plugins/lb_test_plugin.so "
67FILES_${PN}-plugin-ioam_vxlan_gpe_test = " ${libdir}/vpp_api_test_plugins/ioam_vxlan_gpe_test_plugin.so "
68FILES_${PN}-plugin-map_test = " ${libdir}/vpp_api_test_plugins/map_test_plugin.so "
69FILES_${PN}-plugin-avf_test = " ${libdir}/vpp_api_test_plugins/avf_test_plugin.so "
70FILES_${PN}-plugin-mactime_test = " ${libdir}/vpp_api_test_plugins/mactime_test_plugin.so "
71FILES_${PN}-plugin-udp_ping_test = " ${libdir}/vpp_api_test_plugins/udp_ping_test_plugin.so "
72FILES_${PN}-plugin-ioam_trace_test = " ${libdir}/vpp_api_test_plugins/ioam_trace_test_plugin.so "
73FILES_${PN}-plugin-lacp_test = " ${libdir}/vpp_api_test_plugins/lacp_test_plugin.so "
74FILES_${PN}-plugin-stn_test = " ${libdir}/vpp_api_test_plugins/stn_test_plugin.so "
75FILES_${PN}-plugin-memif_test = " ${libdir}/vpp_api_test_plugins/memif_test_plugin.so "
76FILES_${PN}-plugin-nat_test = " ${libdir}/vpp_api_test_plugins/nat_test_plugin.so "
77FILES_${PN}-plugin-acl_test = " ${libdir}/vpp_api_test_plugins/acl_test_plugin.so "
78FILES_${PN}-plugin-ioam_export_test = " ${libdir}/vpp_api_test_plugins/ioam_export_test_plugin.so "
79FILES_${PN}-plugin-flowprobe_test = " ${libdir}/vpp_api_test_plugins/flowprobe_test_plugin.so "
80FILES_${PN}-plugin-ioam_pot_test = " ${libdir}/vpp_api_test_plugins/ioam_pot_test_plugin.so "
81FILES_${PN}-plugin-vxlan_gpe_ioam_export_test = " ${libdir}/vpp_api_test_plugins/vxlan_gpe_ioam_export_test_plugin.so "
82FILES_${PN}-plugin-pppoe_test = " ${libdir}/vpp_api_test_plugins/pppoe_test_plugin.so "
83FILES_${PN}-plugin-gtpu_test = " ${libdir}/vpp_api_test_plugins/gtpu_test_plugin.so "
84FILES_${PN}-plugin-cdp_test = " ${libdir}/vpp_api_test_plugins/cdp_test_plugin.so "
85FILES_${PN}-plugin-dpdk_test = " ${libdir}/vpp_api_test_plugins/dpdk_test_plugin.so "
86FILES_${PN}-plugin-nsh_test = " ${libdir}/vpp_api_test_plugins/nsh_test_plugin.so "
87FILES_${PN}-plugin-ioam_test = " ${libdir}/vpp_api_test_plugins/ioam_test_plugin.so "
88FILES_${PN}-plugin-vmxnet3_test = " ${libdir}/vpp_api_test_plugins/vmxnet3_test_plugin.so "
89FILES_${PN}-plugin-nsim_test = " ${libdir}/vpp_api_test_plugins/nsim_test_plugin.so "
90
91
92FILES_${PN}-data = " \
93 ${datadir}/vpp/api/core/sctp.api.json \
94 ${datadir}/vpp/api/core/sr.api.json \
95 ${datadir}/vpp/api/core/gre.api.json \
96 ${datadir}/vpp/api/core/lisp.api.json \
97 ${datadir}/vpp/api/core/netmap.api.json \
98 ${datadir}/vpp/api/core/tcp.api.json \
99 ${datadir}/vpp/api/core/ipsec_gre.api.json \
100 ${datadir}/vpp/api/core/bfd.api.json \
101 ${datadir}/vpp/api/core/tap.api.json \
102 ${datadir}/vpp/api/core/oam.api.json \
103 ${datadir}/vpp/api/core/vpe.api.json \
104 ${datadir}/vpp/api/core/bier.api.json \
105 ${datadir}/vpp/api/core/ipsec.api.json \
106 ${datadir}/vpp/api/core/af_packet.api.json \
107 ${datadir}/vpp/api/core/vxlan_gpe.api.json \
108 ${datadir}/vpp/api/core/session.api.json \
109 ${datadir}/vpp/api/core/one.api.json \
110 ${datadir}/vpp/api/core/sr_mpls.api.json \
111 ${datadir}/vpp/api/core/feature.api.json \
112 ${datadir}/vpp/api/core/p2p_ethernet.api.json \
113 ${datadir}/vpp/api/core/memclnt.api.json \
114 ${datadir}/vpp/api/core/pg.api.json \
115 ${datadir}/vpp/api/core/l2.api.json \
116 ${datadir}/vpp/api/core/punt.api.json \
117 ${datadir}/vpp/api/core/classify.api.json \
118 ${datadir}/vpp/api/core/policer.api.json \
119 ${datadir}/vpp/api/core/span.api.json \
120 ${datadir}/vpp/api/core/udp.api.json \
121 ${datadir}/vpp/api/core/vxlan.api.json \
122 ${datadir}/vpp/api/core/mpls.api.json \
123 ${datadir}/vpp/api/core/qos.api.json \
124 ${datadir}/vpp/api/core/ip.api.json \
125 ${datadir}/vpp/api/core/ipip.api.json \
126 ${datadir}/vpp/api/core/bond.api.json \
127 ${datadir}/vpp/api/core/dns.api.json \
128 ${datadir}/vpp/api/core/tapv2.api.json \
129 ${datadir}/vpp/api/core/pipe.api.json \
130 ${datadir}/vpp/api/core/dhcp6_pd_client_cp.api.json \
131 ${datadir}/vpp/api/core/l2tp.api.json \
132 ${datadir}/vpp/api/core/lisp_gpe.api.json \
133 ${datadir}/vpp/api/core/cop.api.json \
134 ${datadir}/vpp/api/core/geneve.api.json \
135 ${datadir}/vpp/api/core/stats.api.json \
136 ${datadir}/vpp/api/core/rd_cp.api.json \
137 ${datadir}/vpp/api/core/dhcp.api.json \
138 ${datadir}/vpp/api/core/lldp.api.json \
139 ${datadir}/vpp/api/core/dhcp6_ia_na_client_cp.api.json \
140 ${datadir}/vpp/api/core/ipfix_export.api.json \
141 ${datadir}/vpp/api/core/vhost_user.api.json \
142 ${datadir}/vpp/api/core/interface.api.json \
143 ${datadir}/vpp/C.py \
144 ${datadir}/vpp/api/core/flow.api.json \
145 ${datadir}/vpp/api/core/map.api.json \
146 ${datadir}/vpp/api/core/dpdk.api.json \
147 ${datadir}/vpp/JSON.py \
148 ${datadir}/vpp/vppapigen_json.py \
149 ${datadir}/vpp/vppapigen_c.py "
150
151
152FILES_${PN} = " \
153 ${sysconfdir}/vpp \
154 ${sysconfdir}/vpp/startup.conf \
155 ${sysconfdir}/vpp/startup.conf.dflt \
156 ${sysconfdir}/rc.local \
157 ${bindir}/svmdbtool \
158 ${bindir}/svmtool \
159 ${bindir}/vppapigen \
160 ${bindir}/vpp_get_stats \
161 ${bindir}/vpp_prometheus_export \
162 ${bindir}/elftool \
163 ${bindir}/cpelatency \
164 ${bindir}/cpelinreg \
165 ${bindir}/elog_merge \
166 ${bindir}/c2cpel \
167 ${bindir}/cpelstate \
168 ${bindir}/cpeldump \
169 ${bindir}/vpp \
170 ${bindir}/vpp_api_test \
171 ${bindir}/vpp_get_metrics \
172 ${bindir}/vpp_restart \
173 ${bindir}/vppctl \
174 ${libdir}/libcperf.so.0.0.0 \
175 ${libdir}/libcperf.so.0 \
176 ${libdir}/libsvm.so.0 \
177 ${libdir}/libsvm.so.0.0.0 \
178 ${libdir}/libsvmdb.so.0 \
179 ${libdir}/libsvmdb.so.0.0.0 \
180 ${libdir}/libvapiclient.so.0 \
181 ${libdir}/libvapiclient.so.0.0.0 \
182 ${libdir}/libvatplugin.so.0 \
183 ${libdir}/libvatplugin.so.0.0.0 \
184 ${libdir}/libvcl_ldpreload.so.0 \
185 ${libdir}/libvcl_ldpreload.so.0.0.0 \
186 ${libdir}/libvlib.so.0 \
187 ${libdir}/libvlib.so.0.0.0 \
188 ${libdir}/libvlibmemory.so.0 \
189 ${libdir}/libvlibmemory.so.0.0.0 \
190 ${libdir}/libvlibmemoryclient.so.0 \
191 ${libdir}/libvlibmemoryclient.so.0.0.0 \
192 ${libdir}/libvnet.so.0 \
193 ${libdir}/libvnet.so.0.0.0 \
194 ${libdir}/libvppapiclient.so.0 \
195 ${libdir}/libvppapiclient.so.0.0.0 \
196 ${libdir}/libvppcom.so.19.09 \
197 ${libdir}/libvppapiclient.so.19.09 \
198 ${libdir}/libsvm.so.19.09 \
199 ${libdir}/libvcl_ldpreload.so.19.09 \
200 ${libdir}/libvlibmemoryclient.so.19.09 \
201 ${libdir}/libvnet.so.19.09 \
202 ${libdir}/libvapiclient.so.19.09 \
203 ${libdir}/libvlibmemory.so.19.09 \
204 ${libdir}/libvppinfra.so.19.09 \
205 ${libdir}/usr/lib/libvppcom.so.19.09 \
206 ${libdir}/libvlib.so.19.09 \
207 ${libdir}/libvatplugin.so.19.09 \
208 ${libdir}/libsvmdb.so.19.09 \
209 ${libdir}/libvppcom.so.0.0.0 \
210 ${libdir}/libvppinfra.so.0 \
211 ${libdir}/libvppinfra.so.0.0.0 \
212 "
213
214FILES_${PN}-plugin-data = " \
215 ${datadir}/vpp/api/plugins/pot.api.json \
216 ${datadir}/vpp/api/plugins/pppoe.api.json \
217 ${datadir}/vpp/api/plugins/igmp.api.json \
218 ${datadir}/vpp/api/plugins/avf.api.json \
219 ${datadir}/vpp/api/plugins/mactime.api.json \
220 ${datadir}/vpp/api/plugins/gbp.api.json \
221 ${datadir}/vpp/api/plugins/map.api.json \
222 ${datadir}/vpp/api/plugins/udp_ping.api.json \
223 ${datadir}/vpp/api/plugins/l2e.api.json \
224 ${datadir}/vpp/api/plugins/ioam_export.api.json \
225 ${datadir}/vpp/api/plugins/lb.api.json \
226 ${datadir}/vpp/api/plugins/vxlan_gpe_ioam_export.api.json \
227 ${datadir}/vpp/api/plugins/ioam_vxlan_gpe.api.json \
228 ${datadir}/vpp/api/plugins/acl.api.json \
229 ${datadir}/vpp/api/plugins/ioam_cache.api.json \
230 ${datadir}/vpp/api/plugins/stn.api.json \
231 ${datadir}/vpp/api/plugins/abf.api.json \
232 ${datadir}/vpp/api/plugins/nat.api.json \
233 ${datadir}/vpp/api/plugins/flowprobe.api.json \
234 ${datadir}/vpp/api/plugins/memif.api.json \
235 ${datadir}/vpp/api/plugins/lacp.api.json \
236 ${datadir}/vpp/api/plugins/gtpu.api.json \
237 ${datadir}/vpp/api/plugins/trace.api.json \
238 ${datadir}/vpp/api/plugins/dpdk.api.json \
239 ${datadir}/vpp/api/plugins/cdp.api.json \
240 ${datadir}/vpp/api/plugins/nsh.api.json \
241 ${datadir}/vpp/api/plugins/nsim.api.json \
242 ${datadir}/vpp/api/plugins/svs.api.json \
243 ${datadir}/vpp/api/plugins/vmxnet3.api.json \
244 ${datadir}/vpp/api/core/syslog.api.json \
245 ${datadir}/vpp/api/core/vxlan_gbp.api.json \
246 ${datadir}/vpp/plugins/perfmon/PerfmonTables.tar.xz "
247
248FILES_${PN}-dev = " \
249 ${includedir}/* \
250 ${libdir}/libvcl_ldpreload.so \
251 ${libdir}/libvppapiclient.so \
252 ${libdir}/libvppcom.so \
253 ${libdir}/libvlib.so \
254 ${libdir}/libsvm.so \
255 ${libdir}/libsvmdb.so \
256 ${libdir}/libvatplugin.so \
257 ${libdir}/libvlibmemory.so \
258 ${libdir}/libvapiclient.so \
259 ${libdir}/libvnet.so \
260 ${libdir}/libvppinfra.so \
261 ${libdir}/libcperf.so \
262 ${libdir}/libvlibmemoryclient.so \
263 ${libdir}/cmake/vpp/*.cmake "
264
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-09 20:32:12 +0000