diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-networking/recipes-support/rdma-core | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/rdma-core')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch | 11 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch | 42 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb (renamed from meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb) | 4 |
4 files changed, 11 insertions, 76 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index f1437a0fb..feed0213c 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -254,9 +254,10 @@ diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.t index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,72 +1,7 @@ +@@ -1,81 +1,7 @@ rdma_man_pages( - mlx5dv_alloc_dm.3.md +- mlx5dv_alloc_var.3.md - mlx5dv_create_cq.3.md - mlx5dv_create_flow.3.md - mlx5dv_create_flow_action_modify_header.3.md @@ -274,6 +275,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_devx_subscribe_devx_event.3.md - mlx5dv_devx_umem_reg.3.md - mlx5dv_dr_flow.3.md +- mlx5dv_dump.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 @@ -285,6 +287,7 @@ index 0bd9eba1..876b6fcf 100644 mlx5dv.7 ) -rdma_alias_man_pages( +- mlx5dv_alloc_var.3 mlx5dv_free_var.3 - 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 @@ -311,10 +314,12 @@ index 0bd9eba1..876b6fcf 100644 - 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_flow_meter.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_action_modify_flow_meter.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 @@ -324,6 +329,10 @@ index 0bd9eba1..876b6fcf 100644 - 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_dump.3 mlx5dv_dump_dr_domain.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 -) diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch deleted file mode 100644 index 1ba6847d2..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Use-overloadable-attribute-with-clang.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 42976ed0a0160864b41680604ea9cdb3c175cb94 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Jan 2020 17:48:28 -0800 -Subject: [PATCH] Use overloadable attribute with clang - -This is overriding the libc implementation - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - librdmacm/preload.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/librdmacm/preload.c b/librdmacm/preload.c -index d46beb1b..b451de50 100644 ---- a/librdmacm/preload.c -+++ b/librdmacm/preload.c -@@ -59,6 +59,12 @@ - #include "cma.h" - #include "indexer.h" - -+#ifdef __clang__ -+#define OVERLOAD __attribute__((overloadable)) -+#else -+#define OVERLOAD -+#endif -+ - struct socket_calls { - int (*socket)(int domain, int type, int protocol); - int (*bind)(int socket, const struct sockaddr *addr, socklen_t addrlen); -@@ -793,7 +799,7 @@ ssize_t recv(int socket, void *buf, size_t len, int flags) - rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); - } - --ssize_t recvfrom(int socket, void *buf, size_t len, int flags, -+ssize_t OVERLOAD recvfrom(int socket, void *buf, size_t len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) - { - int fd; --- -2.25.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch deleted file mode 100644 index 80abd3313..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 14 Dec 2019 14:07:57 -0800 -Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield - -glibc redirects pthread_yield to sched_yield additionally we get it -working with musl on linux - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - librdmacm/rsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c -index 89ae2139..7fc5b266 100644 ---- a/librdmacm/rsocket.c -+++ b/librdmacm/rsocket.c -@@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) - pthread_mutex_lock(&mut); - if (suspendpoll) { - pthread_mutex_unlock(&mut); -- pthread_yield(); -+ sched_yield(); - return -EBUSY; - } - --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb index 417979dc3..15fd7ff66 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb @@ -8,10 +8,8 @@ RDEPENDS_${PN} = "bash perl" 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 \ - file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ - file://0001-Use-overloadable-attribute-with-clang.patch \ " -SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" +SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md |