diff options
Diffstat (limited to 'recipes-extended/dpdk')
-rw-r--r-- | recipes-extended/dpdk/dpdk-module_20.11.5.bb (renamed from recipes-extended/dpdk/dpdk-module_20.11.1.bb) | 2 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch | 35 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk_20.11.5.bb (renamed from recipes-extended/dpdk/dpdk_20.11.1.bb) | 3 |
3 files changed, 2 insertions, 38 deletions
diff --git a/recipes-extended/dpdk/dpdk-module_20.11.1.bb b/recipes-extended/dpdk/dpdk-module_20.11.5.bb index 42fe229..64defa8 100644 --- a/recipes-extended/dpdk/dpdk-module_20.11.1.bb +++ b/recipes-extended/dpdk/dpdk-module_20.11.5.bb | |||
@@ -8,7 +8,7 @@ SRC_URI += " \ | |||
8 | " | 8 | " |
9 | STABLE = "-stable" | 9 | STABLE = "-stable" |
10 | BRANCH = "20.11" | 10 | BRANCH = "20.11" |
11 | SRCREV = "b1e71cf43153cca07db6cbb69fdca030ccf52234" | 11 | SRCREV = "abf68ccc8b1f923f0eb0b6bf2a8b944378e1ebeb" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | inherit module | 14 | inherit module |
diff --git a/recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch b/recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch deleted file mode 100644 index 4df28c4..0000000 --- a/recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 308409d72671b7978b20d40748ad985a235b6c86 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com> | ||
3 | Date: Thu, 24 Jun 2021 11:30:09 +0800 | ||
4 | Subject: [PATCH] ifpga/meson: Fix finding librt using find_library() | ||
5 | |||
6 | Finding with "librt" keyword would give the output | ||
7 | with full path of librt such as /usr/lib/librt.so | ||
8 | instead of -lrt. | ||
9 | |||
10 | Assume find_library() will prepend "lib", thus remove | ||
11 | "lib" from "librt" keyword. The output will shows as | ||
12 | -lrt. | ||
13 | |||
14 | Upstream-Status: Submitted [https://mails.dpdk.org/archives/stable/2021-June/031840.html] | ||
15 | |||
16 | Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com> | ||
17 | --- | ||
18 | drivers/raw/ifpga/base/meson.build | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build | ||
22 | index da2d6e33c..949f7f127 100644 | ||
23 | --- a/drivers/raw/ifpga/base/meson.build | ||
24 | +++ b/drivers/raw/ifpga/base/meson.build | ||
25 | @@ -25,7 +25,7 @@ sources = [ | ||
26 | |||
27 | rtdep = dependency('librt', required: false) | ||
28 | if not rtdep.found() | ||
29 | - rtdep = cc.find_library('librt', required: false) | ||
30 | + rtdep = cc.find_library('rt', required: false) | ||
31 | endif | ||
32 | if not rtdep.found() | ||
33 | build = false | ||
34 | -- | ||
35 | 2.32.0 | ||
diff --git a/recipes-extended/dpdk/dpdk_20.11.1.bb b/recipes-extended/dpdk/dpdk_20.11.5.bb index 061ed8e..1e537f5 100644 --- a/recipes-extended/dpdk/dpdk_20.11.1.bb +++ b/recipes-extended/dpdk/dpdk_20.11.5.bb | |||
@@ -2,12 +2,11 @@ include dpdk.inc | |||
2 | 2 | ||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ | 4 | file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ |
5 | file://0001-ifpga-meson-Fix-finding-librt-using-find_library.patch \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | STABLE = "-stable" | 7 | STABLE = "-stable" |
9 | BRANCH = "20.11" | 8 | BRANCH = "20.11" |
10 | SRCREV = "b1e71cf43153cca07db6cbb69fdca030ccf52234" | 9 | SRCREV = "abf68ccc8b1f923f0eb0b6bf2a8b944378e1ebeb" |
11 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
12 | 11 | ||
13 | # kernel module is provide by dpdk-module recipe, so disable here | 12 | # kernel module is provide by dpdk-module recipe, so disable here |