diff --git a/dpdk.spec b/dpdk.spec index eaf1c5348396e8ff9f73f5c2f2ac1715b802756f..df5d535cca2c23fe51fcd628189fefacf96262fc 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,6 +1,6 @@ Name: dpdk Version: 19.11 -Release: 5 +Release: 8 Packager: packaging@6wind.com URL: http://dpdk.org %global source_version 19.11 @@ -11,11 +11,14 @@ Patch1: CVE-2020-10722.patch Patch2: CVE-2020-10723.patch Patch3: CVE-2020-10724.patch Patch4: CVE-2020-10726.patch -Patch5: CVE-2020-14378.patch -Patch6: CVE-2020-14376-CVE-2020-14377.patch -Patch7: fix-pool-allocation.patch -Patch8: CVE-2020-14374.patch -Patch9: CVE-2020-14375.patch +Patch5: kni-fix-build-with-Linux-5.6.patch +Patch6: v2-kni-fix-build-with-Linux-5.9.patch +Patch7: CVE-2020-14378.patch +Patch8: CVE-2020-14376-CVE-2020-14377.patch +Patch9: fix-pool-allocation.patch +Patch10: CVE-2020-14374.patch +Patch11: CVE-2020-14375.patch +Patch12: fix-compilation-error-of-max-inline-insns-single-o2-.patch Summary: Data Plane Development Kit core Group: System Environment/Libraries @@ -82,6 +85,9 @@ This package contains the pdump tool for capture the dpdk network packets. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build namer=%{kern_devel_ver} @@ -183,7 +189,10 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko /usr/sbin/depmod %changelog -* Mon Nov 2 2020 zhaowei - 19.11-5 +* Thu Jan 28 2021 huangliming - 19.11-8 +- fix compilation error of max-inline-insns-single-o2 limit reached + +* Mon Dec 28 2020 huangliming - 19.11-7 -fix CVE-2020-14374 CVE-2020-14375 * Tue Oct 20 2020 chenxiang - 19.11-4 diff --git a/fix-compilation-error-of-max-inline-insns-single-o2-.patch b/fix-compilation-error-of-max-inline-insns-single-o2-.patch new file mode 100644 index 0000000000000000000000000000000000000000..4904ef50394a88a3ac3b7bf48928cdf7a9d7708b --- /dev/null +++ b/fix-compilation-error-of-max-inline-insns-single-o2-.patch @@ -0,0 +1,27 @@ +From f3d569535f34bb5983c325757941b5565364017f Mon Sep 17 00:00:00 2001 +From: LemmyHuang +Date: Thu, 28 Jan 2021 08:34:33 +0000 +Subject: [PATCH] fix compilation error of max-inline-insns-single-o2 limit + reached + +Signed-off-by: LemmyHuang +--- + kernel/linux/igb_uio/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile +index f83bcc7..4c69f5d 100644 +--- a/kernel/linux/igb_uio/Makefile ++++ b/kernel/linux/igb_uio/Makefile +@@ -14,7 +14,7 @@ MODULE_PATH = drivers/net/igb_uio + # + MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100 + MODULE_CFLAGS += -I$(RTE_OUTPUT)/include +-MODULE_CFLAGS += -Winline -Wall -Werror ++MODULE_CFLAGS += -Winline -Wall + MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h + + # +-- +2.23.0 +