Sync from SUSE:SLFO:1.1 rdma-core revision 9d9ddd2fd062ec0274633c6ecb5d0cc1

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="manual">
+  <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">https://github.com/linux-rdma/rdma-core.git</param>
     <param name="package-meta">no</param>
@@ -8,10 +8,10 @@
     <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">45b7e6deffadbd81e6c95bb783926c051a5c0fa8</param>
+    <param name="revision">8847c327b89cdf4fcd9cf411355a6ccd12e8a054</param>
 	<param name="extract">suse/rdma-core.spec</param>
   </service>
-  <service name="recompress" mode="manual">
+  <service name="recompress" mode="disabled">
     <param name="file">*rdma-core*.tar</param>
     <param name="compression">gz</param>
   </service>

gen-pandoc.sh

@@ -12,20 +12,16 @@ 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\/./../')
 
-TMPDIR=$(mktemp -d)
-CURDIR=$(pwd)
 
-cd $TMPDIR
 rm -Rf $OUTDIR
-tar xf $CURDIR/$TARBALL
+tar xf $TARBALL
 cd $OUTDIR
 for patch in $PATCHES; do
-	patch -p0 < $CURDIR/$patch || exit 1
+	patch -p0 < ../$patch || exit 1
 done
 mkdir build
 cd build
 eval $CMAKE_CMD || exit 1
 make docs -j4 || exit 1
-tar czf $CURDIR/prebuilt-pandoc.tgz pandoc-prebuilt
-cd $CURDIR/
-rm -Rf $TMPDIR
+tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt
+cd ../..

kernel-boot-do-not-load-module-unsupported-on-s390.patch

@@ -1,53 +0,0 @@
-commit c5ab85be2f7e5ec20e1d135d23847c07ee45e23c
-Author: Nicolas Morey <nmorey@suse.com>
-Date:   Wed Feb 14 14:11:53 2024 +0100
-
-    kernel-boot: do not load module unsupported on s390
-    
-    Signed-off-by: Nicolas Morey <nmorey@suse.com>
-
-diff --git kernel-boot/modules/infiniband.conf kernel-boot/modules/infiniband.conf
-index 99526e156fff..7f75b85c9ceb 100644
---- kernel-boot/modules/infiniband.conf
-+++ kernel-boot/modules/infiniband.conf
-@@ -1,9 +1,9 @@
- # These modules are loaded by the system if any InfiniBand device is installed
- # InfiniBand over IP netdevice
--ib_ipoib
-+#ib_ipoib
- 
- # Access to fabric management SMPs and GMPs from userspace.
--ib_umad
-+#ib_umad
- 
- # SCSI Remote Protocol target support
- # ib_srpt
-diff --git kernel-boot/modules/opa.conf kernel-boot/modules/opa.conf
-index b9bc9f1f0146..3f9e6658b1ef 100644
---- kernel-boot/modules/opa.conf
-+++ kernel-boot/modules/opa.conf
-@@ -1,10 +1,10 @@
- # These modules are loaded by the system if any OmniPath Architecture device
- # is installed
- # Infiniband over IP netdevice
--ib_ipoib
-+#ib_ipoib
- 
- # Access to fabric management SMPs and GMPs from userspace.
--ib_umad
-+#ib_umad
- 
- # Omnipath Ethernet Virtual NIC netdevice
- opa_vnic
-diff --git kernel-boot/modules/rdma.conf kernel-boot/modules/rdma.conf
-index 2d342dd82f7d..0ebe3b786b28 100644
---- kernel-boot/modules/rdma.conf
-+++ kernel-boot/modules/rdma.conf
-@@ -1,6 +1,6 @@
- # These modules are loaded by the system if any RDMA devices is installed
- # iSCSI over RDMA client support
--ib_iser
-+#ib_iser
- 
- # iSCSI over RDMA target support
- # ib_isert

rdma-core.changes

