diff options
Diffstat (limited to 'recipes-extended')
57 files changed, 1028 insertions, 1038 deletions
diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb index 7dc92776..755365d6 100644 --- a/recipes-extended/crconf/crconf_git.bb +++ b/recipes-extended/crconf/crconf_git.bb @@ -1,18 +1,15 @@ SUMMARY = "crconf -Linux crypto layer configuraton tool" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=5;md5=0f77fc44eb5911007ae4ac9f6736e111" -SRC_URI = "git://github.com/Thermi/crconf.git;protocol=https;nobranch=1" +EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}' SBINDIR='${sbindir}' MANDIR='${mandir}'" -EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}'" - -SRCREV = "7b5819e7638e471d41dd2dca71f012d5a022f014" +SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1" +SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68" S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} } - -FILES_${PN} += "/share/man/* ${libdir}/* ${sbindir}/*" diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc new file mode 100644 index 00000000..90b4c405 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-20.11.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Data Plane Development Kit" +HOMEPAGE = "http://dpdk.org" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1" +SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270" + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "(qoriq-arm64)" + +CVE_PRODUCT = "data_plane_development_kit" diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch b/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch new file mode 100644 index 00000000..18b75fb6 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-20.11/0001-Makefile-add-makefile.patch @@ -0,0 +1,74 @@ +From 768cef60957d5e840071d1d6514d4add3f3c2904 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Wed, 14 Apr 2021 17:25:53 +0800 +Subject: [PATCH] Makefile: add makefile + +Current meson build for kernel module build does not fit in Yocto. +So added Makefile to build rte_kni.ko + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + kernel/linux/kni/Kbuild | 6 ------ + kernel/linux/kni/Makefile | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 6 deletions(-) + delete mode 100644 kernel/linux/kni/Kbuild + create mode 100644 kernel/linux/kni/Makefile + +diff --git a/kernel/linux/kni/Kbuild b/kernel/linux/kni/Kbuild +deleted file mode 100644 +index e5452d6c00..0000000000 +--- a/kernel/linux/kni/Kbuild ++++ /dev/null +@@ -1,6 +0,0 @@ +-# SPDX-License-Identifier: BSD-3-Clause +-# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> +- +-ccflags-y := $(MODULE_CFLAGS) +-obj-m := rte_kni.o +-rte_kni-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c)) +diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile +new file mode 100644 +index 0000000000..19897ee06e +--- /dev/null ++++ b/kernel/linux/kni/Makefile +@@ -0,0 +1,35 @@ ++# ++# Makefile for building rte_kni.ko ++# ++MODULE_CFLAGS += -include $(S)/config/rte_config.h ++MODULE_CFLAGS += -I$(S)/lib/librte_eal/include ++MODULE_CFLAGS += -I$(S)/lib/librte_kni ++MODULE_CFLAGS += -I$(S)/kernel/linux/kni ++MODULE_CFLAGS += -I$(S) ++MODULE_CFLAGS += -I$(STAGING_INCDIR) ++ ++rte_kni-objs = kni_misc.o kni_net.o ++ ++ccflags-y := $(MODULE_CFLAGS) ++cflags-y := $(MODULE_CFLAGS) ++obj-m := rte_kni.o ++ ++ ++KERNEL_MAKE_OPTS := -C $(STAGING_KERNEL_DIR) M=$(CURDIR) ++ifneq ($(ARCH),) ++KERNEL_MAKE_OPTS += ARCH=$(ARCH) ++endif ++ifneq ($(CROSS_COMPILE),) ++KERNEL_MAKE_OPTS += CROSS_COMPILE=$(CROSS_COMPILE) ++endif ++ ++build: ++ $(MAKE) $(KERNEL_MAKE_OPTS) modules ++ ++install: modules_install ++ ++modules_install: ++ $(MAKE) $(KERNEL_MAKE_OPTS) modules_install ++ ++clean: ++ $(MAKE) $(KERNEL_MAKE_OPTS) clean +-- +2.17.1 + diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch b/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch new file mode 100644 index 00000000..f88b6484 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch @@ -0,0 +1,31 @@ +From 6fe85f3a12d15e25345ef0547035a929351a179c Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Fri, 17 Sep 2021 12:53:53 +0530 +Subject: [PATCH] drivers/net/enetfec/enet_uio.c: fix multiple definition + +.../drivers/net/enetfec/enet_uio.c:22: multiple definition of `count'; +.../examples/flow_classify/flow_classify.c:170: first defined here +collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + drivers/net/enetfec/enet_uio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/enetfec/enet_uio.c b/drivers/net/enetfec/enet_uio.c +index b64dc522e8..9e09f9beb6 100644 +--- a/drivers/net/enetfec/enet_uio.c ++++ b/drivers/net/enetfec/enet_uio.c +@@ -19,7 +19,7 @@ + #include "enet_uio.h" + + static struct uio_job enetfec_uio_job; +-int count; ++static int count; + + /** @brief Reads first line from a file. + * Composes file name as: root/subdir/filename +-- +2.25.1 + diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch b/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch new file mode 100644 index 00000000..4df28c40 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-20.11/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch @@ -0,0 +1,35 @@ +From 308409d72671b7978b20d40748ad985a235b6c86 Mon Sep 17 00:00:00 2001 +From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com> +Date: Thu, 24 Jun 2021 11:30:09 +0800 +Subject: [PATCH] ifpga/meson: Fix finding librt using find_library() + +Finding with "librt" keyword would give the output +with full path of librt such as /usr/lib/librt.so +instead of -lrt. + +Assume find_library() will prepend "lib", thus remove +"lib" from "librt" keyword. The output will shows as +-lrt. + +Upstream-Status: Submitted [https://mails.dpdk.org/archives/stable/2021-June/031840.html] + +Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com> +--- + drivers/raw/ifpga/base/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build +index da2d6e33c..949f7f127 100644 +--- a/drivers/raw/ifpga/base/meson.build ++++ b/drivers/raw/ifpga/base/meson.build +@@ -25,7 +25,7 @@ sources = [ + + rtdep = dependency('librt', required: false) + if not rtdep.found() +- rtdep = cc.find_library('librt', required: false) ++ rtdep = cc.find_library('rt', required: false) + endif + if not rtdep.found() + build = false +-- +2.32.0 diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch b/recipes-extended/dpdk/dpdk-20.11/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch new file mode 100644 index 00000000..bef1f45b --- /dev/null +++ b/recipes-extended/dpdk/dpdk-20.11/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch @@ -0,0 +1,38 @@ +From cf8f15824dc2dd306d9c7e111641bef045d623c2 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Wed, 14 Apr 2021 16:03:10 +0800 +Subject: [PATCH] meson.build:-march and -mcpu already passed by Yocto + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + config/meson.build | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/config/meson.build b/config/meson.build +index 2f150de3b8..41bb3e9ec4 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -94,12 +94,12 @@ dpdk_conf.set('RTE_MACHINE', machine) + machine_args = [] + + # ppc64 does not support -march= at all, use -mcpu and -mtune for that +-if host_machine.cpu_family().startswith('ppc') +- machine_args += '-mcpu=' + machine +- machine_args += '-mtune=' + machine +-else +- machine_args += '-march=' + machine +-endif ++#if host_machine.cpu_family().startswith('ppc') ++# machine_args += '-mcpu=' + machine ++# machine_args += '-mtune=' + machine ++#else ++# machine_args += '-march=' + machine ++#endif + + toolchain = cc.get_id() + dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain) +-- +2.17.1 + diff --git a/recipes-extended/dpdk/dpdk-module_20.11.bb b/recipes-extended/dpdk/dpdk-module_20.11.bb new file mode 100644 index 00000000..180b140b --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_20.11.bb @@ -0,0 +1,41 @@ +include dpdk-20.11.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk-${PV}:" + +SRC_URI += " \ + file://0001-Makefile-add-makefile.patch \ +" + +inherit module + +#kernel module needs 'rte_build_config.h', which is generated at buid time +DEPENDS += "dpdk" + +export S +export STAGING_KERNEL_DIR +export STAGING_INCDIR +export INSTALL_MOD_DIR="dpdk" + +do_configure[noexec] = "1" + +do_compile() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ + ${MAKE_TARGETS} +} + +do_install() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ + INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + ${MODULES_INSTALL_TARGET} +} diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 71977bae..f2ab1370 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -1,39 +1,30 @@ 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} += "python3-core" DEPENDS = "virtual/kernel openssl" -DEPENDS_append_x86-64 = " numactl" +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_HOST:libc-musl = 'null' +COMPATIBLE_HOST:armv4 = 'null' +COMPATIBLE_HOST:armv5 = 'null' +COMPATIBLE_HOST:armv6 = 'null' -COMPATIBLE_MACHINE = "(imx|qoriq)" +COMPATIBLE_MACHINE = "(imx-nxp-bsp|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: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" export RTE_TARGET = "${DPDK_RTE_TARGET}" export RTE_OUTPUT = "${S}/${RTE_TARGET}" -export MODULE_DIR = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" +export MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" S = "${WORKDIR}/git" @@ -102,13 +93,13 @@ do_install () { PACKAGES += "${PN}-examples" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${datadir}/dpdk/.debug \ ${datadir}/dpdk/examples/*/.debug \ " -FILES_${PN}-staticdev += "${datadir}/dpdk/cmdif/lib/*.a \ +FILES:${PN}-staticdev += "${datadir}/dpdk/cmdif/lib/*.a \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/dpdk/${RTE_TARGET}/.config \ ${includedir} \ ${includedir}/exec-env \ @@ -118,11 +109,14 @@ FILES_${PN}-dev += " \ ${datadir}/dpdk/mk \ " -FILES_${PN} += " ${datadir}/ \ +FILES:${PN} += " ${datadir}/ \ ${prefix}/sbin/ \ ${prefix}/bin/ \ ${libdir}/ \ " -FILES_${PN}-examples += " \ +FILES:${PN}-examples += " \ ${datadir}/examples/* \ " + +TOOLCHAIN = "gcc" + diff --git a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch index 64a6876f..383b9085 100644 --- a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch +++ b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch @@ -1,15 +1,16 @@ -From 4ea737c1d5a185d56ee1d6da18172b389ea90760 Mon Sep 17 00:00:00 2001 +From 9c2b840a1c8ac0fbb638b5cd481909a3f832eed4 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 +Upstream-Status: Pending 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 +index 595bac261..28a31f36a 100644 --- a/kernel/linux/kni/Makefile +++ b/kernel/linux/kni/Makefile @@ -20,7 +20,7 @@ MODULE_CFLAGS += -Wall -Werror @@ -22,5 +23,5 @@ index 282be7b..dfbebdc 100644 MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" endif -- -2.7.4 +2.17.1 diff --git a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch index c074eac6..b4b8a548 100644 --- a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch +++ b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch @@ -1,16 +1,16 @@ -From beb13be8023beb68499c72e71a79b8f91784e484 Mon Sep 17 00:00:00 2001 +From 354c2d1570ddf83a99c4ac711c884644c6dd1cef 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] - +Signed-off-by: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com> --- 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 +index 235c3adbf..230f17b0a 100644 --- a/examples/cmdif/lib/Makefile +++ b/examples/cmdif/lib/Makefile @@ -28,7 +28,7 @@ SRCS-y += server/cmdif_srv_gpp.c @@ -23,5 +23,5 @@ index d28badf..4e9851c 100644 CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/client CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/server -- -2.7.4 +2.17.1 diff --git a/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch new file mode 100644 index 00000000..b73b3a96 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch @@ -0,0 +1,49 @@ +From 229fc129be85a4d2d2c4efddae7bb97c3d87d416 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Mar 2023 22:02:01 -0700 +Subject: [PATCH] examples: fix Arm build with GCC 12 + +GCC-12 warns when a pointer of type union points to an array of same +defined size, as union internally gets paded with pad bytes. + + ../examples/common/neon/port_group.h:42:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} + [-Werror=array-bounds] + 42 | pnum->u64 = gptbl[v].pnum; + | ^~ + ../examples/common/neon/port_group.h:21:23: note: object 'pn' of + size [0, 10] + 21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1 + | ~~~~~~~~~^~~~~~~~~~~~~~~ + ../examples/common/neon/port_group.h:43:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds] + 43 | pnum->u16[FWDSTEP] = 1; + | ^~ + +Fixes: 732115ce38c6 ("examples/l3fwd: move packet group function in common") + +Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/b269bd630e96b276a69d698e13ad9ebfbbb67512] +Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/l3fwd/l3fwd_neon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h +index 86ac5971d7..dc73e9fef7 100644 +--- a/examples/l3fwd/l3fwd_neon.h ++++ b/examples/l3fwd/l3fwd_neon.h +@@ -77,7 +77,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1, + union { + uint16_t u16[FWDSTEP + 1]; + uint64_t u64; +- } *pnum = (void *)pn; ++ } __rte_packed *pnum = (void *)pn; + + int32_t v; + uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0}; +-- +2.39.2 + diff --git a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch b/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch deleted file mode 100644 index 9249b2b5..00000000 --- a/recipes-extended/dpdk/dpdk/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/dpdk/dpdk/0005-use-python3-instead-of-python.patch b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch new file mode 100644 index 00000000..b1bdf09b --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch @@ -0,0 +1,105 @@ +Explicitly use python3 + +Upstream-Status: Pending +Signed-off-by: Ting Liu <ting.liu@nxp.com> + +diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py +index 0194be046..86fe3a89d 100755 +--- a/app/test-bbdev/test-bbdev.py ++++ b/app/test-bbdev/test-bbdev.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Intel Corporation +diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py +index 3a8fac426..231fe6032 100755 +--- a/app/test-cmdline/cmdline_test.py ++++ b/app/test-cmdline/cmdline_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/app/test/autotest.py b/app/test/autotest.py +index b42f48879..30541d102 100644 +--- a/app/test/autotest.py ++++ b/app/test/autotest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/buildtools/map_to_def.py b/buildtools/map_to_def.py +index 6775b54a9..ff67f0a35 100644 +--- a/buildtools/map_to_def.py ++++ b/buildtools/map_to_def.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py +index 404866d2f..1f689d9a8 100755 +--- a/config/arm/armv8_machine.py ++++ b/config/arm/armv8_machine.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Cavium, Inc + +diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py +index 616412a1c..3244b0984 100755 +--- a/devtools/update_version_map_abi.py ++++ b/devtools/update_version_map_abi.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py +index 6f129b1db..e86bf6b92 100755 +--- a/usertools/cpu_layout.py ++++ b/usertools/cpu_layout.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # Copyright(c) 2017 Cavium, Inc. All rights reserved. +diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py +index b1d149876..3f8175338 100755 +--- a/usertools/dpdk-devbind.py ++++ b/usertools/dpdk-devbind.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # +diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py +index 069a3bf12..1d5c99c2a 100755 +--- a/usertools/dpdk-pmdinfo.py ++++ b/usertools/dpdk-pmdinfo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> + +diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py +index 290345dcc..279067450 100755 +--- a/usertools/dpdk-telemetry-client.py ++++ b/usertools/dpdk-telemetry-client.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2018 Intel Corporation + diff --git a/recipes-extended/dpdk/dpdk_18.11.bb b/recipes-extended/dpdk/dpdk_18.11.bb deleted file mode 100644 index 1a6b927e..00000000 --- a/recipes-extended/dpdk/dpdk_18.11.bb +++ /dev/null @@ -1,8 +0,0 @@ -include dpdk.inc - - -do_install_append () { - # Remove the unneeded dir - rm -rf ${D}/${datadir}/${RTE_TARGET}/app -} - diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb new file mode 100644 index 00000000..b14d4fbf --- /dev/null +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb @@ -0,0 +1,21 @@ +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;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://0005-use-python3-instead-of-python.patch \ + file://0001-examples-fix-Arm-build-with-GCC-12.patch \ +" +SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" + +include dpdk.inc + +do_install:append () { + # Remove the unneeded dir + rm -rf ${D}/${datadir}/${RTE_TARGET}/app +} + diff --git a/recipes-extended/dpdk/dpdk_20.11.bb b/recipes-extended/dpdk/dpdk_20.11.bb new file mode 100644 index 00000000..2d27adc5 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_20.11.bb @@ -0,0 +1,93 @@ +include dpdk-20.11.inc + +SRC_URI += " \ + file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ + file://0001-ifpga-meson-Fix-finding-librt-using-find_library.patch \ + file://0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch \ +" + +MESON_BUILDTYPE = "release" + +# kernel module is provide by dpdk-module recipe, so disable here +EXTRA_OEMESON = " -Denable_kmods=false \ + -Dexamples=all \ + -Doptimization=3 \ +" + +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[afxdp] = ",,libbpf" +PACKAGECONFIG[libvirt] = ",,libvirt" +PACKAGECONFIG[openssl] = ",,openssl" + +RDEPENDS:${PN} += "bash pciutils python3-core" +RDEPENDS:${PN}-examples += "bash" +DEPENDS = "numactl" + +inherit meson + +INSTALL_PATH = "${prefix}/share/dpdk" + +do_configure:prepend() { + sed -i "/implementor_/d" ${WORKDIR}/meson.cross + sed -i "/\[properties]/aimplementor_id = 'dpaa'" ${WORKDIR}/meson.cross + sed -i "/\[properties]/aimplementor_pn = 'default'" ${WORKDIR}/meson.cross + sed -i "s/cpu =.*/cpu = 'armv8-a'/" ${WORKDIR}/meson.cross +} + +do_install:append(){ + # remove source files + rm -rf ${D}/${INSTALL_PATH}/examples/* + + # Install examples + install -m 0755 -d ${D}/${INSTALL_PATH}/examples/ + for dirname in ${B}/examples/dpdk-* + do + if [ ! -d ${dirname} ] && [ -x ${dirname} ]; then + install -m 0755 ${dirname} ${D}/${INSTALL_PATH}/examples/ + fi + done + cp -rf ${S}/nxp/* ${D}/${INSTALL_PATH}/ +} + +PACKAGES =+ "${PN}-tools ${PN}-examples ${PN}-misc" + +FILES:${PN}-tools = " \ + ${bindir}/dpdk-testpmd \ + ${INSTALL_PATH}/examples/dpdk-l2fwd \ + ${INSTALL_PATH}/examples/dpdk-l2fwd-crypto \ + ${INSTALL_PATH}/examples/dpdk-l3fwd \ + ${INSTALL_PATH}/examples/dpdk-ipsec-secgw \ +" + +FILES:${PN}-examples = " \ + ${bindir}/dpdk-proc-info \ + ${bindir}/dpdk-test \ + ${bindir}/dpdk-test-crypto-perf \ + ${bindir}/dpdk-*.py \ + ${INSTALL_PATH}/examples/dpdk-cmdif \ + ${INSTALL_PATH}/examples/dpdk-cmdline \ + ${INSTALL_PATH}/examples/dpdk-ethtool \ + ${INSTALL_PATH}/examples/dpdk-ip_fragmentation \ + ${INSTALL_PATH}/examples/dpdk-ip_reassembly \ + ${INSTALL_PATH}/examples/dpdk-kni \ + ${INSTALL_PATH}/examples/dpdk-l2fwd-keepalive \ + ${INSTALL_PATH}/examples/dpdk-l2fwd-qdma \ + ${INSTALL_PATH}/examples/dpdk-l3fwd-acl \ + ${INSTALL_PATH}/examples/dpdk-link_status_interrupt \ + ${INSTALL_PATH}/examples/dpdk-mp_client \ + ${INSTALL_PATH}/examples/dpdk-mp_server \ + ${INSTALL_PATH}/examples/dpdk-qdma_demo \ + ${INSTALL_PATH}/examples/dpdk-simple_mp \ + ${INSTALL_PATH}/examples/dpdk-symmetric_mp \ + ${INSTALL_PATH}/examples/dpdk-symmetric_mp_qdma \ + ${INSTALL_PATH}/examples/dpdk-timer \ +" + +FILES:${PN}-misc = " \ + ${bindir}/dpdk-pdump \ + ${bindir}/dpdk-test-* \ + ${bindir}/dpdk-*.py \ + ${INSTALL_PATH}/examples/* \ +" + +INSANE_SKIP:${PN} = "dev-so" diff --git a/recipes-extended/gpulib/gpulib_6.2.4.p4.bb b/recipes-extended/gpulib/gpulib_6.2.4.p4.bb deleted file mode 100644 index 9d31b890..00000000 --- a/recipes-extended/gpulib/gpulib_6.2.4.p4.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "GPU libraries" -DESCRIPTION = "GPU libraries for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3" - -SRC_URI = "http://www.nxp.com/lgfiles/sdk/lsdk1909/gpulib-lsdk1909.bin;fsl-eula=true" -SRC_URI[md5sum] = "a68ba3b91a12dd7da0d573891e20db78" -SRC_URI[sha256sum] = "0fcbf785dfe7402bc03a808e6ced754daeddd387391ebf6e15131187ff6e7bc1" - -S = "${WORKDIR}/gpulib-lsdk1909" - -inherit fsl-eula-unpack - -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -DEPENDS_append = " kernel-module-qoriq-gpu" - -PROVIDES = " \ - gpulib \ - virtual/egl \ - virtual/libgbm \ - virtual/libgles2 \ -" -do_install() { - install -d ${D}/opt ${D}${libdir} ${D}/usr/include - cd ls1028a/linux - cp -a gpu-demos/opt/viv_samples/* ${D}/opt - cp -a gpu-core/usr/include/* ${D}/usr/include - rm -rf gpu-core/usr/lib/libwayland-egl.so* - cp -a gpu-core/usr/lib/* ${D}/usr/lib - rm -rf gpu-core/${includedir}/vulkan/ -} - -PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN} = "${libdir}/* /opt/* /usr/include/*" -INSANE_SKIP_${PN} += "already-stripped file-rdeps dev-so host-user-contaminated" -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-extended/hyperrelay/hyperrelay_git.bb b/recipes-extended/hyperrelay/hyperrelay_git.bb deleted file mode 100644 index 29056c55..00000000 --- a/recipes-extended/hyperrelay/hyperrelay_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Userspace proxy agent for Code Warrrior HyperTrk" -LICENSE = "Freescale-EULA" -LIC_FILES_CHKSUM = "file://EULA;md5=c9ae442cf1f9dd6c13dfad64b0ffe73f" - -inherit fsl-eula-unpack - -SRC_URI = "git://git.freescale.com/ppc/sdk/hyperrelay.git;fsl-eula=true;branch=sdk-v2.0.x" -SRCREV = "925af97359c2b86399561f1f97f2cb6ca0ccd344" - -S = "${WORKDIR}/git" - -CFLAGS += "\ - -Wall \ - -Wundef \ - -Wstrict-prototypes \ - -Wno-trigraphs \ - -fno-strict-aliasing \ - -fno-common \ - -O2 \ - -g \ - -fmessage-length=0 \ - -MMD \ - -MP \ - -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" \ -" - -LDFLAGS_prepend = " -lpthread " - -do_install() { - install -d ${D}${bindir} - oe_runmake install DESTDIR=${D} -} - -COMPATIBLE_MACHINE = "(qoriq-ppc)" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -INSANE_SKIP_${PN} = "ldflags" diff --git a/recipes-extended/ipc-ust/ipc-ust/Makefile-use-LDFLAGS-if-set.patch b/recipes-extended/ipc-ust/ipc-ust/Makefile-use-LDFLAGS-if-set.patch index e991f70a..6a0d82a6 100644 --- a/recipes-extended/ipc-ust/ipc-ust/Makefile-use-LDFLAGS-if-set.patch +++ b/recipes-extended/ipc-ust/ipc-ust/Makefile-use-LDFLAGS-if-set.patch @@ -3,6 +3,7 @@ From: Ting Liu <ting.liu@nxp.com> Date: Fri, 12 Aug 2016 10:41:51 +0800 Subject: [PATCH] Makefile: use LDFLAGS if set +Upstream-Status: Pending Signed-off-by: Ting Liu <ting.liu@nxp.com> --- dsp_boot/Makefile | 6 +++--- diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb deleted file mode 100644 index df496c28..00000000 --- a/recipes-extended/ipc-ust/ipc-ust_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Linux IPC Userspace Tool" -DESCRIPTION = "DSP boot application and ipc test application" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/ipc;branch=nxp/sdk-v2.0.x \ - file://Makefile-use-LDFLAGS-if-set.patch \ -" -SRCREV = "74d662707558290f070f9589177db730444bc435" - -S = "${WORKDIR}/git" - -# workaround for issue of parallel build, required a actual fix in ipc source -PARALLEL_MAKE = "" - -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}" B4860=1' - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir} - install -d ${D}/ipc - install -m 755 ${S}/dsp_boot/dsp_bt ${D}/ipc - install -m 755 ${S}/ipc/ipc_test ${D}/ipc - install -m 755 ${S}/ipc/ipc_test67 ${D}/ipc - install -m 755 ${S}/ipc/l1d_app ${D}/ipc - install -m 755 ${S}/fsl_shm/app ${D}${bindir}/lg_shm_test - install -d ${D}${base_libdir} - install -m 755 ${S}/ipc/libipc.so ${D}${base_libdir} - install -m 755 ${S}/ipc/libmem.so ${D}${base_libdir} - install -m 755 ${S}/ipc/libdspboot.so ${D}${base_libdir} - install -d ${D}${includedir}/ipc - install -d ${D}${includedir}/ipc/ipc/include - install -d ${D}${includedir}/ipc/fsl_shm/lib - install ${S}/ipc/include/*.h ${D}${includedir}/ipc/ipc/include - install ${S}/dsp_boot/*.h ${D}${includedir}/ipc/ipc/include - install ${S}/kernel/fsl_ipc_types.h ${D}${includedir}/ipc/ipc/include - install ${S}/kernel/fsl_heterogeneous_common.h ${D}${includedir}/ipc/ipc/include - install ${S}/kernel/fsl_heterogeneous_l1_defense.h ${D}${includedir}/ipc/ipc/include - install ${S}/fsl_shm/include/*.h ${D}${includedir}/ipc/ipc/include - install ${S}/fsl_shm/lib/*.h ${D}${includedir}/ipc/fsl_shm/lib -} - -FILES_${PN} += "${base_libdir}/*.so /ipc/*" -FILES_${PN}-dev = "${includedir}" -FILES_${PN}-dbg += "/ipc/.debug" - -INSANE_SKIP_${PN} += "file-rdeps" -INSANE_SKIP_${PN}-dev += "dev-elf" - -COMPATIBLE_MACHINE = "(b4860qds|b4420qds)" -PACKAGE_ARCH = "${MACHINE_ARCH}" - diff --git a/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch b/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch new file mode 100644 index 00000000..442d2831 --- /dev/null +++ b/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch @@ -0,0 +1,40 @@ +From 7117c1fe979053e4b1071968b444c03fbffe55bb Mon Sep 17 00:00:00 2001 +From: Daiane Angolini <daiane.angolini@foundries.io> +Date: Tue, 6 Feb 2024 18:01:07 -0300 +Subject: [PATCH] arm:arm64: Makefile: Remove -march option from Makefile + +It let the recipe to decide which are the compilation flags to be used. + +It acomodates to [1]. + +[1] https://git.yoctoproject.org/poky/commit/?id=04eac1f2b67eac5f892a9e0f8fcfe54849923af5 + +Upstream-Status: Inappropriate [See above] + +Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io> +--- + hypervisor/arch/arm/Makefile | 2 -- + hypervisor/arch/arm64/Makefile | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile +index a54370fc..cddb6cd3 100644 +--- a/hypervisor/arch/arm/Makefile ++++ b/hypervisor/arch/arm/Makefile +@@ -12,5 +12,3 @@ + + LINUXINCLUDE += -I$(src)/arch/arm-common/include + +-KBUILD_CFLAGS += -marm -march=armv7ve -msoft-float +-KBUILD_AFLAGS += -march=armv7ve -msoft-float +diff --git a/hypervisor/arch/arm64/Makefile b/hypervisor/arch/arm64/Makefile +index 0718994d..5d7a80c6 100644 +--- a/hypervisor/arch/arm64/Makefile ++++ b/hypervisor/arch/arm64/Makefile +@@ -12,4 +12,3 @@ + + LINUXINCLUDE += -I$(src)/arch/arm-common/include + +-KBUILD_CFLAGS += -march=armv8-a+nofp +-- +2.34.1 diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb new file mode 100644 index 00000000..c230cc3a --- /dev/null +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -0,0 +1,112 @@ +SUMMARY = "Jailhouse, i.MX fork" +HOMEPAGE = "https://github.com/siemens/jailhouse" +SECTION = "jailhouse" +LICENSE = "GPL-2.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ + file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/arm/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/arm64/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ +" + +PROVIDES = "jailhouse" +RPROVIDES:${PN} += "jailhouse" + +SRCBRANCH = "lf-6.6.3_1.0.0" +SRCREV = "184a287f4c4c63a3842a3b582b5d700e0f9fd9a4" + +IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" +SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ + file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \ + " + +DEPENDS = " \ + make-native \ + python3-mako-native \ + python3-mako \ + dtc-native \ +" + +inherit module bash-completion deploy setuptools3 + +S = "${WORKDIR}/git" +B = "${S}" + +JH_ARCH = "arm64" +JH_DATADIR ?= "${datadir}/jailhouse" +CELL_DIR ?= "${JH_DATADIR}/cells" +CELLCONF_DIR ?= "${JH_DATADIR}/configs" +INMATES_DIR ?= "${JH_DATADIR}/inmates" + +TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55" + +EXTRA_OEMAKE += 'V=1' +EXTRA_OEMAKE += 'PYTHON=python3' +EXTRA_OEMAKE += 'LDFLAGS=""' +EXTRA_OEMAKE += 'CC="${CC}"' +EXTRA_OEMAKE += 'ARCH=${JH_ARCH}' +EXTRA_OEMAKE += 'CROSS_COMPILE=${TARGET_PREFIX}' +EXTRA_OEMAKE += 'KDIR=${STAGING_KERNEL_BUILDDIR}' +EXTRA_OEMAKE += 'MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"' +EXTRA_OEMAKE += 'INSTALL_MOD_PATH=${D}${root_prefix}' +EXTRA_OEMAKE += 'firmwaredir=${nonarch_base_libdir}/firmware' + +do_configure:prepend() { + if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; + then + cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/ + fi +} + +do_compile:prepend() { + # explicity call make to build the kernel module and tools + oe_runmake +} + +do_install:append() { + oe_runmake DESTDIR=${D} install + + install -d ${D}${CELL_DIR} + install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ + + install -d ${D}${INMATES_DIR}/tools/${JH_ARCH} + install ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} + + install -d ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-cell-linux ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-cell-stats ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-config-collect ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools + install ${B}/tools/jailhouse-hardware-check ${D}${JH_DATADIR}/tools + install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH} +} + +PACKAGE_BEFORE_PN = "pyjailhouse" + +FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" +# Remove libdir/* appended by setuptools3-base.bbclass for module split to work correctly +FILES:${PN}:remove = "${libdir}/*" +FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" + +RDEPENDS:${PN} += " \ + pyjailhouse \ + python3-curses \ + python3-datetime \ + python3-mmap \ +" + +RDEPENDS:pyjailhouse = " \ + python3-core \ + python3-ctypes \ + python3-fcntl \ + python3-shell \ +" + +INSANE_SKIP:${PN} = "ldflags" + +COMPATIBLE_MACHINE = "(mx8m-nxp-bsp|mx8ulp-nxp-bsp|mx9-nxp-bsp)" diff --git a/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch b/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch new file mode 100644 index 00000000..a1680a8b --- /dev/null +++ b/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch @@ -0,0 +1,90 @@ +From e8e566a4b4d589cbdf2613c78cac75ecbea86d3b Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Wed, 30 Sep 2020 10:24:14 +0530 +Subject: [PATCH] fix multiple definition error + +gcc10 default to -fno-common, which results in error: +| ../aarch64-fsl-linux/10.2.0/ld: /tmp/ccaL5AXA.o:.../libpkcs11/git-r0/git/app/pkcs11_app.c:23: multiple definition of `funcs'; /tmp/ccvGV0xB.o:.../app/utils.c:18: first defined here +| collect2: error: ld returned 1 exit status +| Makefile:66: recipe for target 'app' failed +| make: *** [app] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + app/gen_test.c | 2 +- + app/pkcs11_app.c | 2 +- + app/sign_digest_update_final.c | 2 +- + app/thread_test.c | 2 +- + app/utils.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/app/gen_test.c b/app/gen_test.c +index fbd3429..2476e18 100644 +--- a/app/gen_test.c ++++ b/app/gen_test.c +@@ -17,7 +17,7 @@ + #include <openssl/pem.h> + #include <openssl/md5.h> + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + +diff --git a/app/pkcs11_app.c b/app/pkcs11_app.c +index 2b4a70d..3883dab 100644 +--- a/app/pkcs11_app.c ++++ b/app/pkcs11_app.c +@@ -20,7 +20,7 @@ + #include <openssl/pem.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + struct getOptValue_t { + uint32_t main_option; +diff --git a/app/sign_digest_update_final.c b/app/sign_digest_update_final.c +index b3367ed..49fee20 100644 +--- a/app/sign_digest_update_final.c ++++ b/app/sign_digest_update_final.c +@@ -20,7 +20,7 @@ + #include <openssl/pem.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + struct getOptValue_t { + uint32_t main_option; +diff --git a/app/thread_test.c b/app/thread_test.c +index 19d03ee..a574074 100644 +--- a/app/thread_test.c ++++ b/app/thread_test.c +@@ -20,7 +20,7 @@ + #include <sched.h> + #include <pthread.h> + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + #define MAX_THREADS 10 +diff --git a/app/utils.c b/app/utils.c +index 7afad95..9f9e143 100644 +--- a/app/utils.c ++++ b/app/utils.c +@@ -15,7 +15,7 @@ + #include <tee_slot.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + +-- +2.17.1 + diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb index 33c27ecd..731b7a23 100644 --- a/recipes-extended/libpkcs11/libpkcs11_git.bb +++ b/recipes-extended/libpkcs11/libpkcs11_git.bb @@ -1,9 +1,11 @@ DESCRIPTION = "PKCS library" -LICENSE = "GPLv2 & BSD" +LICENSE = "GPL-2.0-only & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1" -SRCREV = "a243fb21772f1bd434d8bc1ac45feb36571afadb" +SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \ + file://0001-fix-multiple-definition-error.patch \ +" +SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741" DEPENDS = "openssl secure-obj" @@ -28,10 +30,11 @@ do_install(){ mkdir -p ${D}/${includedir} ${D}/${bindir} cp ${S}/out/export/lib/libpkcs11.so ${D}/${libdir} cp ${S}/out/export/include/*.h ${D}/${includedir} + rm -f ${D}${includedir}/pkcs11.h cp ${S}/out/export/app/* ${D}/${bindir} } PARALLEL_MAKE = "" -INSANE_SKIP_${PN} = "ldflags dev-deps" -INSANE_SKIP_${PN}-dev = "ldflags dev-elf" +INSANE_SKIP:${PN} = "ldflags dev-deps" +INSANE_SKIP:${PN}-dev = "ldflags dev-elf" COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb index 6fe5b637..5b3ca7ed 100644 --- a/recipes-extended/merge-files/merge-files_1.0.bb +++ b/recipes-extended/merge-files/merge-files_1.0.bb @@ -17,6 +17,6 @@ do_install () { do_configure[noexec] = "1" do_compile[noexec] = "1" -FILES_${PN} = "/*" -ALLOW_EMPTY_${PN} = "1" -INSANE_SKIP_${PN} = "debug-files dev-so" +FILES:${PN} = "/*" +ALLOW_EMPTY:${PN} = "1" +INSANE_SKIP:${PN} = "debug-files dev-so" diff --git a/recipes-extended/odp/odp-counters_git.bb b/recipes-extended/odp/odp-counters_git.bb index 860dd5fa..c8f13208 100644 --- a/recipes-extended/odp/odp-counters_git.bb +++ b/recipes-extended/odp/odp-counters_git.bb @@ -2,13 +2,13 @@ require odp.inc inherit module -do_compile_prepend () { +do_compile:prepend () { export KERNEL_PATH="${STAGING_KERNEL_DIR}" export KERNEL_CFG_PATH="${STAGING_KERNEL_BUILDDIR}" cd ${S}/test/debug/perf_counters } do_install () { - install -d ${D}/lib/modules/${KERNEL_VERSION}/odp - install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}/lib/modules/${KERNEL_VERSION}/odp + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp + install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp } diff --git a/recipes-extended/odp/odp-module_git.bb b/recipes-extended/odp/odp-module_git.bb index 46b89654..ba74a5c0 100644 --- a/recipes-extended/odp/odp-module_git.bb +++ b/recipes-extended/odp/odp-module_git.bb @@ -2,15 +2,15 @@ require odp.inc inherit module -do_compile_prepend () { +do_compile:prepend () { export KERNEL_PATH="${STAGING_KERNEL_DIR}" export KERNEL_CFG_PATH="${STAGING_KERNEL_BUILDDIR}" cd ${S}/kern } do_install () { - install -d ${D}/lib/modules/${KERNEL_VERSION}/odp - install -m 755 ${S}/kern/odpfsl_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/odp + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp + install -m 755 ${S}/kern/odpfsl_kni.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp } -PKG_${PN} = "kernel-module-${PN}" +PKG:${PN} = "kernel-module-${PN}" diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc index 129f77ae..0c90d0c5 100644 --- a/recipes-extended/odp/odp.inc +++ b/recipes-extended/odp/odp.inc @@ -6,12 +6,12 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829" -FILESEXTRAPATHS_prepend := "${THISDIR}/odp:" +FILESEXTRAPATHS:prepend := "${THISDIR}/odp:" SRC_URI = " \ -git://source.codeaurora.org/external/qoriq/qoriq-components/odp;nobranch=1 \ -git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ -git://source.codeaurora.org/external/qoriq/qoriq-components/flib;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ +git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \ +git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ +git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ " SRC_URI += "file://0001-Fix-this-build-error.patch" @@ -21,6 +21,7 @@ SRCREV = "0bda2c9736a72ef41a411e193bc31487ecce6731" SRCREV_qbman = "75ff61a7ca6acdbdbb780161b053cbcbc990f1be" SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d" +SRCREV_FORMAT = "default_qbman_rta" S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a|ls1088a)" +COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)" diff --git a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch index fd276437..cebd7da1 100644 --- a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch +++ b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Fix this build error fix the below error: |error: 'SIGEV_THREAD' undeclared (first use in this function); did you mean 'CLONE_THREAD'? +Upstream-Status: Pending Signed-off-by: Chunrong Guo <B40290@freescale.com> --- example/lpm-ipfwd/app/odp_lpmfwd.c | 1 + diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb index 00575e24..7d6600d0 100644 --- a/recipes-extended/odp/odp_git.bb +++ b/recipes-extended/odp/odp_git.bb @@ -6,17 +6,16 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "openssl cunit libxml2" -RDEPENDS_${PN} = "bash libcrypto libssl odp-module odp-counters" +RDEPENDS:${PN} = "bash libcrypto libssl odp-module odp-counters" ODP_SOC ?= "" -ODP_SOC_ls1043ardb = "LS1043" -ODP_SOC_ls1046ardb = "LS1046" +ODP_SOC:ls1043ardb = "LS1043" +ODP_SOC:ls1046ardb = "LS1046" ODP_PLATFORM ?= "linux-dpaa2" ODP_BUILD_TYPE ?= "ls2088" -ODP_BUILD_TYPE_ls1043ardb = "ls1043" -ODP_BUILD_TYPE_ls1046ardb = "ls1046" -ODP_BUILD_TYPE_ls2080ardb = "ls2080" -ODP_BUILD_TYPE_ls1088ardb = "ls1088" +ODP_BUILD_TYPE:ls1043ardb = "ls1043" +ODP_BUILD_TYPE:ls1046ardb = "ls1046" +ODP_BUILD_TYPE:ls1088ardb = "ls1088" EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \ --enable-test-vald \ @@ -34,17 +33,17 @@ CFLAGS += "-Wno-format-truncation -Wno-maybe-uninitialized -Wno-implicit-fallthr PACKAGECONFIG[perf] = "--enable-test-perf,,," -do_configure_prepend () { +do_configure:prepend () { export SOC=${ODP_SOC} ${S}/bootstrap } -do_compile_prepend () { +do_compile:prepend () { export SOC=${ODP_SOC} export ARCH=${TUNE_ARCH} } -do_install_append () { +do_install:append () { install -d ${D}${includedir}/odp/kni install -d ${D}${includedir}/odp/kern install -d ${D}${includedir}/odp/flib/mc @@ -58,6 +57,6 @@ do_install_append () { sed -i -e 's#platform/linux-dpaa2/##g' ${D}${includedir}/odp/kern/*.h } -FILES_${PN}-staticdev += "${datadir}/opendataplane/*.la" -FILES_${PN} += "/usr/odp/bin /usr/odp/scripts /usr/odp/debug /usr/odp/test/validation /usr/odp/test/performance /usr/odp/test/miscellaneous /usr/odp/test/api_test" -FILES_${PN}-dbg += "/usr/odp/bin/.debug /usr/odp/debug/.debug /usr/odp/test/validation/.debug /usr/odp/test/performance/.debug /usr/odp/test/miscellaneous/.debug /usr/odp/test/api_test/.debug" +FILES:${PN}-staticdev += "${datadir}/opendataplane/*.la" +FILES:${PN} += "/usr/odp/bin /usr/odp/scripts /usr/odp/debug /usr/odp/test/validation /usr/odp/test/performance /usr/odp/test/miscellaneous /usr/odp/test/api_test" +FILES:${PN}-dbg += "/usr/odp/bin/.debug /usr/odp/debug/.debug /usr/odp/test/validation/.debug /usr/odp/test/performance/.debug /usr/odp/test/miscellaneous/.debug /usr/odp/test/api_test/.debug" diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb index c76eafd7..47e54315 100644 --- a/recipes-extended/ofp/ofp_git.bb +++ b/recipes-extended/ofp/ofp_git.bb @@ -6,7 +6,7 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fbe4957c430eed6cc20521d4eb429fae" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ofp;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1" SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108" @@ -32,6 +32,6 @@ do_configure () { ${S}/configure ${EXTRA_OECONF} } -FILES_${PN} += "/usr/ofp/bin" -FILES_${PN}-dbg += "/usr/ofp/bin/.debug" +FILES:${PN} += "/usr/ofp/bin" +FILES:${PN}-dbg += "/usr/ofp/bin/.debug" COMPATIBLE_MACHINE = "(ls2088a|ls1088a)" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb deleted file mode 100644 index 60e9fe14..00000000 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "OVS DPDK" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" - -DEPENDS = "dpdk python3-six-native coreutils-native" -RDEPENDS_${PN} = "bash libcrypto libssl python3" - -inherit python3native - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1 \ -" -SRCREV = "abc80ef87a8786050f27afb2a797cadd14e2a6bd" - -S = "${WORKDIR}/git" - -DPAA_VER ?= "dpaa" -export RTE_TARGET = "${ARCH}-${DPAA_VER}-linuxapp-gcc" - -EXTRA_OEMAKE += 'ARCH="${ARCH}" CROSS="${TARGET_PREFIX}" \ - CPU_CFLAGS="--sysroot=${STAGING_DIR_HOST}" RTE_SDK="${S}" \ - OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \ - RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" \ -' - -do_configure() { - export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR} - ${S}/boot.sh - ${S}/configure --host aarch64-fsl-linux --with-dpdk=${SYSROOT_DPDK}/usr/share/${RTE_TARGET} --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" -} - -do_compile() { - oe_runmake O="${RTE_TARGET}" T="${RTE_TARGET}" -} - -do_install() { - install -d ${D}${bindir}/ovs-dpdk - cp -rf ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk - cp -rf ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk - cp -rf ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk - cp -rf ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk - cp -rf ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk - cp -rf ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk - chmod 777 -R ${D}${bindir}/ovs-dpdk/* -} - -ALLOW_EMPTY_${PN} = "1" -INHIBIT_PACKAGE_STRIP = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb new file mode 100644 index 00000000..20d06dd6 --- /dev/null +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "OVS DPDK" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" + +DEPENDS = "dpdk python3-six-native coreutils-native autoconf-native automake-native" +RDEPENDS:${PN} = "bash libcrypto libssl python3" + +inherit python3native pkgconfig + +SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1" +SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99" + +S = "${WORKDIR}/git" + +do_configure() { + export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR} + ${S}/boot.sh + ${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" +} + +do_install:append() { + install -d ${D}${bindir}/ovs-dpdk + cp -rf ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk + cp -rf ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk + cp -rf ${S}/ovsdb/ovsdb-client ${D}${bindir}/ovs-dpdk + cp -rf ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk + cp -rf ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk + cp -rf ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk + cp -rf ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk + chmod 777 -R ${D}${bindir}/ovs-dpdk/* +} + +ALLOW_EMPTY:${PN} = "1" +INHIBIT_PACKAGE_STRIP = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-extended/pktgen-dpdk/files/fix-gcc11-mismatched-dealloc-error.patch b/recipes-extended/pktgen-dpdk/files/fix-gcc11-mismatched-dealloc-error.patch new file mode 100644 index 00000000..e535487f --- /dev/null +++ b/recipes-extended/pktgen-dpdk/files/fix-gcc11-mismatched-dealloc-error.patch @@ -0,0 +1,73 @@ +From 530fbb2e2deb6b9214466933df221910c2c50b7c Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Fri, 15 Oct 2021 08:01:15 +0530 +Subject: [PATCH] fix gcc11 mismatched-dealloc error + +Fix build error with gcc 11: +| FAILED: lib/common/libcommon.a.p/lscpu.c.o +| aarch64-poky-linux-gcc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wdate-time --sysroot=/opt/ci/yocto/honister/build-lx2162aqds/tmp/work/lx2162aqds-poky-linux/pktgen-dpdk/21.05.0-r0/recipe-sysroot -Ilib/common/libcommon.a.p -Ilib/common -I../git/lib/common -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -Werror -O3 -DALLOW_EXPERIMENTAL_API -D_GNU_SOURCE -Wno-pedantic -Wno-format-truncation -DRTE_FORCE_INTRINSICS -fPIC -include rte_config.h -march=armv8-a+crc -moutline-atomics -MD -MQ lib/common/libcommon.a.p/lscpu.c.o -MF lib/common/libcommon.a.p/lscpu.c.o.d -o lib/common/libcommon.a.p/lscpu.c.o -c ../git/lib/common/lscpu.c +| In function 'lscpu_info_get', +| inlined from 'lscpu_info' at ../git/lib/common/lscpu.c:210:2: +| ../git/lib/common/lscpu.c:167:9: error: 'fclose' called on pointer returned from a mismatched allocation function [-Werror=mismatched-dealloc] +| 167 | fclose(f); +| | ^~~~~~~~~ +| ../git/lib/common/lscpu.c: In function 'lscpu_info': +| ../git/lib/common/lscpu.c:146:22: note: returned from 'popen' +| 146 | FILE *f = popen(lscpu_path, "r"); +| | ^~~~~~~~~~~~~~~~~~~~~~ +| In function 'cpu_proc_info', +| inlined from 'lscpu_info' at ../git/lib/common/lscpu.c:211:2: +| ../git/lib/common/lscpu.c:195:9: error: 'fclose' called on pointer returned from a mismatched allocation function [-Werror=mismatched-dealloc] +| 195 | fclose(f); +| | ^~~~~~~~~ +| ../git/lib/common/lscpu.c: In function 'lscpu_info': +| ../git/lib/common/lscpu.c:174:22: note: returned from 'popen' +| 174 | FILE *f = popen(proc_path, "r"); +| | ^~~~~~~~~~~~~~~~~~~~~ +| cc1: all warnings being treated as errors + +Upstream-Status: Pending +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + app/pktgen.h | 2 +- + lib/common/lscpu.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/app/pktgen.h b/app/pktgen.h +index 7c61fc8..2f24c65 100644 +--- a/app/pktgen.h ++++ b/app/pktgen.h +@@ -531,7 +531,7 @@ do_command(const char *cmd, int (*display)(char *, int)) { + i = display(line, i); + + if (f) +- fclose(f); ++ pclose(f); + if (line) + free(line); + +diff --git a/lib/common/lscpu.c b/lib/common/lscpu.c +index 8b56ccd..912c601 100644 +--- a/lib/common/lscpu.c ++++ b/lib/common/lscpu.c +@@ -164,7 +164,7 @@ lscpu_info_get(const char *lscpu_path) + } + } + +- fclose(f); ++ pclose(f); + free(line); + } + +@@ -192,7 +192,7 @@ cpu_proc_info(const char *proc_path) + } + } + +- fclose(f); ++ pclose(f); + free(line); + } + +-- +2.25.1 + diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb new file mode 100644 index 00000000..f04e1e9f --- /dev/null +++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "PKTGEN DPDK" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0245ceedaef59ae0129500b0ce1e8a45" + +DEPENDS += "libpcap dpdk lua lua-native" + +SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \ + file://fix-gcc11-mismatched-dealloc-error.patch \ +" +SRCREV = "3a09aa916597fb9a97ee8eec50044cbdb9c4abde" + +S = "${WORKDIR}/git" + +DPAA_VER ?= "dpaa" +export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc" +export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/dpdk" + +inherit meson pkgconfig + +MESON_BUILDTYPE = "release" +EXTRA_OEMESON += '-Dc_args="-DRTE_FORCE_INTRINSICS"' + +do_configure:prepend() { + sed -i "/^add_project_arguments('-march=native'/s/^/#&/" ${S}/meson.build +} + +do_install() { + install -d ${D}${bindir}/ + install -m 0755 app/pktgen ${D}${bindir}/ + install -m 0644 ${S}/Pktgen.lua ${D}${bindir}/ +} + +INSANE_SKIP:${PN} = "ldflags" +INHIBIT_PACKAGE_STRIP = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" +PARALLEL_MAKE = "" +COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb deleted file mode 100644 index 82492ffb..00000000 --- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "PKTGEN DPDK" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=30ac8fa65a07ea7cc1c7ee84e1c80294" - -DEPENDS += "libpcap dpdk lua lua-native" - -SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \ -" -SRCREV = "b3d08bb3c29c999b261c7d74443da03079a012e9" - -S = "${WORKDIR}/git" - -DPAA_VER ?= "dpaa" -export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc" -export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/" - -EXTRA_OEMAKE += 'CC="${CC}" LD="${LD}" RTE_SDK="${RECIPE_SYSROOT}/usr/share/" RTE_TARGET="arm64-${DPAA_VER}-linuxapp-gcc"' - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${bindir}/ - cp -f ${S}/app/arm64-dpaa-linuxapp-gcc/pktgen ${D}${bindir}/ - cp -f ${S}/Pktgen.lua ${D}${bindir}/ -} - -INSANE_SKIP_${PN} = "ldflags" -INHIBIT_PACKAGE_STRIP = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" -PARALLEL_MAKE = "" -COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-extended/procps/procps_%.bbappend b/recipes-extended/procps/procps_%.bbappend index face0ccc..43fb349b 100644 --- a/recipes-extended/procps/procps_%.bbappend +++ b/recipes-extended/procps/procps_%.bbappend @@ -1,4 +1,4 @@ -do_install_append_qoriq-ppc() { +do_install:append:qoriq-ppc() { for keyword in \ net.ipv4.conf.default.rp_filter \ net.ipv4.conf.all.rp_filter \ diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 59b2c3ea..64e4a6b7 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -2,17 +2,16 @@ DESCRIPTION = "Secure Object" LICENSE = "BSD" DEPENDS = "openssl optee-os-qoriq optee-client-qoriq" -RDEPENDS_${PN} = "bash libcrypto libssl" +RDEPENDS:${PN} = "bash libcrypto libssl" -DEPENDS += "python3-pycrypto-native" +DEPENDS += "python3-pycryptodomex-native" inherit python3native LDFLAGS += "${TOOLCHAIN_OPTIONS}" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1 \ -" -SRCREV = "cd3c353df1c3f19577cf3fa08f8a21abd63fb3c1" +SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1" +SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/" @@ -20,9 +19,9 @@ export OPTEE_CLIENT_EXPORT = "${RECIPE_SYSROOT}/usr" EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"' -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" INHIBIT_PACKAGE_STRIP = "1" PARALLEL_MAKE = "" -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" COMPATIBLE_MACHINE = "(qoriq-arm64)" DEBUG_BUILD = "1" diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb index 2d723738..84ecea1e 100644 --- a/recipes-extended/secure-obj/secure-obj_git.bb +++ b/recipes-extended/secure-obj/secure-obj_git.bb @@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2" S = "${WORKDIR}/git" -RDEPENDS_{PN} += "secure-obj-module" +RDEPENDS:{PN} += "secure-obj-module" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/" export OPTEE_CLIENT_EXPORT = "${RECIPE_SYSROOT}/usr" export CROSS_COMPILE_HOST = "${CROSS_COMPILE}" export CROSS_COMPILE_TA = "${CROSS_COMPILE}" -ARCH_qoriq-arm64 = "aarch64" -ARCH_qoriq-arm = "arm" +ARCH:qoriq-arm64 = "aarch64" +ARCH:qoriq-arm = "arm" +CFLAGS += "${TOOLCHAIN_OPTIONS}" do_compile() { unset LDFLAGS @@ -41,6 +42,6 @@ do_install() { rm -rf ${D}${bindir}/test } -FILES_${PN} += "${base_libdir}/optee_armtz ${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines" -INSANE_SKIP_${PN} = "dev-deps ldflags" -INSANE_SKIP_${PN}-dev = "ldflags dev-elf" +FILES:${PN} += "${base_libdir}/optee_armtz ${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines" +INSANE_SKIP:${PN} = "dev-deps ldflags" +INSANE_SKIP:${PN}-dev = "ldflags dev-elf" diff --git a/recipes-extended/skmm-ep/skmm-ep/add-two-missing-header-files.patch b/recipes-extended/skmm-ep/skmm-ep/add-two-missing-header-files.patch index 2a7bb9f2..dca8b72e 100644 --- a/recipes-extended/skmm-ep/skmm-ep/add-two-missing-header-files.patch +++ b/recipes-extended/skmm-ep/skmm-ep/add-two-missing-header-files.patch @@ -1,7 +1,8 @@ add two missing header files -Upstream-status: Pending +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- include/linux/fsl_pci_ep_vfio.h | 79 ++++++ include/linux/vfio.h | 555 ++++++++++++++++++++++++++++++++++++++++ diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb index 94649477..c08c9492 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb @@ -1,13 +1,13 @@ DESCRIPTION = "SKMM application for PCIe endpoint" SECTION = "skmm-ep" -LICENSE = "BSD & GPLv2" +LICENSE = "BSD & GPL-2.0-only" LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5b1f" DEPENDS = "libedit openssl virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;branch=sdk-v2.0.x \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ file://add-two-missing-header-files.patch \ " SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896" diff --git a/recipes-extended/testfloat/files/SoftFloat-powerpc-1.patch b/recipes-extended/testfloat/files/SoftFloat-powerpc-1.patch index b6db2de2..51a0da19 100644 --- a/recipes-extended/testfloat/files/SoftFloat-powerpc-1.patch +++ b/recipes-extended/testfloat/files/SoftFloat-powerpc-1.patch @@ -1,5 +1,6 @@ This patch adds PowerPC support in SoftFloat. +Upstream-Status: Pending Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com> Signed-off-by: Liu Yu <Yu.Liu@freescale.com> --- diff --git a/recipes-extended/testfloat/files/TestFloat-powerpc-E500v2-SPE-1.patch b/recipes-extended/testfloat/files/TestFloat-powerpc-E500v2-SPE-1.patch index c34421cf..2e904174 100644 --- a/recipes-extended/testfloat/files/TestFloat-powerpc-E500v2-SPE-1.patch +++ b/recipes-extended/testfloat/files/TestFloat-powerpc-E500v2-SPE-1.patch @@ -1,6 +1,7 @@ This patch adds PowerPC E500v2 SPE support in TestFloat. And it disables the testing for hardware that can not trigger SPE interrupt. +Upstream-Status: Pending Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com> Signed-off-by: Liu Yu <Yu.Liu@freescale.com> --- diff --git a/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch b/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch index f2ff1c00..c6cfaf41 100644 --- a/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch +++ b/recipes-extended/testfloat/files/Yocto-replace-COMPILE_PREFIX-gcc.patch @@ -3,6 +3,7 @@ From: Ting Liu <b28495@freescale.com> Date: Wed, 9 May 2012 02:42:57 -0500 Subject: [PATCH] Yocto: replace $(COMPILE_PREFIX)gcc with $(CC) and remove -te500v2 flags +Upstream-Status: Pending Signed-off-by: Ting Liu <b28495@freescale.com> --- SoftFloat-2b/softfloat/bits32/powerpc-GCC/Makefile | 4 ++-- diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb index 800cef3d..4ed2ceb3 100644 --- a/recipes-extended/testfloat/testfloat_2a.bb +++ b/recipes-extended/testfloat/testfloat_2a.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \ http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \ " -SRC_URI_append_qoriq-ppc = " file://SoftFloat-powerpc-1.patch \ +SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \ file://TestFloat-powerpc-E500v2-SPE-1.patch \ file://Yocto-replace-COMPILE_PREFIX-gcc.patch \ " @@ -40,6 +40,6 @@ do_install(){ install testfloat/powerpc-linux-gcc/testsoftfloat ${D}/${bindir} } -COMPATIBLE_HOST_e500v2 = ".*" +COMPATIBLE_HOST:e500v2 = ".*" COMPATIBLE_HOST ?= "(none)" diff --git a/recipes-extended/tsntool/tsntool/0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch b/recipes-extended/tsntool/tsntool/0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch new file mode 100644 index 00000000..3a9bc31f --- /dev/null +++ b/recipes-extended/tsntool/tsntool/0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch @@ -0,0 +1,29 @@ +From 2cf9a3f919317784e7cecdff6b632cdb2665c580 Mon Sep 17 00:00:00 2001 +From: Meng Li <Meng.Li@windriver.com> +Date: Mon, 12 Jun 2023 15:17:21 +0800 +Subject: [PATCH] tsntool: remove redundant parameters from BIN_LDFLAGS + +The recipe file has pass the same parameter(-Wl,-rpath-link,<lib path>) +to Makefile, so remove redundant parameters from BIN_LDFLAGS. + +Upstream-Status: Pending +Signed-off-by: Meng Li <Meng.Li@windriver.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0ba88b4..39a98c0 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,6 @@ BIN_CFLAGS += -Wall -Wextra -Wno-error=unused-parameter -Wno-error=sign-compare + BIN_CFLAGS += $(shell $(PKG_CONFIG) --cflags libnl-3.0 libnl-genl-3.0 libcjson) -Iinclude + BIN_LDFLAGS += -ltsn $(shell $(PKG_CONFIG) --libs libnl-3.0 libnl-genl-3.0 libcjson) -lpthread -lm -lrt + BIN_LDFLAGS += -lreadline -ltermcap -L. +-BIN_LDFLAGS += -Wl,-rpath,$(shell pwd) # Compiled lib at local folder + + BIN_SRC = + LIB_SRC = +-- +2.40.1 + diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index 4ce353be..2ad4a0c4 100644 --- a/recipes-extended/tsntool/tsntool_git.bb +++ b/recipes-extended/tsntool/tsntool_git.bb @@ -1,33 +1,37 @@ SUMMARY = "Configure TSN funtionalitie" DESCRIPTION = "A tool to configure TSN funtionalities in user space" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=ef58f855337069acd375717db0dbbb6d" DEPENDS = "cjson libnl readline" inherit pkgconfig -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/tsntool;protocol=https;nobranch=1" -SRCREV = "30a0320eb4a1798ac3d6258a2e02d863e60a1582" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI = "git://github.com/nxp-qoriq/tsntool;protocol=https;nobranch=1" +SRCREV = "a0769e23304957a22f0cbeee6d1f547b20c3c21e" + +SRC_URI:append = " \ + file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \ +" S = "${WORKDIR}/git" do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_compile_prepend() { +do_compile:prepend() { mkdir -p ${S}/include/linux cp -r ${STAGING_KERNEL_DIR}/include/uapi/linux/tsn.h ${S}/include/linux } do_install() { - install -d ${D}${bindir} ${D}${libdir} + install -d ${D}${bindir} ${D}${libdir} install -m 0755 ${S}/tsntool ${D}${bindir} - install -m 0755 ${S}/tools/event ${D}${bindir}/ - install -m 0755 ${S}/tools/timestamping ${D}${bindir}/ install -m 0755 ${S}/libtsn.so ${D}${libdir} } PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN} = "${libdir}/libtsn.so ${bindir}/*" -INSANE_SKIP_${PN} += "file-rdeps rpaths dev-so" +FILES:${PN} = "${libdir}/libtsn.so ${bindir}/*" +INSANE_SKIP:${PN} += "file-rdeps rpaths dev-so" COMPATIBLE_MACHINE = "(qoriq)" PARALLEL_MAKE = "" diff --git a/recipes-extended/vpp-core/dpdkvpp.bb b/recipes-extended/vpp-core/dpdkvpp.bb deleted file mode 100644 index 78d166a4..00000000 --- a/recipes-extended/vpp-core/dpdkvpp.bb +++ /dev/null @@ -1,126 +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" - -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 5c7a3560..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 python3-ply util-linux vpp-core-native" - -DEPENDS_class-native = "openssl-native python3-ply-native util-linux-native" - -inherit cmake -inherit pkgconfig -inherit python3-dir python3native - -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 " - |