diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-06-08 13:04:28 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-06-09 09:54:12 -0500 |
commit | 14b26cb099f3622023c9b08392f56ef8046f80a3 (patch) | |
tree | 219ce0efddb6d3b682eb311542ee0565a61363bf | |
parent | 68ce837a4c500f0e9031c6a5e28c120f69822eba (diff) | |
download | meta-xilinx-14b26cb099f3622023c9b08392f56ef8046f80a3.tar.gz |
meta-dpdk: Remove dpdk-module, module is part of linux-xlnx
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r-- | meta-dpdk/recipes-extended/dpdk/dpdk-module_22.07.0.bb | 58 | ||||
-rw-r--r-- | meta-dpdk/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch | 74 |
2 files changed, 0 insertions, 132 deletions
diff --git a/meta-dpdk/recipes-extended/dpdk/dpdk-module_22.07.0.bb b/meta-dpdk/recipes-extended/dpdk/dpdk-module_22.07.0.bb deleted file mode 100644 index 3fcbf1ec..00000000 --- a/meta-dpdk/recipes-extended/dpdk/dpdk-module_22.07.0.bb +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | include dpdk.inc | ||
2 | |||
3 | FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" | ||
4 | |||
5 | SRC_URI = "git://dpdk.org/git/dpdk;branch=${BRANCH};protocol=https \ | ||
6 | file://0001-Makefile-add-makefile.patch \ | ||
7 | " | ||
8 | |||
9 | BRANCH = "releases" | ||
10 | SRCREV = "4fceceed5b5e9fbf04acffd66239c79d81e79260" | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | inherit module | ||
14 | |||
15 | #kernel module needs 'rte_build_config.h', which is generated at buid time | ||
16 | DEPENDS += "dpdk" | ||
17 | |||
18 | COMPATIBLE_MACHINE = "null" | ||
19 | COMPATIBLE_HOST:libc-musl:class-target = "null" | ||
20 | COMPATIBLE_HOST:linux-gnux32 = "null" | ||
21 | |||
22 | export S | ||
23 | export STAGING_KERNEL_DIR | ||
24 | export STAGING_INCDIR | ||
25 | export INSTALL_MOD_DIR="dpdk" | ||
26 | |||
27 | do_configure[noexec] = "1" | ||
28 | |||
29 | do_compile() { | ||
30 | cd ${S}/kernel/linux/kni | ||
31 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
32 | oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ | ||
33 | KERNEL_VERSION=${KERNEL_VERSION} \ | ||
34 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
35 | AR="${KERNEL_AR}" \ | ||
36 | O=${STAGING_KERNEL_BUILDDIR} \ | ||
37 | KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ | ||
38 | ${MAKE_TARGETS} | ||
39 | } | ||
40 | |||
41 | do_install() { | ||
42 | cd ${S}/kernel/linux/kni | ||
43 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
44 | oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ | ||
45 | INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ | ||
46 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
47 | O=${STAGING_KERNEL_BUILDDIR} \ | ||
48 | ${MODULES_INSTALL_TARGET} | ||
49 | } | ||
50 | |||
51 | # CVE-2021-3839 has been fixed by commit 4c40d30d2b in 21.11.1 | ||
52 | # NVD database is incomplete | ||
53 | # CVE-2022-0669 has been fixed by commit 6cb68162e4 in 21.11.1 | ||
54 | # NVD database is incomplete | ||
55 | CVE_CHECK_IGNORE += "\ | ||
56 | CVE-2021-3839 \ | ||
57 | CVE-2022-0669 \ | ||
58 | " | ||
diff --git a/meta-dpdk/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch b/meta-dpdk/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch deleted file mode 100644 index 18b75fb6..00000000 --- a/meta-dpdk/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From 768cef60957d5e840071d1d6514d4add3f3c2904 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Wed, 14 Apr 2021 17:25:53 +0800 | ||
4 | Subject: [PATCH] Makefile: add makefile | ||
5 | |||
6 | Current meson build for kernel module build does not fit in Yocto. | ||
7 | So added Makefile to build rte_kni.ko | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
12 | --- | ||
13 | kernel/linux/kni/Kbuild | 6 ------ | ||
14 | kernel/linux/kni/Makefile | 35 +++++++++++++++++++++++++++++++++++ | ||
15 | 2 files changed, 35 insertions(+), 6 deletions(-) | ||
16 | delete mode 100644 kernel/linux/kni/Kbuild | ||
17 | create mode 100644 kernel/linux/kni/Makefile | ||
18 | |||
19 | diff --git a/kernel/linux/kni/Kbuild b/kernel/linux/kni/Kbuild | ||
20 | deleted file mode 100644 | ||
21 | index e5452d6c00..0000000000 | ||
22 | --- a/kernel/linux/kni/Kbuild | ||
23 | +++ /dev/null | ||
24 | @@ -1,6 +0,0 @@ | ||
25 | -# SPDX-License-Identifier: BSD-3-Clause | ||
26 | -# Copyright(c) 2018 Luca Boccassi <bluca@debian.org> | ||
27 | - | ||
28 | -ccflags-y := $(MODULE_CFLAGS) | ||
29 | -obj-m := rte_kni.o | ||
30 | -rte_kni-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c)) | ||
31 | diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile | ||
32 | new file mode 100644 | ||
33 | index 0000000000..19897ee06e | ||
34 | --- /dev/null | ||
35 | +++ b/kernel/linux/kni/Makefile | ||
36 | @@ -0,0 +1,35 @@ | ||
37 | +# | ||
38 | +# Makefile for building rte_kni.ko | ||
39 | +# | ||
40 | +MODULE_CFLAGS += -include $(S)/config/rte_config.h | ||
41 | +MODULE_CFLAGS += -I$(S)/lib/librte_eal/include | ||
42 | +MODULE_CFLAGS += -I$(S)/lib/librte_kni | ||
43 | +MODULE_CFLAGS += -I$(S)/kernel/linux/kni | ||
44 | +MODULE_CFLAGS += -I$(S) | ||
45 | +MODULE_CFLAGS += -I$(STAGING_INCDIR) | ||
46 | + | ||
47 | +rte_kni-objs = kni_misc.o kni_net.o | ||
48 | + | ||
49 | +ccflags-y := $(MODULE_CFLAGS) | ||
50 | +cflags-y := $(MODULE_CFLAGS) | ||
51 | +obj-m := rte_kni.o | ||
52 | + | ||
53 | + | ||
54 | +KERNEL_MAKE_OPTS := -C $(STAGING_KERNEL_DIR) M=$(CURDIR) | ||
55 | +ifneq ($(ARCH),) | ||
56 | +KERNEL_MAKE_OPTS += ARCH=$(ARCH) | ||
57 | +endif | ||
58 | +ifneq ($(CROSS_COMPILE),) | ||
59 | +KERNEL_MAKE_OPTS += CROSS_COMPILE=$(CROSS_COMPILE) | ||
60 | +endif | ||
61 | + | ||
62 | +build: | ||
63 | + $(MAKE) $(KERNEL_MAKE_OPTS) modules | ||
64 | + | ||
65 | +install: modules_install | ||
66 | + | ||
67 | +modules_install: | ||
68 | + $(MAKE) $(KERNEL_MAKE_OPTS) modules_install | ||
69 | + | ||
70 | +clean: | ||
71 | + $(MAKE) $(KERNEL_MAKE_OPTS) clean | ||
72 | -- | ||
73 | 2.17.1 | ||
74 | |||