aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/dpdk/dpdk.inc9
-rw-r--r--recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch6
-rw-r--r--recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch7
-rw-r--r--recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch12
-rw-r--r--recipes-extended/dpdk/dpdk_18.11.bb8
-rw-r--r--recipes-extended/dpdk/dpdk_19.11-20.04.bb18
-rw-r--r--recipes-extended/vpp-core/dpdkvpp.bb2
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch6
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch7
-rw-r--r--recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch12
10 files changed, 43 insertions, 44 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 71977bae..f5793a19 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -1,15 +1,6 @@
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"
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..5ee48a59 100644
--- a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch
+++ b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch
@@ -1,4 +1,4 @@
-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
@@ -9,7 +9,7 @@ Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
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 +22,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..fa0eda87 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,15 @@
-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]
-
---
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 +22,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/0004-update-WERROR_FLAGS.patch b/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch
index 9249b2b5..61467377 100644
--- a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch
+++ b/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch
@@ -1,4 +1,4 @@
-From 3828a36fa537a187127a1c9b82ce2f5959b88367 Mon Sep 17 00:00:00 2001
+From aa97b9162b68780ca912a226b5045a3ddab41d3c 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
@@ -10,12 +10,12 @@ Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
-index dfbebdc..8b5c13e 100644
+index 595bac261..a17939996 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 += -I$(RTE_OUTPUT)/include
MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-MODULE_CFLAGS += -Wall -Werror
+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes
@@ -23,17 +23,17 @@ index dfbebdc..8b5c13e 100644
-include /etc/lsb-release
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
-index aa94344..81efa1c 100644
+index de5e0d24d..ca2cb5fcd 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
++WERROR_FLAGS += -Wno-address-of-packed-member
ifeq ($(RTE_DEVEL_BUILD),y)
WERROR_FLAGS += -Werror
--
-2.7.4
+2.17.1
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.04.bb b/recipes-extended/dpdk/dpdk_19.11-20.04.bb
new file mode 100644
index 00000000..12b6d56e
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk_19.11-20.04.bb
@@ -0,0 +1,18 @@
+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 = "4110a5fed09fa034963cfc246a6285911ecbd540"
+
+include dpdk.inc
+
+
+do_install_append () {
+ # Remove the unneeded dir
+ rm -rf ${D}/${datadir}/${RTE_TARGET}/app
+}
+
diff --git a/recipes-extended/vpp-core/dpdkvpp.bb b/recipes-extended/vpp-core/dpdkvpp.bb
index 78d166a4..8e8abe86 100644
--- a/recipes-extended/vpp-core/dpdkvpp.bb
+++ b/recipes-extended/vpp-core/dpdkvpp.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobr
file://0001-Add-RTE_KERNELDIR_OUT.patch \
file://0004-update-WERROR_FLAGS.patch \
"
-SRCREV = "a36da6a94243015b228c15b8b9aa1e650fd4b96d"
+SRCREV = "4110a5fed09fa034963cfc246a6285911ecbd540"
DEPENDS = "virtual/kernel openssl"
DEPENDS_append_x86-64 = " numactl"
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
index 64a6876f..5ee48a59 100644
--- a/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch
+++ b/recipes-extended/vpp-core/dpdkvpp/0001-Add-RTE_KERNELDIR_OUT.patch
@@ -1,4 +1,4 @@
-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
@@ -9,7 +9,7 @@ Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
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 +22,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/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch b/recipes-extended/vpp-core/dpdkvpp/0001-add-Wno-cast-function-type.patch
index c074eac6..fa0eda87 100644
--- 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
@@ -1,16 +1,15 @@
-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]
-
---
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 +22,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/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch b/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch
index 9249b2b5..61467377 100644
--- a/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch
+++ b/recipes-extended/vpp-core/dpdkvpp/0004-update-WERROR_FLAGS.patch
@@ -1,4 +1,4 @@
-From 3828a36fa537a187127a1c9b82ce2f5959b88367 Mon Sep 17 00:00:00 2001
+From aa97b9162b68780ca912a226b5045a3ddab41d3c 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
@@ -10,12 +10,12 @@ Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
-index dfbebdc..8b5c13e 100644
+index 595bac261..a17939996 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 += -I$(RTE_OUTPUT)/include
MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-MODULE_CFLAGS += -Wall -Werror
+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes
@@ -23,17 +23,17 @@ index dfbebdc..8b5c13e 100644
-include /etc/lsb-release
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
-index aa94344..81efa1c 100644
+index de5e0d24d..ca2cb5fcd 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
++WERROR_FLAGS += -Wno-address-of-packed-member
ifeq ($(RTE_DEVEL_BUILD),y)
WERROR_FLAGS += -Werror
--
-2.7.4
+2.17.1