summaryrefslogtreecommitdiffstats
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
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 @@
1From 41ac64efa5050430b73e0f8813dffc7327083273 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 1 Aug 2017 20:18:46 -0700
4Subject: [PATCH] examples: Fix maybe-uninitialized warning
5
6Initialize arrays to 0, makes compiler happy about
7
8error: 'vals[0]' may be used uninitialized in this function [-Werror=maybe-uninitialized]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 examples/qos_sched/args.c | 2 +-
14 examples/vhost/virtio_net.c | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
18index 83eee95cc28e..3d2c0fbd6d0a 100644
19--- a/examples/qos_sched/args.c
20+++ b/examples/qos_sched/args.c
21@@ -212,7 +212,7 @@ static int
22 app_parse_flow_conf(const char *conf_str)
23 {
24 int ret;
25- uint32_t vals[5];
26+ uint32_t vals[5] = {0};
27 struct flow_conf *pconf;
28 uint64_t mask;
29
30diff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c
31index f6e00674d9af..a4a90704d7b4 100644
32--- a/examples/vhost/virtio_net.c
33+++ b/examples/vhost/virtio_net.c
34@@ -293,7 +293,7 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,
35 {
36 struct vhost_queue *queue;
37 struct rte_vhost_vring *vr;
38- uint32_t desc_indexes[MAX_PKT_BURST];
39+ uint32_t desc_indexes[MAX_PKT_BURST] = {0};
40 uint32_t used_idx;
41 uint32_t i = 0;
42 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 @@
1From 916378ef5ae45e63d12cc5235b2b59f90514ba25 Mon Sep 17 00:00:00 2001
2From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
3Date: Fri, 1 Apr 2016 17:31:55 +0800
4Subject: [PATCH] dpdk: enable ip_fragmentation in common_base config
5
6Upstream-Status: Inappropriate [Configuration]
7
8This configuration need to set for ip_fragmentation application.
9
10Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
11
12---
13 config/common_base | 5 +++++
14 1 file changed, 5 insertions(+)
15
16diff --git a/config/common_base b/config/common_base
17index ad03cf43392f..ba5794d6c402 100644
18--- a/config/common_base
19+++ b/config/common_base
20@@ -691,6 +691,11 @@ CONFIG_RTE_LIBRTE_POWER=n
21 CONFIG_RTE_LIBRTE_POWER_DEBUG=n
22 CONFIG_RTE_MAX_LCORE_FREQS=64
23
24+#
25+# Compile ip_fragmentation
26+#
27+CONFIG_RTE_IP_FRAG=y
28+
29 #
30 # Compile librte_net
31 #
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 @@
1From 0be350c3b04d83ea9182f45936ef3219aed5c0c1 Mon Sep 17 00:00:00 2001
2From: Shashwat Pandey <shashwatx.p@intel.com>
3Date: Mon, 20 Feb 2017 15:46:22 +0800
4Subject: [PATCH] dpdk: fix installation warning and issue
5
6Upstream-Status: Inappropriate [configuration]
7
8Ensure that all compiled libs should be installed to correct location.
9For cross compiling cp -r and extra tar flags used to avoid QA warning
10[host-user-contaminated].
11Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files
12installation since it is not needed as a part of image.
13
14Signed-off-by: Shashwat Pandey <shashwatx.p@intel.com>
15
16---
17 mk/rte.sdkinstall.mk | 29 ++++++++++++++---------------
18 1 file changed, 14 insertions(+), 15 deletions(-)
19
20diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
21index 4e97feff9fde..42625333a4e2 100644
22--- a/mk/rte.sdkinstall.mk
23+++ b/mk/rte.sdkinstall.mk
24@@ -115,16 +115,17 @@ endif
25
26 install-runtime:
27 $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
28- $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir)
29+ $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir)
30 $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
31- $(Q)tar -cf - -C $O --exclude 'app/*.map' \
32- --exclude app/dpdk-pmdinfogen \
33- --exclude 'app/cmdline*' --exclude app/test \
34- --exclude app/testacl --exclude app/testpipeline app | \
35- tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \
36- --keep-newer-files
37+ $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \
38+ tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \
39+ --strip-components=1 --keep-newer-files --warning=no-ignore-newer
40 $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
41- $(Q)cp -a $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
42+ $(Q)cp -r $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
43+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-setup.sh, \
44+ $(DESTDIR)$(datadir)/usertools/setup.sh)
45+ $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
46+ $(DESTDIR)$(datadir)/usertools/dpdk_nic_bind.py)
47 $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir))
48 $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
49 $(DESTDIR)$(sbindir)/dpdk-devbind)
50@@ -142,7 +143,7 @@ endif
51 install-kmod:
52 ifneq ($(wildcard $O/kmod/*),)
53 $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir))
54- $(Q)cp -a $O/kmod/* $(DESTDIR)$(kerneldir)
55+ $(Q)cp -r $O/kmod/* $(DESTDIR)$(kerneldir)
56 endif
57
58 install-sdk:
59@@ -151,11 +152,9 @@ install-sdk:
60 tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \
61 --keep-newer-files
62 $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir))
63- $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir)
64- $(Q)cp -a $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir)
65- $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app)
66- $(Q)cp -a $O/.config $(DESTDIR)$(targetdir)
67- $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app
68+ $(Q)cp -r $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir)
69+ $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir))
70+ $(Q)cp -r $O/.config $(DESTDIR)$(targetdir)
71 $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
72 $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib)
73
74@@ -171,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),)
75 $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
76 endif
77 $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
78- $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir)
79+ $(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 @@
1include dpdk.inc
2
3SRCREV = "a5dce55556286cc56655320d975c67b0dbe08693"
4
5LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2"
6LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
8 file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
9
10SRC_URI += "\
11 file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
12 file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
13 file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
14 file://0001-examples-Fix-maybe-uninitialized-warning.patch \
15 "