Hello community, here is the log from the commit of package rdma-core for openSUSE:Leap:15.2 checked in at 2020-02-04 17:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/rdma-core (Old) and /work/SRC/openSUSE:Leap:15.2/.rdma-core.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdma-core" Tue Feb 4 17:53:39 2020 rev:61 rq:766106 version:27.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/rdma-core/rdma-core.changes 2020-01-15 15:55:54.211682511 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.rdma-core.new.26092/rdma-core.changes 2020-02-04 17:54:01.280734847 +0100 @@ -1,0 +2,26 @@ +Fri Jan 10 07:40:35 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Update to v27.0 (bsc#1160338) + - No release notes available +- Dropped patches merged upstream: + - bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch + - bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch +- Add patches to support older HW (nes, cxgb3) that was dropped upstream + - Revert-Update-kernel-headers.patch + - Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch + - Revert-libnes-Remove-libnes-from-rdma-core.patch + +------------------------------------------------------------------- +Fri Dec 13 14:10:15 UTC 2019 - Dominique Leuenberger <[email protected]> + +- Fix post scripts to work with systemd 244: udevadm has been moved + from /sbin to /usr/bin and systemd is dropping the compat links + now. + +------------------------------------------------------------------- +Wed Dec 11 09:32:17 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Remove file listed twice +- Disable pyverbs build for older releases that do not have python3-Cython >= 0.25 + +------------------------------------------------------------------- Old: ---- bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch rdma-core-26.1.0.9f820de9ca7d.tar.gz New: ---- Revert-Update-kernel-headers.patch Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch Revert-libnes-Remove-libnes-from-rdma-core.patch gen-pandoc.sh get_build.py rdma-core-27.0.0.84caf035ae61.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdma-core.spec ++++++ --- /var/tmp/diff_new_pack.dO0d0v/_old 2020-02-04 17:54:02.564735623 +0100 +++ /var/tmp/diff_new_pack.dO0d0v/_new 2020-02-04 17:54:02.568735625 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdma-core # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,15 @@ %bcond_without systemd # Do not build static libs by default. %define with_static 0 +%if 0%{?sle_version} > 120400 %define with_pyverbs 1 +%else +%define with_pyverbs 0 +%endif -%define git_ver .0.9f820de9ca7d +%define git_ver .0.84caf035ae61 Name: rdma-core -Version: 26.1 +Version: 27.0 Release: 0 Summary: RDMA core userspace libraries and daemons License: GPL-2.0-only OR BSD-2-Clause @@ -59,8 +63,11 @@ Source2: post_download.sh Source3: prebuilt-pandoc.tgz Source4: rdma-core-rpmlintrc -Patch0: bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch -Patch1: bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch +Source5: gen-pandoc.sh +Source6: get_build.py +Patch0: Revert-libnes-Remove-libnes-from-rdma-core.patch +Patch1: Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch +Patch2: Revert-Update-kernel-headers.patch BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc @@ -404,6 +411,7 @@ (cd buildlib && tar xf %{S:3}) %patch0 %patch1 +%patch2 %build @@ -517,8 +525,8 @@ %post # we ship udev rules, so trigger an update. -/sbin/udevadm trigger --subsystem-match=infiniband --action=change || true -/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true +%{_bindir}/udevadm trigger --subsystem-match=infiniband --action=change || true +%{_bindir}/udevadm trigger --subsystem-match=infiniband_mad --action=change || true # # ibacm @@ -544,7 +552,7 @@ %post -n srp_daemon %service_add_post srp_daemon.service # we ship udev rules, so trigger an update. -/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change +%{_bindir}/udevadm trigger --subsystem-match=infiniband_mad --action=change %preun -n srp_daemon %service_del_preun srp_daemon.service @@ -715,7 +723,6 @@ %files -n infiniband-diags %defattr(-, root, root) -%config %{_sysconfdir}/infiniband-diags/error_thresholds %dir %{_sysconfdir}/infiniband-diags %config(noreplace) %{_sysconfdir}/infiniband-diags/* %{_sbindir}/ibaddr @@ -870,6 +877,8 @@ %if %{with_pyverbs} %files -n python3-pyverbs %{python3_sitearch}/pyverbs +%dir %{_docdir}/%{name}-%{version}/tests/ +%{_docdir}/%{name}-%{version}/tests/*.py %endif %changelog ++++++ Revert-Update-kernel-headers.patch ++++++ commit a53161ed3b4ed1502c9fa47e82bd79dec29714ad Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Fri Jan 10 09:24:53 2020 +0100 Revert "Update kernel headers" This reverts commit c21a3cf5d9e4cef0904b4d47f1cb43be9efdbf90. diff --git kernel-headers/CMakeLists.txt kernel-headers/CMakeLists.txt index 2d0766dd1280..13624b22d81b 100644 --- kernel-headers/CMakeLists.txt +++ kernel-headers/CMakeLists.txt @@ -1,5 +1,6 @@ publish_internal_headers(rdma rdma/bnxt_re-abi.h + rdma/cxgb3-abi.h rdma/cxgb4-abi.h rdma/efa-abi.h rdma/hns-abi.h @@ -14,6 +15,7 @@ publish_internal_headers(rdma rdma/mlx5_user_ioctl_cmds.h rdma/mlx5_user_ioctl_verbs.h rdma/mthca-abi.h + rdma/nes-abi.h rdma/ocrdma-abi.h rdma/qedr-abi.h rdma/rdma_netlink.h @@ -58,6 +60,7 @@ endfunction() # Transform the kernel ABIs used by the providers rdma_kernel_provider_abi( rdma/bnxt_re-abi.h + rdma/cxgb3-abi.h rdma/cxgb4-abi.h rdma/efa-abi.h rdma/hns-abi.h @@ -66,6 +69,7 @@ rdma_kernel_provider_abi( rdma/mlx4-abi.h rdma/mlx5-abi.h rdma/mthca-abi.h + rdma/nes-abi.h rdma/ocrdma-abi.h rdma/qedr-abi.h rdma/rdma_user_rxe.h diff --git kernel-headers/rdma/cxgb3-abi.h kernel-headers/rdma/cxgb3-abi.h new file mode 100644 index 000000000000..85aed672f43e --- /dev/null +++ kernel-headers/rdma/cxgb3-abi.h @@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ +/* + * Copyright (c) 2006 Chelsio, Inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef CXGB3_ABI_USER_H +#define CXGB3_ABI_USER_H + +#include <linux/types.h> + +#define IWCH_UVERBS_ABI_VERSION 1 + +/* + * Make sure that all structs defined in this file remain laid out so + * that they pack the same way on 32-bit and 64-bit architectures (to + * avoid incompatibility between 32-bit userspace and 64-bit kernels). + * In particular do not use pointer types -- pass pointers in __aligned_u64 + * instead. + */ +struct iwch_create_cq_req { + __aligned_u64 user_rptr_addr; +}; + +struct iwch_create_cq_resp_v0 { + __aligned_u64 key; + __u32 cqid; + __u32 size_log2; +}; + +struct iwch_create_cq_resp { + __aligned_u64 key; + __u32 cqid; + __u32 size_log2; + __u32 memsize; + __u32 reserved; +}; + +struct iwch_create_qp_resp { + __aligned_u64 key; + __aligned_u64 db_key; + __u32 qpid; + __u32 size_log2; + __u32 sq_size_log2; + __u32 rq_size_log2; +}; + +struct iwch_reg_user_mr_resp { + __u32 pbl_addr; +}; + +struct iwch_alloc_pd_resp { + __u32 pdid; +}; + +#endif /* CXGB3_ABI_USER_H */ diff --git kernel-headers/rdma/nes-abi.h kernel-headers/rdma/nes-abi.h new file mode 100644 index 000000000000..f80495baa969 --- /dev/null +++ kernel-headers/rdma/nes-abi.h @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ +/* + * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. + * Copyright (c) 2005 Topspin Communications. All rights reserved. + * Copyright (c) 2005 Cisco Systems. All rights reserved. + * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef NES_ABI_USER_H +#define NES_ABI_USER_H + +#include <linux/types.h> + +#define NES_ABI_USERSPACE_VER 2 +#define NES_ABI_KERNEL_VER 2 + +/* + * Make sure that all structs defined in this file remain laid out so + * that they pack the same way on 32-bit and 64-bit architectures (to + * avoid incompatibility between 32-bit userspace and 64-bit kernels). + * In particular do not use pointer types -- pass pointers in __u64 + * instead. + */ + +struct nes_alloc_ucontext_req { + __u32 reserved32; + __u8 userspace_ver; + __u8 reserved8[3]; +}; + +struct nes_alloc_ucontext_resp { + __u32 max_pds; /* maximum pds allowed for this user process */ + __u32 max_qps; /* maximum qps allowed for this user process */ + __u32 wq_size; /* size of the WQs (sq+rq) allocated to the mmaped area */ + __u8 virtwq; /* flag to indicate if virtual WQ are to be used or not */ + __u8 kernel_ver; + __u8 reserved[2]; +}; + +struct nes_alloc_pd_resp { + __u32 pd_id; + __u32 mmap_db_index; +}; + +struct nes_create_cq_req { + __aligned_u64 user_cq_buffer; + __u32 mcrqf; + __u8 reserved[4]; +}; + +struct nes_create_qp_req { + __aligned_u64 user_wqe_buffers; + __aligned_u64 user_qp_buffer; +}; + +enum iwnes_memreg_type { + IWNES_MEMREG_TYPE_MEM = 0x0000, + IWNES_MEMREG_TYPE_QP = 0x0001, + IWNES_MEMREG_TYPE_CQ = 0x0002, + IWNES_MEMREG_TYPE_MW = 0x0003, + IWNES_MEMREG_TYPE_FMR = 0x0004, + IWNES_MEMREG_TYPE_FMEM = 0x0005, +}; + +struct nes_mem_reg_req { + __u32 reg_type; /* indicates if id is memory, QP or CQ */ + __u32 reserved; +}; + +struct nes_create_cq_resp { + __u32 cq_id; + __u32 cq_size; + __u32 mmap_db_index; + __u32 reserved; +}; + +struct nes_create_qp_resp { + __u32 qp_id; + __u32 actual_sq_size; + __u32 actual_rq_size; + __u32 mmap_sq_db_index; + __u32 mmap_rq_db_index; + __u32 nes_drv_opt; +}; + +#endif /* NES_ABI_USER_H */ ++++++ Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch ++++++ ++++ 3148 lines (skipped) ++++++ Revert-libnes-Remove-libnes-from-rdma-core.patch ++++++ ++++ 2376 lines (skipped) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dO0d0v/_old 2020-02-04 17:54:02.604735646 +0100 +++ /var/tmp/diff_new_pack.dO0d0v/_new 2020-02-04 17:54:02.608735649 +0100 @@ -8,7 +8,7 @@ <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">9f820de9ca7d6e315be92bc830d354afad3e7960</param> + <param name="revision">84caf035ae6123e2296b72006cd2cf698c65eb46</param> <param name="extract">suse/rdma-core.spec</param> </service> <service name="recompress" mode="disabled"> ++++++ gen-pandoc.sh ++++++ #!/bin/bash -x TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: | awk '{ print $NF}') OUTDIR=$(tar tf $TARBALL | head -n 1) PATCHES=$(rpmspec --parse rdma-core.spec | egrep '^Patch[0-9]+:' | awk '{ print $NF}') BUILD_CMDS=$(python -c " import rpm spec = rpm.spec(\"rdma-core.spec\") print '%s' % (getattr(spec, \"build\"),) ") CMAKE_CMD=$(echo "$BUILD_CMDS" | sed -e :a -e '/\\$/N; s/\\\n//; ta' | grep /bin/cmake | sed -e 's/-GNinja//' -e 's/$OLDPWD\/./../') rm -Rf $OUTDIR tar xf $TARBALL cd $OUTDIR for patch in $PATCHES; do patch -p0 < ../$patch || exit 1 done mkdir build cd build eval $CMAKE_CMD || exit 1 make docs -j4 || exit 1 tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt cd ../.. ++++++ get_build.py ++++++ #!/usr/bin/python import rpm spec = rpm.spec("rdma-core.spec") print '%s' % (getattr(spec, "build"),) ++++++ post_download.sh ++++++ --- /var/tmp/diff_new_pack.dO0d0v/_old 2020-02-04 17:54:02.648735673 +0100 +++ /var/tmp/diff_new_pack.dO0d0v/_new 2020-02-04 17:54:02.648735673 +0100 @@ -2,27 +2,16 @@ # Script to be run after updating the spec file from a newer release # Enable pyverbs by default -sed -i -e 's/^%define with_pyverbs .*$/%define with_pyverbs 1/' rdma-core.spec +sed -i -e 's/^%define with_pyverbs .*$/%if 0%{?sle_version} > 120400\n%define with_pyverbs 1\n%else\n%define with_pyverbs 0\n%endif/' rdma-core.spec # Disable static sed -i -e 's/^%define with_static .*$/%define with_static 0/' rdma-core.spec # Fixup pandoc # To remove a build dependency to pandoc in the core rings, prebuild the pandoc # tarball and patch the spec file -TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: | awk '{ print $NF}') -OUTDIR=$(tar tf $TARBALL | head -n 1) +bash gen-pandoc.sh || exit 1 -rm -Rf $OUTDIR -tar xf $TARBALL -cd $OUTDIR -mkdir build -cd build -cmake .. -make docs -tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt -cd ../.. - -EXTRA_SOURCES="Source2: post_download.sh\nSource3: prebuilt-pandoc.tgz\nSource4: rdma-core-rpmlintrc" +EXTRA_SOURCES="Source2: post_download.sh\nSource3: prebuilt-pandoc.tgz\nSource4: rdma-core-rpmlintrc\nSource5: gen-pandoc.sh\nSource6: get_build.py" PANDOC_SETUP="#Extract prebuilt pandoc file in the buildlib directory\n(cd buildlib && tar xf %{S:3})" sed -i -e '/Source1:/a '"$EXTRA_SOURCES" rdma-core.spec sed -i -e '/^BuildRequires: pandoc/d' rdma-core.spec ++++++ prebuilt-pandoc.tgz ++++++ ++++ 1602 lines of diff (skipped) ++++++ rdma-core-26.1.0.9f820de9ca7d.tar.gz -> rdma-core-27.0.0.84caf035ae61.tar.gz ++++++ ++++ 68682 lines of diff (skipped)
