diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-27 04:43:14 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-27 08:25:49 -0800 |
commit | 5f4636fec49bebca1fc18f267aad6529d7a31869 (patch) | |
tree | 325ee1fdbf1e201da9b1648b86514f2245f5e354 /meta-networking | |
parent | 90f5d4db3ec2d3e58f10a06350bc6d8188f063ec (diff) | |
download | meta-openembedded-5f4636fec49bebca1fc18f267aad6529d7a31869.tar.gz |
rdma-core: upgrade 27.0 -> 28.0
0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch
removed because it is included in 28.0.
refresh 0001-Remove-man-files-which-cant-be-built.patch
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch | 11 | ||||
-rw-r--r-- | meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch | 30 | ||||
-rw-r--r-- | meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb (renamed from meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb) | 3 |
3 files changed, 11 insertions, 33 deletions
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index f1437a0fb..feed0213c 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch | |||
@@ -254,9 +254,10 @@ diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.t | |||
254 | index 0bd9eba1..876b6fcf 100644 | 254 | index 0bd9eba1..876b6fcf 100644 |
255 | --- a/providers/mlx5/man/CMakeLists.txt | 255 | --- a/providers/mlx5/man/CMakeLists.txt |
256 | +++ b/providers/mlx5/man/CMakeLists.txt | 256 | +++ b/providers/mlx5/man/CMakeLists.txt |
257 | @@ -1,72 +1,7 @@ | 257 | @@ -1,81 +1,7 @@ |
258 | rdma_man_pages( | 258 | rdma_man_pages( |
259 | - mlx5dv_alloc_dm.3.md | 259 | - mlx5dv_alloc_dm.3.md |
260 | - mlx5dv_alloc_var.3.md | ||
260 | - mlx5dv_create_cq.3.md | 261 | - mlx5dv_create_cq.3.md |
261 | - mlx5dv_create_flow.3.md | 262 | - mlx5dv_create_flow.3.md |
262 | - mlx5dv_create_flow_action_modify_header.3.md | 263 | - mlx5dv_create_flow_action_modify_header.3.md |
@@ -274,6 +275,7 @@ index 0bd9eba1..876b6fcf 100644 | |||
274 | - mlx5dv_devx_subscribe_devx_event.3.md | 275 | - mlx5dv_devx_subscribe_devx_event.3.md |
275 | - mlx5dv_devx_umem_reg.3.md | 276 | - mlx5dv_devx_umem_reg.3.md |
276 | - mlx5dv_dr_flow.3.md | 277 | - mlx5dv_dr_flow.3.md |
278 | - mlx5dv_dump.3.md | ||
277 | - mlx5dv_flow_action_esp.3.md | 279 | - mlx5dv_flow_action_esp.3.md |
278 | mlx5dv_get_clock_info.3 | 280 | mlx5dv_get_clock_info.3 |
279 | mlx5dv_init_obj.3 | 281 | mlx5dv_init_obj.3 |
@@ -285,6 +287,7 @@ index 0bd9eba1..876b6fcf 100644 | |||
285 | mlx5dv.7 | 287 | mlx5dv.7 |
286 | ) | 288 | ) |
287 | -rdma_alias_man_pages( | 289 | -rdma_alias_man_pages( |
290 | - mlx5dv_alloc_var.3 mlx5dv_free_var.3 | ||
288 | - mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 | 291 | - mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 |
289 | - mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 | 292 | - mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 |
290 | - mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 | 293 | - mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 |
@@ -311,10 +314,12 @@ index 0bd9eba1..876b6fcf 100644 | |||
311 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 | 314 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 |
312 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 | 315 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 |
313 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 | 316 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 |
317 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 | ||
314 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 | 318 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 |
315 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 | 319 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 |
316 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 | 320 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 |
317 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 | 321 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 |
322 | - mlx5dv_dr_flow.3 mlx5dv_dr_action_modify_flow_meter.3 | ||
318 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 | 323 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 |
319 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 | 324 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 |
320 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 | 325 | - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 |
@@ -324,6 +329,10 @@ index 0bd9eba1..876b6fcf 100644 | |||
324 | - mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 | 329 | - mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 |
325 | - mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 | 330 | - mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 |
326 | - mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 | 331 | - mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 |
332 | - mlx5dv_dump.3 mlx5dv_dump_dr_domain.3 | ||
333 | - mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 | ||
334 | - mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 | ||
335 | - mlx5dv_dump.3 mlx5dv_dump_dr_table.3 | ||
327 | - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 | 336 | - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 |
328 | - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 | 337 | - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 |
329 | -) | 338 | -) |
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch deleted file mode 100644 index 80abd3313..000000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 14 Dec 2019 14:07:57 -0800 | ||
4 | Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield | ||
5 | |||
6 | glibc redirects pthread_yield to sched_yield additionally we get it | ||
7 | working with musl on linux | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | librdmacm/rsocket.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c | ||
16 | index 89ae2139..7fc5b266 100644 | ||
17 | --- a/librdmacm/rsocket.c | ||
18 | +++ b/librdmacm/rsocket.c | ||
19 | @@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) | ||
20 | pthread_mutex_lock(&mut); | ||
21 | if (suspendpoll) { | ||
22 | pthread_mutex_unlock(&mut); | ||
23 | - pthread_yield(); | ||
24 | + sched_yield(); | ||
25 | return -EBUSY; | ||
26 | } | ||
27 | |||
28 | -- | ||
29 | 2.24.1 | ||
30 | |||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb index 361d69b33..15fd7ff66 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb | |||
@@ -8,9 +8,8 @@ RDEPENDS_${PN} = "bash perl" | |||
8 | BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" | 8 | BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" |
9 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ | 9 | SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ |
10 | file://0001-Remove-man-files-which-cant-be-built.patch \ | 10 | file://0001-Remove-man-files-which-cant-be-built.patch \ |
11 | file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ | ||
12 | " | 11 | " |
13 | SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" | 12 | SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" |
14 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
15 | 14 | ||
16 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md | 15 | #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md |