summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2020-08-06 21:15:16 +0800
committerKhem Raj <raj.khem@gmail.com>2020-08-05 21:45:25 -0700
commitd69a160f9874eb7aa2dba372c5e59deede9a1fc7 (patch)
tree2237b2bbb3478e63e30fbc812a238d8c823e4dfa
parente82bb7efa8cf4c3b826b22761d5ba798bc134cb9 (diff)
downloadmeta-openembedded-d69a160f9874eb7aa2dba372c5e59deede9a1fc7.tar.gz
rdma-core: upgrade 28.0 -> 30.0
Refresh the following patch: rdma-core/0001-Remove-man-files-which-cant-be-built.patch Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch45
-rw-r--r--meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb (renamed from meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb)2
2 files changed, 29 insertions, 18 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 feed0213c7..4b2e33e9ab 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
@@ -1,6 +1,6 @@
1From 5a8a2f81ef8650f06d1d9d268add612ab46025f1 Mon Sep 17 00:00:00 2001 1From cfcfb8a110b72b9d92cf7c56f374478f65473653 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
3Date: Tue, 12 Jun 2018 22:57:04 -0700 3Date: Wed, 5 Aug 2020 17:21:14 +0900
4Subject: [PATCH] Remove man files which cant be built 4Subject: [PATCH] Remove man files which cant be built
5 5
6Remove need for pandoc-prebuilt during cross build 6Remove need for pandoc-prebuilt during cross build
@@ -18,15 +18,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Update for version 26.1. Remove more man files which can no be built. 18Update for version 26.1. Remove more man files which can no be built.
19 19
20Signed-off-by: Kai Kang <kai.kang@windriver.com> 20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21
22Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
21--- 23---
22 infiniband-diags/man/CMakeLists.txt | 34 ------------------- 24 infiniband-diags/man/CMakeLists.txt | 34 ------------
23 libibumad/man/CMakeLists.txt | 2 -- 25 libibumad/man/CMakeLists.txt | 2 -
24 libibverbs/man/CMakeLists.txt | 52 ----------------------------- 26 libibverbs/man/CMakeLists.txt | 53 -------------------
25 librdmacm/man/CMakeLists.txt | 2 -- 27 librdmacm/man/CMakeLists.txt | 2 -
26 providers/efa/man/CMakeLists.txt | 2 -- 28 providers/efa/man/CMakeLists.txt | 2 -
27 providers/mlx4/man/CMakeLists.txt | 1 - 29 providers/mlx4/man/CMakeLists.txt | 1 -
28 providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- 30 providers/mlx5/man/CMakeLists.txt | 82 -----------------------------
29 7 files changed, 158 deletions(-) 31 7 files changed, 176 deletions(-)
30 32
31diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt 33diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt
32index 1f1f91c9..094a389f 100644 34index 1f1f91c9..094a389f 100644
@@ -92,7 +94,7 @@ index 185584a0..857a4b8b 100644
92- umad_init.3 umad_done.3 94- umad_init.3 umad_done.3
93 ) 95 )
94diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt 96diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt
95index e1d5edf8..92c68611 100644 97index 87f00185..92c68611 100644
96--- a/libibverbs/man/CMakeLists.txt 98--- a/libibverbs/man/CMakeLists.txt
97+++ b/libibverbs/man/CMakeLists.txt 99+++ b/libibverbs/man/CMakeLists.txt
98@@ -1,24 +1,18 @@ 100@@ -1,24 +1,18 @@
@@ -120,7 +122,7 @@ index e1d5edf8..92c68611 100644
120 ibv_create_qp.3 122 ibv_create_qp.3
121 ibv_create_qp_ex.3 123 ibv_create_qp_ex.3
122 ibv_create_rwq_ind_table.3 124 ibv_create_rwq_ind_table.3
123@@ -27,16 +21,8 @@ rdma_man_pages( 125@@ -27,17 +21,8 @@ rdma_man_pages(
124 ibv_create_wq.3 126 ibv_create_wq.3
125 ibv_devices.1 127 ibv_devices.1
126 ibv_devinfo.1 128 ibv_devinfo.1
@@ -129,6 +131,7 @@ index e1d5edf8..92c68611 100644
129 ibv_get_async_event.3 131 ibv_get_async_event.3
130 ibv_get_cq_event.3 132 ibv_get_cq_event.3
131- ibv_get_device_guid.3.md 133- ibv_get_device_guid.3.md
134- ibv_get_device_index.3.md
132- ibv_get_device_list.3.md 135- ibv_get_device_list.3.md
133- ibv_get_device_name.3.md 136- ibv_get_device_name.3.md
134- ibv_get_pkey_index.3.md 137- ibv_get_pkey_index.3.md
@@ -137,7 +140,7 @@ index e1d5edf8..92c68611 100644
137 ibv_modify_qp.3 140 ibv_modify_qp.3
138 ibv_modify_qp_rate_limit.3 141 ibv_modify_qp_rate_limit.3
139 ibv_modify_srq.3 142 ibv_modify_srq.3
140@@ -51,24 +37,15 @@ rdma_man_pages( 143@@ -52,24 +37,15 @@ rdma_man_pages(
141 ibv_post_srq_recv.3 144 ibv_post_srq_recv.3
142 ibv_query_device.3 145 ibv_query_device.3
143 ibv_query_device_ex.3 146 ibv_query_device_ex.3
@@ -162,7 +165,7 @@ index e1d5edf8..92c68611 100644
162 ibv_xsrq_pingpong.1 165 ibv_xsrq_pingpong.1
163 ) 166 )
164 rdma_alias_man_pages( 167 rdma_alias_man_pages(
165@@ -79,47 +56,18 @@ rdma_alias_man_pages( 168@@ -80,47 +56,18 @@ rdma_alias_man_pages(
166 ibv_alloc_mw.3 ibv_dealloc_mw.3 169 ibv_alloc_mw.3 ibv_dealloc_mw.3
167 ibv_alloc_pd.3 ibv_dealloc_pd.3 170 ibv_alloc_pd.3 ibv_dealloc_pd.3
168 ibv_alloc_td.3 ibv_dealloc_td.3 171 ibv_alloc_td.3 ibv_dealloc_td.3
@@ -251,10 +254,10 @@ index 3df77caf..99a75101 100644
251 mlx4dv.7 254 mlx4dv.7
252 ) 255 )
253diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt 256diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt
254index 0bd9eba1..876b6fcf 100644 257index c3ad70a2..876b6fcf 100644
255--- a/providers/mlx5/man/CMakeLists.txt 258--- a/providers/mlx5/man/CMakeLists.txt
256+++ b/providers/mlx5/man/CMakeLists.txt 259+++ b/providers/mlx5/man/CMakeLists.txt
257@@ -1,81 +1,7 @@ 260@@ -1,89 +1,7 @@
258 rdma_man_pages( 261 rdma_man_pages(
259- mlx5dv_alloc_dm.3.md 262- mlx5dv_alloc_dm.3.md
260- mlx5dv_alloc_var.3.md 263- mlx5dv_alloc_var.3.md
@@ -280,8 +283,11 @@ index 0bd9eba1..876b6fcf 100644
280 mlx5dv_get_clock_info.3 283 mlx5dv_get_clock_info.3
281 mlx5dv_init_obj.3 284 mlx5dv_init_obj.3
282- mlx5dv_is_supported.3.md 285- mlx5dv_is_supported.3.md
286- mlx5dv_modify_qp_lag_port.3.md
283- mlx5dv_open_device.3.md 287- mlx5dv_open_device.3.md
288- mlx5dv_pp_alloc.3.md
284 mlx5dv_query_device.3 289 mlx5dv_query_device.3
290- mlx5dv_query_qp_lag_port.3.md
285 mlx5dv_ts_to_ns.3 291 mlx5dv_ts_to_ns.3
286- mlx5dv_wr_post.3.md 292- mlx5dv_wr_post.3.md
287 mlx5dv.7 293 mlx5dv.7
@@ -314,6 +320,7 @@ index 0bd9eba1..876b6fcf 100644
314- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 320- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3
315- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 321- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3
316- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 322- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3
323- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_default_miss.3
317- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 324- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3
318- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 325- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3
319- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 326- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3
@@ -323,6 +330,7 @@ index 0bd9eba1..876b6fcf 100644
323- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 330- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3
324- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 331- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3
325- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 332- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3
333- mlx5dv_dr_flow.3 mlx5dv_dr_domain_set_reclaim_device_memory.3
326- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 334- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3
327- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 335- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3
328- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 336- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3
@@ -333,9 +341,12 @@ index 0bd9eba1..876b6fcf 100644
333- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 341- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3
334- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 342- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3
335- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 343- mlx5dv_dump.3 mlx5dv_dump_dr_table.3
344- mlx5dv_pp_alloc.3 mlx5dv_pp_free.3
336- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 345- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3
337- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 346- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3
347- mlx5dv_wr_post.3 mlx5dv_wr_mr_interleaved.3
348- mlx5dv_wr_post.3 mlx5dv_wr_mr_list.3
338-) 349-)
339-- 350--
3402.17.1 3512.25.1
341 352
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb
index 15fd7ff663..18c34fb59f 100644
--- a/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb
+++ b/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb
@@ -9,7 +9,7 @@ BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}"
9SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ 9SRC_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 " 11 "
12SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" 12SRCREV = "0f4dd71d38a0f1b005635a3ff344e15791d2afa7"
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15#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