@@ -1,48 +1,3 @@
--------------------------------------------------------------------
-Thu Apr  3 10:44:43 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to rdma-core v56.1 (jsc#PED-11289, jsc#PED-11323)
-  - Bug fixes for all providers
-
--------------------------------------------------------------------
-Wed Feb 19 15:17:34 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to rdma-core v56.0 (jsc#PED11323)
-  - No release notes available
-
--------------------------------------------------------------------
-Wed Jan 22 16:38:12 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Drop rcFOO symlinks for CODE16 (PED-266).
-
--------------------------------------------------------------------
-Thu Oct 10 08:39:02 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to rdma-core v54.0
-  - No release notes available
-
--------------------------------------------------------------------
-Mon Aug 12 09:53:54 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to rdma-core v53.0
-  - No release notes available
-- Remove Added-suffix-libdrm-to-CMakeLists.txt-for-drm.patch
-  as it was merged upstream.
-
--------------------------------------------------------------------
-Tue Jun 25 12:53:30 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to rdma-core v52.0
-  - No release notes available
-- Add upstream patch Added-suffix-libdrm-to-CMakeLists.txt-for-drm.patch
-  to fix libdrm detection.
-
--------------------------------------------------------------------
-Wed Feb 14 13:13:23 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Add kernel-boot-do-not-load-module-unsupported-on-s390.patch
-  to prevent autoload of module not supported on s390. (bsc#1219805)
-
 -------------------------------------------------------------------
 Mon Jan 22 18:41:25 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
 

rdma-core.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rdma-core
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,16 +30,15 @@
 %define _modprobedir /lib/modprobe.d
 %endif
 
-%define         git_ver .0.45b7e6deffad
+%define         git_ver .0.8847c327b89c
 Name:           rdma-core
-Version:        56.1
+Version:        49.1
 Release:        0
 Summary:        RDMA core userspace libraries and daemons
 License:        BSD-2-Clause OR GPL-2.0-only
 Group:          Productivity/Networking/Other
 
 %define efa_so_major    1
-%define hns_so_major    1
 %define verbs_so_major  1
 %define rdmacm_so_major 1
 %define umad_so_major   3
@@ -50,7 +49,6 @@ Group:          Productivity/Networking/Other
 %define mad_major       5
 
 %define  efa_lname    libefa%{efa_so_major}
-%define  hns_lname    libhns%{hns_so_major}
 %define  verbs_lname  libibverbs%{verbs_so_major}
 %define  rdmacm_lname librdmacm%{rdmacm_so_major}
 %define  umad_lname   libibumad%{umad_so_major}
@@ -77,7 +75,6 @@ Source4:        rdma-core-rpmlintrc
 Source5:        gen-pandoc.sh
 Source6:        get_build.py
 Patch0:         disable-rdma-interface-renaming.patch
-Patch1:         kernel-boot-do-not-load-module-unsupported-on-s390.patch
 BuildRequires:  binutils
 BuildRequires:  cmake >= 2.8.11
 BuildRequires:  gcc
@@ -92,7 +89,6 @@ BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 %if %{with_pyverbs}
-BuildRequires:  libdrm-devel
 BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
 %endif
@@ -171,7 +167,6 @@ Requires:       %{umad_lname} = %{version}-%{release}
 Requires:       %{verbs_lname} = %{version}-%{release}
 %if 0%{?dma_coherent}
 Requires:       %{efa_lname} = %{version}-%{release}
-Requires:       %{hns_lname} = %{version}-%{release}
 Requires:       %{mana_lname} = %{version}-%{release}
 Requires:       %{mlx4_lname} = %{version}-%{release}
 Requires:       %{mlx5_lname} = %{version}-%{release}
@@ -213,7 +208,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:      libcxgb4-rdmav2 < %{version}-%{release}
 Obsoletes:      libefa-rdmav2 < %{version}-%{release}
 Obsoletes:      libhfi1verbs-rdmav2 < %{version}-%{release}
-Obsoletes:      libhns-rdmav2 < %{version}-%{release}
 Obsoletes:      libipathverbs-rdmav2 < %{version}-%{release}
 Obsoletes:      libmana-rdmav2 < %{version}-%{release}
 Obsoletes:      libmlx4-rdmav2 < %{version}-%{release}
@@ -223,7 +217,6 @@ Obsoletes:      libocrdma-rdmav2 < %{version}-%{release}
 Obsoletes:      librxe-rdmav2 < %{version}-%{release}
 %if 0%{?dma_coherent}
 Requires:       %{efa_lname} = %{version}-%{release}
-Requires:       %{hns_lname} = %{version}-%{release}
 Requires:       %{mana_lname} = %{version}-%{release}
 Requires:       %{mlx4_lname} = %{version}-%{release}
 Requires:       %{mlx5_lname} = %{version}-%{release}
@@ -243,7 +236,7 @@ Device-specific plug-in ibverbs userspace drivers are included:
 - libcxgb4: Chelsio T4 iWARP HCA
 - libefa: Amazon Elastic Fabric Adapter
 - libhfi1: Intel Omni-Path HFI
-- libhns: HiSilicon Hip08+ SoC
+- libhns: HiSilicon Hip06 SoC
 - libipathverbs: QLogic InfiniPath HCA
 - libirdma: Intel Ethernet Connection RDMA
 - libmana: Microsoft Azure Network Adapter
@@ -271,13 +264,6 @@ Group:          System/Libraries
 %description -n %efa_lname
 This package contains the efa runtime library.
 
-%package -n %hns_lname
-Summary:        HNS runtime library
-Group:          System/Libraries
-
-%description -n %hns_lname
-This package contains the hns runtime library.
-
 %package -n %mana_lname
 Summary:        MANA runtime library
 Group:          System/Libraries
@@ -438,11 +424,7 @@ easy, object-oriented access to IB verbs.
 %setup -q -n  %{name}-%{version}%{git_ver}
 #Extract prebuilt pandoc file in the buildlib directory
 (cd buildlib && tar -xf %{S:3})
-%patch -P 0
-# On s390, disable autoload of unsupported modules
-%ifarch s390 s390x
-%patch -P 1
-%endif
+%patch0
 
 %build
 
@@ -525,9 +507,7 @@ cd build
 LD_LIBRARY_PATH=./lib bin/ib_acme -D . -O
 install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
 
-%if 0%{?suse_version} < 1600
 for service in rdma rdma-ndd ibacm iwpmd srp_daemon; do ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc${service}; done
-%endif
 
 # Delete the package's init.d scripts
 rm -rf %{buildroot}/%{_initddir}/
@@ -539,9 +519,6 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %post -n %efa_lname -p /sbin/ldconfig
 %postun -n %efa_lname -p /sbin/ldconfig
 
-%post -n %hns_lname -p /sbin/ldconfig
-%postun -n %hns_lname -p /sbin/ldconfig
-
 %post -n %mana_lname -p /sbin/ldconfig
 %postun -n %mana_lname -p /sbin/ldconfig
 
@@ -681,9 +658,7 @@ done
 %{_libexecdir}/mlx4-setup.sh
 %{_libexecdir}/truescale-serdes.cmds
 %license COPYING.*
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rcrdma
-%endif
 
 %files devel
 %doc %{_docdir}/%{name}-%{version}/MAINTAINERS
@@ -704,12 +679,10 @@ done
 %{_mandir}/man7/rdma_cm.*
 %if 0%{?dma_coherent}
 %{_mandir}/man3/efadv*
-%{_mandir}/man3/hnsdv*
 %{_mandir}/man3/manadv*
 %{_mandir}/man3/mlx5dv*
 %{_mandir}/man3/mlx4dv*
 %{_mandir}/man7/efadv*
-%{_mandir}/man7/hnsdv*
 %{_mandir}/man7/manadv*
 %{_mandir}/man7/mlx5dv*
 %{_mandir}/man7/mlx4dv*
@@ -738,10 +711,6 @@ done
 %files -n %efa_lname
 %{_libdir}/libefa*.so.*
 
-%files -n %hns_lname
-%defattr(-,root,root)
-%{_libdir}/libhns*.so.*
-
 %files -n %mana_lname
 %{_libdir}/libmana*.so.*
 
@@ -768,9 +737,7 @@ done
 %{_unitdir}/ibacm.socket
 %dir %{_libdir}/ibacm
 %{_libdir}/ibacm/*
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rcibacm
-%endif
 %doc %{_docdir}/%{name}-%{version}/ibacm.md
 
 %files -n infiniband-diags
@@ -843,9 +810,7 @@ done
 %dir %{_sysconfdir}/rdma
 %dir %{_sysconfdir}/rdma/modules
 %{_sbindir}/iwpmd
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rciwpmd
-%endif
 %{_unitdir}/iwpmd.service
 %config(noreplace) %{_sysconfdir}/rdma/modules/iwpmd.conf
 %config(noreplace) %{_sysconfdir}/iwpmd.conf
@@ -906,9 +871,7 @@ done
 %{_sbindir}/ibsrpdm
 %{_sbindir}/srp_daemon
 %{_sbindir}/run_srp_daemon
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rcsrp_daemon
-%endif
 %{_mandir}/man5/srp_daemon.service.5*
 %{_mandir}/man5/srp_daemon_port@.service.5*
 %{_mandir}/man8/ibsrpdm.8*
@@ -917,9 +880,7 @@ done
 
 %files -n rdma-ndd
 %{_sbindir}/rdma-ndd
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rcrdma-ndd
-%endif
 %{_unitdir}/rdma-ndd.service
 %{_mandir}/man8/rdma-ndd.8*
 %{_udevrulesdir}/60-rdma-ndd.rules