Fix corosync build error when package config rdma enabled
cover Fix corosync build error when package config rdma enabled
From: Kai Kang <[email protected]>
Kai Kang (2):
rdma-core: 18.1 -> 26.1
corosync: fix build error when package config rdma enabled
...igure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 +++
.../corosync/corosync_2.4.5.bb | 3 +-
...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++-
...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 --
...ude-endian.h-for-htole32-and-friends.patch | 25 --
...Remove-unused-include-for-execinfo.h.patch | 27 --
...igh.c-Do-not-include-net-if_packet.h.patch | 26 --
.../{rdma-core_18.1.bb => rdma-core_26.1.bb} | 26 +-
8 files changed, 295 insertions(+), 128 deletions(-)
create mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
rename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb => rdma-core_26.1.bb} (54%)Signature · 1 line
2.17.1
PATCH 1/2 rdma-core: 18.1 -> 26.1
From: Kai Kang <[email protected]>
Upgrade rdma-core from 18.1 to 26.1.
* remove patches which are merged by upstream
* update context and remove more unbuildable manual in 0001-Remove-man-files-which-cant-be-built.patch
* set services file for systemd
---
...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++-
...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 --
...ude-endian.h-for-htole32-and-friends.patch | 25 --
...Remove-unused-include-for-execinfo.h.patch | 27 --
...igh.c-Do-not-include-net-if_packet.h.patch | 26 --
.../{rdma-core_18.1.bb => rdma-core_26.1.bb} | 26 +-
6 files changed, 261 insertions(+), 127 deletions(-)
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
rename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb => rdma-core_26.1.bb} (54%)meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +242 -13
@@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <[email protected]> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <[email protected]> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 - - 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- + 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt +index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- ) +- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt -index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages(
@@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3 umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3
@@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1
@@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3
@@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md
@@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3 +- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt +index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages( + rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt +index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt +index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3 +- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3 +- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) - if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; -+ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; - } else { - ret = real.fxstat(ver, fd, buf); - }
meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h> -+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 -
meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 -
meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@ - */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h>
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +19 -7
@@ -5,14 +5,11 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ - file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "9f820de9ca7d6e315be92bc830d354afad3e7960" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
@@ -20,11 +17,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + [email protected] \ + [email protected] \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
Signature · 1 line
2.17.1
Re: [meta-networking][PATCH 1/2] rdma-core: 18.1 -> 26.1
The latest is 0.27 is it possible to work that out
https://github.com/linux-rdma/rdma-core/releases/tag/v27.0
Quoted 545 lines · On Thu, Dec 12, 2019 at 6:14 PM <[email protected]> wrote:
From: Kai Kang <[email protected]>
Upgrade rdma-core from 18.1 to 26.1.
* remove patches which are merged by upstream
* update context and remove more unbuildable manual in 0001-Remove-man-files-which-cant-be-built.patch
* set services file for systemdSigned-off-by Kai Kang <[email protected]>--- ...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++- ...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 -- ...ude-endian.h-for-htole32-and-friends.patch | 25 -- ...Remove-unused-include-for-execinfo.h.patch | 27 -- ...igh.c-Do-not-include-net-if_packet.h.patch | 26 -- .../{rdma-core_18.1.bb => rdma-core_26.1.bb} | 26 +- 6 files changed, 261 insertions(+), 127 deletions(-) delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch rename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb => rdma-core_26.1.bb} (54%)meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +242
-13@@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <[email protected]> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <[email protected]> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 - - 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- + 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt +index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- ) +- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt -index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages(@@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3 umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3@@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1@@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3@@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md@@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3 +- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt +index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages( + rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt +index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt +index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3 +- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3 +- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-29@@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) - if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; -+ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; - } else { - ret = real.fxstat(ver, fd, buf); - }meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0
-25@@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h> -+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 -meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0
-27@@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 -meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0
-26@@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@ - */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h>meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +19
-8@@ -5,14 +5,11 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ - file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "9f820de9ca7d6e315be92bc830d354afad3e7960" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md@@ -20,11 +17,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + [email protected] \ + [email protected] \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" --2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-networking][PATCH 1/2] rdma-core: 18.1 -> 26.1
Quoted 2 lines · Khem Raj
The latest is 0.27 is it possible to work that out
https://github.com/linux-rdma/rdma-core/releases/tag/v27.0
It seems just released after I checked the release page. I'll upgrade it.
Regards,
Kai
Quoted 546 lines · On Thu, Dec 12, 2019 at 6:14 PM <[email protected]> wrote:
Quoted 544 lines
From: Kai Kang <[email protected]>
Upgrade rdma-core from 18.1 to 26.1.
* remove patches which are merged by upstream
* update context and remove more unbuildable manual in 0001-Remove-man-files-which-cant-be-built.patch
* set services file for systemdSigned-off-by Kai Kang <[email protected]>--- ...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++- ...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 -- ...ude-endian.h-for-htole32-and-friends.patch | 25 -- ...Remove-unused-include-for-execinfo.h.patch | 27 -- ...igh.c-Do-not-include-net-if_packet.h.patch | 26 -- .../{rdma-core_18.1.bb => rdma-core_26.1.bb} | 26 +- 6 files changed, 261 insertions(+), 127 deletions(-)delete mode 100644
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patchdelete mode 100644meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patchdelete mode 100644meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patchdelete mode 100644meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patchrename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb => rdma-core_26.1.bb} (54%)meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +242
-13@@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <[email protected]> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <[email protected]> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 - - 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- + 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt +index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- ) +- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt -index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages(@@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3 umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3@@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1@@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3@@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md@@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3 +- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt +index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages( + rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt +index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt +index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3 +- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3 +- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-29@@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) - if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; -+ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; - } else { - ret = real.fxstat(ver, fd, buf); - }meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0
-25@@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h> -+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 -meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0
-27@@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 -meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0
-26@@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@ - */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h>meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +19
-8@@ -5,14 +5,11 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ - file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "9f820de9ca7d6e315be92bc830d354afad3e7960" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md@@ -20,11 +17,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + [email protected] \ + [email protected] \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" --2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Kai Kang
Re: [meta-networking][PATCH 1/2] rdma-core: 18.1 -> 26.1
no worries
Quoted 604 lines · Kang Kai
Quoted 2 lines · Khem Raj
The latest is 0.27 is it possible to work that out
https://github.com/linux-rdma/rdma-core/releases/tag/v27.0It seems just released after I checked the release page. I'll upgrade it.
Regards,
KaiQuoted 11 lines · On Thu, Dec 12, 2019 at 6:14 PM <[email protected]> wrote:
Quoted 9 lines
From: Kai Kang <[email protected]>
Upgrade rdma-core from 18.1 to 26.1.
* remove patches which are merged by upstream
* update context and remove more unbuildable manual in 0001-Remove-man-files-which-cant-be-built.patch
* set services file for systemdQuoted 10 lines
Quoted 10 lines
Signed-off-by Kai Kang <[email protected]>--- ...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++- ...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 -- ...ude-endian.h-for-htole32-and-friends.patch | 25 -- ...Remove-unused-include-for-execinfo.h.patch | 27 -- ...igh.c-Do-not-include-net-if_packet.h.patch | 26 -- .../{rdma-core_18.1.bb => rdma-core_26.1.bb} | 26 +- 6 files changed, 261 insertions(+), 127 deletions(-)delete mode 100644
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patchQuoted 1 line
Quoted 1 line
delete mode 100644
meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patchQuoted 1 line
Quoted 1 line
delete mode 100644
meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patchQuoted 1 line
Quoted 1 line
delete mode 100644
meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patchQuoted 1 line
Quoted 1 line
rename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb
=> rdma-core_26.1.bb} (54%)
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patchb/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patchQuoted 2 lines
Quoted 2 lines
index
4b595613f..f1437a0fb100644
---
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patchQuoted 1 line
Quoted 1 line
+++
b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patchQuoted 12 lines
Quoted 12 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +4
-3@@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <[email protected]> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <[email protected]> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 -Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch Fixes errors
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +7
-1- 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65-------------------------------------
Quoted 3 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch Fixes errors
Quoted 3 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +2
-0+ 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt
b/infiniband-diags/man/CMakeLists.txtQuoted 37 lines
Quoted 37 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +37
-0+index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- )Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch Fixes errors
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +7
-0+- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt
b/libibumad/man/CMakeLists.txtQuoted 8 lines
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +1
-1-index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages(@@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 185584a0..ac45a4e9 100644
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +6
-0umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt
b/libibverbs/man/CMakeLists.txtQuoted 111 lines
Quoted 111 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +62
-6-index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3@@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1@@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3@@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md@@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +8
-0+- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt
b/librdmacm/man/CMakeLists.txtQuoted 12 lines
Quoted 12 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +12
-0+index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages(Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +8
-0+ rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt
b/providers/efa/man/CMakeLists.txtQuoted 9 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 9 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +9
-0+index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt
b/providers/mlx4/man/CMakeLists.txtQuoted 11 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 11 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +10
-0+index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt
b/providers/mlx5/man/CMakeLists.txtQuoted 32 lines
Quoted 32 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +23
-2-index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +8
-0+- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3mlx5dv_devx_destroy_event_channel.3
Quoted 8 lines
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +8
-0+- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index 86dd49de..b54675be 100644
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +8
-0+- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3mlx5dv_devx_subscribe_devx_event_fd.3
Quoted 25 lines
Quoted 25 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +22
-0+- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1Quoted 1 line
Quoted 1 line
diff --git
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patchb/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patchQuoted 3 lines
Quoted 3 lines
deleted file mode 100644
index b04c9b723..000000000
---
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patchQuoted 10 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch line 8
Quoted 10 lines
+++
/dev/nullmeta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-8@@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in thisfunction); did you mean '
S_IFSOCK'?Quoted 5 lines
Quoted 5 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-5- -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ----Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-8- librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat*buf)
Quoted 4 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
Quoted 4 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-4- if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) |
__S_IFSOCK;Quoted 1 line
Review line 26
Quoted 1 line
(quoted diff) +0
-1-+ buf->st_mode = (buf->st_mode & ~S_IFMT) |
S_IFSOCK;Quoted 4 lines
Quoted 4 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0
-3- } else { - ret = real.fxstat(ver, fd, buf); - }diff --git
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patchb/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patchQuoted 3 lines
Quoted 3 lines
deleted file mode 100644
index aa335244b..000000000
---
a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patchQuoted 20 lines
Quoted 20 lines
+++
/dev/nullmeta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0
-18@@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h>Quoted 8 lines
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0
-7-+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 -diff --git
a/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patchb/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patchQuoted 3 lines
Quoted 3 lines
deleted file mode 100644
index 347f964e9..000000000
---
a/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patchQuoted 22 lines
Quoted 22 lines
+++
/dev/nullmeta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0
-20@@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h>Quoted 8 lines
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0
-7--#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 -diff --git
a/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patchb/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patchQuoted 3 lines
Quoted 3 lines
deleted file mode 100644
index e887f222b..000000000
---
a/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patchQuoted 21 lines
Quoted 21 lines
+++
/dev/nullmeta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0
-19@@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@Quoted 8 lines
Review
Quoted 8 lines
meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0
-7- */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h>(quoted diff) +0
-0rdma-core_18.1.bb b/meta-networking/recipes-support/rdma-core/ rdma-core_26.1.bb
Quoted 11 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb SECTION = "libs" · line 8
Quoted 11 lines
similarity index 54%
rename from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb index6ad864d1e..1afe496c5100644meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +0
-1@@ -5,14 +5,11 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18\
Quoted 6 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb SECTION = "libs"
Quoted 6 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +2
-4- file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH}<http://github.com/linux-rdma/rdma-core.git;branch=$%7BBRANCH%7D> \
Quoted 7 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb SECTION = "libs"
Quoted 7 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +1
-1file://0001-Remove-man-files-which-cant-be-built.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "9f820de9ca7d6e315be92bc830d354afad3e7960" S = "${WORKDIR}/git" #Default Dual Licensehttps://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
Quoted 2 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb LICENSE = "BSD-2-Clause | GPLv2" · line 17
Quoted 2 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +0
-0@@ -20,11 +17,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM ="file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \
Quoted 1 line
Quoted 1 line
file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
Quoted 28 lines
Quoted 28 lines
meta-networking/recipes-support/rdma-core/rdma-core_26.1.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +16
-2+EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + [email protected] \ + [email protected] \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" --2.17.1
Quoted 5 lines
Quoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Kai Kang
PATCH v2 1/1 rdma-core: 18.1 -> 27.0
In reply to [email protected]From: Kai Kang <[email protected]>
Upgrade rdma-core from 18.1 to 27.0
* remove 4 patches which have been merged by upstream
* update context and remove more unbuildable manual in 0001-Remove-man-files-which-cant-be-built.patch
* set services file for systemd
---
...Remove-man-files-which-cant-be-built.patch | 255 +++++++++++++++++-
...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 --
...ude-endian.h-for-htole32-and-friends.patch | 25 --
...Remove-unused-include-for-execinfo.h.patch | 27 --
...igh.c-Do-not-include-net-if_packet.h.patch | 26 --
.../{rdma-core_18.1.bb => rdma-core_27.0.bb} | 26 +-
6 files changed, 261 insertions(+), 127 deletions(-)
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
rename meta-networking/recipes-support/rdma-core/{rdma-core_18.1.bb => rdma-core_27.0.bb} (54%)meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +242 -13
@@ -14,14 +14,67 @@ Fixes errors | cmake_install.cmake:48 (include) Signed-off-by: Khem Raj <[email protected]> + +Update for version 26.1. Remove more man files which can no be built. + +Signed-off-by: Kai Kang <[email protected]> --- - libibumad/man/CMakeLists.txt | 1 - - libibverbs/man/CMakeLists.txt | 15 --------------- - providers/mlx5/man/CMakeLists.txt | 1 - - 3 files changed, 17 deletions(-) + infiniband-diags/man/CMakeLists.txt | 34 ------------------- + libibumad/man/CMakeLists.txt | 2 -- + libibverbs/man/CMakeLists.txt | 52 ----------------------------- + librdmacm/man/CMakeLists.txt | 2 -- + providers/efa/man/CMakeLists.txt | 2 -- + providers/mlx4/man/CMakeLists.txt | 1 - + providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- + 7 files changed, 158 deletions(-) +diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt +index 1f1f91c9..094a389f 100644 +--- a/infiniband-diags/man/CMakeLists.txt ++++ b/infiniband-diags/man/CMakeLists.txt +@@ -46,40 +46,6 @@ rdma_rst_common( + ) + + rdma_man_pages( +- check_lft_balance.8.in.rst +- dump_fts.8.in.rst +- ibaddr.8.in.rst +- ibcacheedit.8.in.rst +- ibccconfig.8.in.rst +- ibccquery.8.in.rst +- ibfindnodesusing.8.in.rst +- ibhosts.8.in.rst +- ibidsverify.8.in.rst +- iblinkinfo.8.in.rst +- ibnetdiscover.8.in.rst +- ibnodes.8.in.rst +- ibping.8.in.rst +- ibportstate.8.in.rst +- ibqueryerrors.8.in.rst +- ibroute.8.in.rst +- ibrouters.8.in.rst +- ibstat.8.in.rst +- ibstatus.8.in.rst +- ibswitches.8.in.rst +- ibsysstat.8.in.rst +- ibtracert.8.in.rst +- infiniband-diags.8.in.rst +- perfquery.8.in.rst +- saquery.8.in.rst +- sminfo.8.in.rst +- smpdump.8.in.rst +- smpquery.8.in.rst +- vendstat.8.in.rst +- ) +- +-rdma_alias_man_pages( +- dump_fts.8 dump_lfts.8 +- dump_fts.8 dump_mfts.8 + ) + + if (ENABLE_IBDIAGS_COMPAT) diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt -index 185584a0..ac45a4e9 100644 +index 185584a0..857a4b8b 100644 --- a/libibumad/man/CMakeLists.txt +++ b/libibumad/man/CMakeLists.txt @@ -15,7 +15,6 @@ rdma_man_pages(
@@ -32,19 +85,34 @@ index 185584a0..ac45a4e9 100644 umad_open_port.3 umad_poll.3 umad_recv.3 +@@ -38,5 +37,4 @@ rdma_alias_man_pages( + umad_class_str.3 umad_method_str.3 + umad_get_ca.3 umad_release_ca.3 + umad_get_port.3 umad_release_port.3 +- umad_init.3 umad_done.3 + ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index 86dd49de..b54675be 100644 +index e1d5edf8..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt -@@ -5,7 +5,6 @@ rdma_man_pages( +@@ -1,24 +1,18 @@ + rdma_man_pages( +- ibv_advise_mr.3.md + ibv_alloc_dm.3 + ibv_alloc_mw.3 +- ibv_alloc_null_mr.3.md + ibv_alloc_parent_domain.3 ibv_alloc_pd.3 ibv_alloc_td.3 ibv_asyncwatch.1 +- ibv_attach_counters_point_flow.3.md - ibv_attach_mcast.3.md ibv_bind_mw.3 ibv_create_ah.3 ibv_create_ah_from_wc.3 -@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_comp_channel.3 +- ibv_create_counters.3.md + ibv_create_cq.3 ibv_create_cq_ex.3 ibv_modify_cq.3 ibv_create_flow.3
@@ -52,7 +120,7 @@ index 86dd49de..b54675be 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -23,15 +21,9 @@ rdma_man_pages( +@@ -27,16 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1
@@ -61,14 +129,15 @@ index 86dd49de..b54675be 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md - ibv_get_device_list.3 +- ibv_get_device_list.3.md - ibv_get_device_name.3.md +- ibv_get_pkey_index.3.md - ibv_get_srq_num.3.md - ibv_inc_rkey.3.md ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -46,19 +38,12 @@ rdma_man_pages( +@@ -51,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3
@@ -81,6 +150,7 @@ index 86dd49de..b54675be 100644 - ibv_rate_to_mbps.3.md - ibv_rate_to_mult.3.md ibv_rc_pingpong.1 +- ibv_read_counters.3.md ibv_reg_mr.3 - ibv_req_notify_cq.3.md - ibv_rereg_mr.3.md
@@ -88,16 +158,175 @@ index 86dd49de..b54675be 100644 ibv_srq_pingpong.1 ibv_uc_pingpong.1 ibv_ud_pingpong.1 +- ibv_wr_post.3.md + ibv_xsrq_pingpong.1 + ) + rdma_alias_man_pages( +@@ -79,47 +56,18 @@ rdma_alias_man_pages( + ibv_alloc_mw.3 ibv_dealloc_mw.3 + ibv_alloc_pd.3 ibv_dealloc_pd.3 + ibv_alloc_td.3 ibv_dealloc_td.3 +- ibv_attach_mcast.3 ibv_detach_mcast.3 + ibv_create_ah.3 ibv_destroy_ah.3 + ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3 + ibv_create_comp_channel.3 ibv_destroy_comp_channel.3 +- ibv_create_counters.3 ibv_destroy_counters.3 + ibv_create_cq.3 ibv_destroy_cq.3 + ibv_create_flow.3 ibv_destroy_flow.3 +- ibv_create_flow_action.3 ibv_destroy_flow_action.3 +- ibv_create_flow_action.3 ibv_modify_flow_action.3 + ibv_create_qp.3 ibv_destroy_qp.3 + ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3 + ibv_create_srq.3 ibv_destroy_srq.3 + ibv_create_wq.3 ibv_destroy_wq.3 +- ibv_event_type_str.3 ibv_node_type_str.3 +- ibv_event_type_str.3 ibv_port_state_str.3 + ibv_get_async_event.3 ibv_ack_async_event.3 + ibv_get_cq_event.3 ibv_ack_cq_events.3 +- ibv_get_device_list.3 ibv_free_device_list.3 + ibv_open_device.3 ibv_close_device.3 + ibv_open_xrcd.3 ibv_close_xrcd.3 +- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3 +- ibv_rate_to_mult.3 mult_to_ibv_rate.3 + ibv_reg_mr.3 ibv_dereg_mr.3 +- ibv_wr_post.3 ibv_wr_abort.3 +- ibv_wr_post.3 ibv_wr_complete.3 +- ibv_wr_post.3 ibv_wr_start.3 +- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3 +- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3 +- ibv_wr_post.3 ibv_wr_bind_mw.3 +- ibv_wr_post.3 ibv_wr_local_inv.3 +- ibv_wr_post.3 ibv_wr_rdma_read.3 +- ibv_wr_post.3 ibv_wr_rdma_write.3 +- ibv_wr_post.3 ibv_wr_rdma_write_imm.3 +- ibv_wr_post.3 ibv_wr_send.3 +- ibv_wr_post.3 ibv_wr_send_imm.3 +- ibv_wr_post.3 ibv_wr_send_inv.3 +- ibv_wr_post.3 ibv_wr_send_tso.3 +- ibv_wr_post.3 ibv_wr_set_inline_data.3 +- ibv_wr_post.3 ibv_wr_set_inline_data_list.3 +- ibv_wr_post.3 ibv_wr_set_sge.3 +- ibv_wr_post.3 ibv_wr_set_sge_list.3 +- ibv_wr_post.3 ibv_wr_set_ud_addr.3 +- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3 + ) +diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt +index 2d1efbff..d016c926 100644 +--- a/librdmacm/man/CMakeLists.txt ++++ b/librdmacm/man/CMakeLists.txt +@@ -20,7 +20,6 @@ rdma_man_pages( + rdma_destroy_qp.3 + rdma_destroy_srq.3 + rdma_disconnect.3 +- rdma_establish.3.md + rdma_event_str.3 + rdma_free_devices.3 + rdma_get_cm_event.3 +@@ -33,7 +32,6 @@ rdma_man_pages( + rdma_get_send_comp.3 + rdma_get_src_port.3 + rdma_getaddrinfo.3 +- rdma_init_qp_attr.3.md + rdma_join_multicast.3 + rdma_join_multicast_ex.3 + rdma_leave_multicast.3 +diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt +index d6a4f57b..376f293d 100644 +--- a/providers/efa/man/CMakeLists.txt ++++ b/providers/efa/man/CMakeLists.txt +@@ -1,4 +1,2 @@ + rdma_man_pages( +- efadv_create_driver_qp.3.md +- efadv.7.md + ) +diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt +index 3df77caf..99a75101 100644 +--- a/providers/mlx4/man/CMakeLists.txt ++++ b/providers/mlx4/man/CMakeLists.txt +@@ -1,6 +1,5 @@ + rdma_man_pages( + mlx4dv_init_obj.3 + mlx4dv_query_device.3 +- mlx4dv_set_context_attr.3.md + mlx4dv.7 + ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index cdc7115e..876b6fcf 100644 +index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,72 +1,7 @@ rdma_man_pages( +- mlx5dv_alloc_dm.3.md +- mlx5dv_create_cq.3.md +- mlx5dv_create_flow.3.md +- mlx5dv_create_flow_action_modify_header.3.md +- mlx5dv_create_flow_action_packet_reformat.3.md +- mlx5dv_create_flow_matcher.3.md +- mlx5dv_create_mkey.3.md +- mlx5dv_create_qp.3.md +- mlx5dv_devx_alloc_uar.3.md +- mlx5dv_devx_create_cmd_comp.3.md +- mlx5dv_devx_create_event_channel.3.md +- mlx5dv_devx_get_event.3.md +- mlx5dv_devx_obj_create.3.md +- mlx5dv_devx_qp_modify.3.md +- mlx5dv_devx_query_eqn.3.md +- mlx5dv_devx_subscribe_devx_event.3.md +- mlx5dv_devx_umem_reg.3.md +- mlx5dv_dr_flow.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 +- mlx5dv_is_supported.3.md +- mlx5dv_open_device.3.md mlx5dv_query_device.3 + mlx5dv_ts_to_ns.3 +- mlx5dv_wr_post.3.md + mlx5dv.7 + ) +-rdma_alias_man_pages( +- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 +- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 +- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3 +- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3 +- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3 +- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3 +- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3 +- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 +- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +-) -- 2.17.1
meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:17:57 -0700 -Subject: [PATCH] S_IFSOCK is defined in both glibc/musl - -Fixes - -preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - librdmacm/preload.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index 0f2aa250..d46beb1b 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) - if (fd_get(socket, &fd) == fd_rsocket) { - ret = real.fxstat(ver, socket, buf); - if (!ret) -- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; -+ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; - } else { - ret = real.fxstat(ver, fd, buf); - }
meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:15:52 -0700 -Subject: [PATCH 1/2] include endian.h for htole32 and friends - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/hns/hns_roce_u.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h -index bd66c6e7..b07424db 100644 ---- a/providers/hns/hns_roce_u.h -+++ b/providers/hns/hns_roce_u.h -@@ -34,6 +34,7 @@ - #define _HNS_ROCE_U_H - - #include <stddef.h> -+#include <endian.h> - #include <util/compiler.h> - - #include <infiniband/driver.h> --- -2.17.1 -
meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Jun 2018 19:18:24 -0700 -Subject: [PATCH 2/2] Remove unused include for execinfo.h - -Fixes build on musl - -Signed-off-by: Khem Raj <[email protected]> ---- - providers/qedr/qelr_verbs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c -index e3b01f28..2ee1c832 100644 ---- a/providers/qedr/qelr_verbs.c -+++ b/providers/qedr/qelr_verbs.c -@@ -54,7 +54,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <execinfo.h> - - #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) - #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) --- -2.17.1 -
meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jun 2018 20:19:13 -0700 -Subject: [PATCH] neigh.c: Do not include net/if_packet.h - -This header is glibc specific - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - libibverbs/neigh.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c -index 21177db0..cfc593a0 100644 ---- a/libibverbs/neigh.c -+++ b/libibverbs/neigh.c -@@ -2,7 +2,6 @@ - */ - - #include "config.h" --#include <net/if_packet.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> - #include <endian.h>
meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb renamed from meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb +19 -7
@@ -5,14 +5,11 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ - file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ - file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ - file://0001-include-endian.h-for-htole32-and-friends.patch \ - file://0002-Remove-unused-include-for-execinfo.h.patch \ +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ " -SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" +SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
@@ -20,11 +17,26 @@ LICENSE = "BSD-2-Clause | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} += "dev-so" -inherit cmake +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + [email protected] \ + [email protected] \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
Signature · 1 line
2.17.1
PATCH 2/2 corosync: fix build error when package config rdma enabled
In reply to [email protected]From: Kai Kang <[email protected]>
Fix corosync build error when package config rdma enabled.
* replace dependency librdmacm from layer meta-cloud-services with rdma-core from meta-networking
* add patch to fix issue that fail to find rdma library via pkgconfig
--- ...igure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 +++++++++++++++++++ .../corosync/corosync_2.4.5.bb | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch
meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch new file +32 -0
@@ -0,0 +1,32 @@ +Subject: [PATCH] configure.ac: fix pkgconfig issue of rdma + +pkgconfig files from rdma-core(https://github.com/linux-rdma/rdma-core) +are named start with lib, such as librdmacm.pc and libibverbs.pc. When +rdma support is enabled, it fails to find rdma related libraries. Update +configure.ac to the issue. + +Upstream-Status: Submitted [https://github.com/corosync/corosync/pull/515] + +Signed-off-by: Kai Kang <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ac513e93..240cfed4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -459,8 +459,8 @@ if test "x${enable_testagents}" = xyes; then + fi + + if test "x${enable_rdma}" = xyes; then +- PKG_CHECK_MODULES([rdmacm],[rdmacm]) +- PKG_CHECK_MODULES([ibverbs],[ibverbs]) ++ PKG_CHECK_MODULES([rdmacm],[librdmacm]) ++ PKG_CHECK_MODULES([ibverbs],[libibverbs]) + AC_DEFINE_UNQUOTED([HAVE_RDMA], 1, [have rdmacm]) + PACKAGE_FEATURES="$PACKAGE_FEATURES rdma" + WITH_LIST="$WITH_LIST --with rdma" +-- +2.20.1 +
meta-networking/recipes-extended/corosync/corosync_2.4.5.bb +2 -1
@@ -9,6 +9,7 @@ inherit autotools pkgconfig systemd useradd SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ file://corosync.conf \ + file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \ " SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd"
@@ -36,7 +37,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" -PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,librdmacm" +PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,rdma-core" PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
Signature · 1 line
2.17.1