aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2019-07-01 11:00:33 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2019-07-05 09:01:31 +0800
commit1a80901a65bce2385dca5dfe60285e22de8d708b (patch)
tree37502e747581cbd7b899862c88641fe4c4404986
parent4d71b0b3f69ad9a25068c408cfae3082624832ec (diff)
downloadmeta-dpdk-1a80901a65bce2385dca5dfe60285e22de8d708b.tar.gz
meta-dpdk-1a80901a65bce2385dca5dfe60285e22de8d708b.tar.bz2
meta-dpdk-1a80901a65bce2385dca5dfe60285e22de8d708b.zip
dpdk: Remove 18.05
We have already had 18.11 and 18.05 is not a stable version. This patch also removes the patches no longer needed. Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch42
-rw-r--r--recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch31
-rw-r--r--recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch79
-rw-r--r--recipes-extended/dpdk/dpdk_18.05.bb15
4 files changed, 0 insertions, 167 deletions
diff --git a/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch b/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
deleted file mode 100644
index 2facd39..0000000
--- a/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 41ac64efa5050430b73e0f8813dffc7327083273 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 1 Aug 2017 20:18:46 -0700
-Subject: [PATCH] examples: Fix maybe-uninitialized warning
-
-Initialize arrays to 0, makes compiler happy about
-
-error: 'vals[0]' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- examples/qos_sched/args.c | 2 +-
- examples/vhost/virtio_net.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
-index 83eee95cc28e..3d2c0fbd6d0a 100644
---- a/examples/qos_sched/args.c
-+++ b/examples/qos_sched/args.c
-@@ -212,7 +212,7 @@ static int
- app_parse_flow_conf(const char *conf_str)
- {
- int ret;
-- uint32_t vals[5];
-+ uint32_t vals[5] = {0};
- struct flow_conf *pconf;
- uint64_t mask;
-
-diff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c
-index f6e00674d9af..a4a90704d7b4 100644
---- a/examples/vhost/virtio_net.c
-+++ b/examples/vhost/virtio_net.c
-@@ -293,7 +293,7 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,
- {
- struct vhost_queue *queue;
- struct rte_vhost_vring *vr;
-- uint32_t desc_indexes[MAX_PKT_BURST];
-+ uint32_t desc_indexes[MAX_PKT_BURST] = {0};
- uint32_t used_idx;
- uint32_t i = 0;
- uint16_t free_entries;
diff --git a/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch b/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch
deleted file mode 100644
index 7a8b035..0000000
--- a/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 916378ef5ae45e63d12cc5235b2b59f90514ba25 Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Fri, 1 Apr 2016 17:31:55 +0800
-Subject: [PATCH] dpdk: enable ip_fragmentation in common_base config
-
-Upstream-Status: Inappropriate [Configuration]
-
-This configuration need to set for ip_fragmentation application.
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-
----
- config/common_base | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/config/common_base b/config/common_base
-index ad03cf43392f..ba5794d6c402 100644
---- a/config/common_base
-+++ b/config/common_base
-@@ -691,6 +691,11 @@ CONFIG_RTE_LIBRTE_POWER=n
- CONFIG_RTE_LIBRTE_POWER_DEBUG=n
- CONFIG_RTE_MAX_LCORE_FREQS=64
-
-+#
-+# Compile ip_fragmentation
-+#
-+CONFIG_RTE_IP_FRAG=y
-+
- #
- # Compile librte_net
- #
diff --git a/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch b/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
deleted file mode 100644
index 0505888..0000000
--- a/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 0be350c3b04d83ea9182f45936ef3219aed5c0c1 Mon Sep 17 00:00:00 2001
-From: Shashwat Pandey <shashwatx.p@intel.com>
-Date: Mon, 20 Feb 2017 15:46:22 +0800
-Subject: [PATCH] dpdk: fix installation warning and issue
-
-Upstream-Status: Inappropriate [configuration]
-
-Ensure that all compiled libs should be installed to correct location.
-For cross compiling cp -r and extra tar flags used to avoid QA warning
-[host-user-contaminated].
-Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files
-installation since it is not needed as a part of image.
-
-Signed-off-by: Shashwat Pandey <shashwatx.p@intel.com>
-
----
- mk/rte.sdkinstall.mk | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index 4e97feff9fde..42625333a4e2 100644
---- a/mk/rte.sdkinstall.mk
-+++ b/mk/rte.sdkinstall.mk
-@@ -115,16 +115,17 @@ endif
-
- install-runtime:
- $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
-- $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir)
-+ $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
-- $(Q)tar -cf - -C $O --exclude 'app/*.map' \
-- --exclude app/dpdk-pmdinfogen \
-- --exclude 'app/cmdline*' --exclude app/test \
-- --exclude app/testacl --exclude app/testpipeline app | \
-- tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \
-- --keep-newer-files
-+ $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \
-+ tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \
-+ --strip-components=1 --keep-newer-files --warning=no-ignore-newer
- $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
-- $(Q)cp -a $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
-+ $(Q)cp -r $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
-+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-setup.sh, \
-+ $(DESTDIR)$(datadir)/usertools/setup.sh)
-+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
-+ $(DESTDIR)$(datadir)/usertools/dpdk_nic_bind.py)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir))
- $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
- $(DESTDIR)$(sbindir)/dpdk-devbind)
-@@ -142,7 +143,7 @@ endif
- install-kmod:
- ifneq ($(wildcard $O/kmod/*),)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir))
-- $(Q)cp -a $O/kmod/* $(DESTDIR)$(kerneldir)
-+ $(Q)cp -r $O/kmod/* $(DESTDIR)$(kerneldir)
- endif
-
- install-sdk:
-@@ -151,11 +152,9 @@ install-sdk:
- tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \
- --keep-newer-files
- $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir))
-- $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir)
-- $(Q)cp -a $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir)
-- $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app)
-- $(Q)cp -a $O/.config $(DESTDIR)$(targetdir)
-- $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app
-+ $(Q)cp -r $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir)
-+ $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir))
-+ $(Q)cp -r $O/.config $(DESTDIR)$(targetdir)
- $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
- $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib)
-
-@@ -171,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),)
- $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
- endif
- $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
-- $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir)
-+ $(Q)cp -r $(RTE_SDK)/examples $(DESTDIR)$(datadir)
diff --git a/recipes-extended/dpdk/dpdk_18.05.bb b/recipes-extended/dpdk/dpdk_18.05.bb
deleted file mode 100644
index b6897a8..0000000
--- a/recipes-extended/dpdk/dpdk_18.05.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-include dpdk.inc
-
-SRCREV = "a5dce55556286cc56655320d975c67b0dbe08693"
-
-LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2"
-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 += "\
- file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
- file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
- file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
- file://0001-examples-Fix-maybe-uninitialized-warning.patch \
- "