* [PR PATCH] rdma-core: update to 43.0.
@ 2022-12-01 1:49 kruceter
2022-12-02 3:57 ` classabbyamp
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: kruceter @ 2022-12-01 1:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
There is a new pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5205 bytes --]
From 3b25378626fdf22651cfec4ee6cab3f7ae0a4f60 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
common/shlibs | 4 ++++
srcpkgs/rdma-core/template | 35 +++++++++++++++++------------------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..44911fd1247c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,8 +3622,12 @@ libfrr.so.0 libfrr-6.0_1
libkaccounts.so.2 kaccounts-integration-20.04.3_1
libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
libibumad.so.3 rdma-core-22.1_1
libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
librdmacm.so.1 rdma-core-22.1_1
libdvdcss.so.2 libdvdcss-1.4.2_1
libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 25f1e1e6bb84..9017b9f53c5e 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
+version=43.0
revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
-license="GPL-2.0-or-later, BSD-2-Clause-FreeBSD"
+license="GPL-2.0-or-later, BSD-2-Clause"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,21 +26,18 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/usr/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
-
- # The cmake is bad
- mv ${DESTDIR}/usr/etc/* ${DESTDIR}/etc/
+post_patch() {
+ # install manpages not depending on pandoc and rst2man
+ sed -i buildlib/rdma_man.cmake \
+ -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
+ -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
+}
+post_install() {
# not needed
rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
-
- vlicense COPYING.BSD_FB
+ vlicense COPYING.BSD_FB LICENSE
}
rdma-core-devel_package() {
From 82a8f2ccdaa1bb72d6b07368074ea3de74ce3c29 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:29:02 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
@ 2022-12-02 3:57 ` classabbyamp
2022-12-02 19:26 ` [PR REVIEW] " ahesford
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2022-12-02 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#issuecomment-1334730848
Comment:
any common/shlibs entries from the removed package should be deleted
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
2022-12-02 3:57 ` classabbyamp
@ 2022-12-02 19:26 ` ahesford
2022-12-02 19:29 ` ahesford
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2022-12-02 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#discussion_r1038460505
Comment:
Don't abuse `post_patch` for dynamic patching that doesn't need to be dynamic, especially not with `sed` which will happily and silently do nothing when your patterns cease to apply. Make a proper patch.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
2022-12-02 3:57 ` classabbyamp
2022-12-02 19:26 ` [PR REVIEW] " ahesford
@ 2022-12-02 19:29 ` ahesford
2022-12-02 19:35 ` [PR PATCH] [Updated] " kruceter
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2022-12-02 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#discussion_r1038462642
Comment:
Enable this by default for platforms that provide `pandoc`.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (2 preceding siblings ...)
2022-12-02 19:29 ` ahesford
@ 2022-12-02 19:35 ` kruceter
2022-12-02 19:38 ` kruceter
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-02 19:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 6499 bytes --]
From 2745415ccfacfbd23a65bb1094c9f1aac456cdd3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
common/shlibs | 4 ++++
srcpkgs/rdma-core/template | 35 +++++++++++++++++------------------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..44911fd1247c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,8 +3622,12 @@ libfrr.so.0 libfrr-6.0_1
libkaccounts.so.2 kaccounts-integration-20.04.3_1
libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
libibumad.so.3 rdma-core-22.1_1
libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
librdmacm.so.1 rdma-core-22.1_1
libdvdcss.so.2 libdvdcss-1.4.2_1
libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 25f1e1e6bb84..9017b9f53c5e 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
+version=43.0
revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
-license="GPL-2.0-or-later, BSD-2-Clause-FreeBSD"
+license="GPL-2.0-or-later, BSD-2-Clause"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,21 +26,18 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/usr/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
-
- # The cmake is bad
- mv ${DESTDIR}/usr/etc/* ${DESTDIR}/etc/
+post_patch() {
+ # install manpages not depending on pandoc and rst2man
+ sed -i buildlib/rdma_man.cmake \
+ -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
+ -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
+}
+post_install() {
# not needed
rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
-
- vlicense COPYING.BSD_FB
+ vlicense COPYING.BSD_FB LICENSE
}
rdma-core-devel_package() {
From 7a095ef9c26b67ddf0af2c76e017ac4aa92231b0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:29:02 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/rdma-core/patches/manpages.patch | 22 ++++++++++++++++++++++
srcpkgs/removed-packages/template | 2 ++
4 files changed, 24 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (3 preceding siblings ...)
2022-12-02 19:35 ` [PR PATCH] [Updated] " kruceter
@ 2022-12-02 19:38 ` kruceter
2022-12-02 19:51 ` kruceter
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-02 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 7179 bytes --]
From 2745415ccfacfbd23a65bb1094c9f1aac456cdd3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
common/shlibs | 4 ++++
srcpkgs/rdma-core/template | 35 +++++++++++++++++------------------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..44911fd1247c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,8 +3622,12 @@ libfrr.so.0 libfrr-6.0_1
libkaccounts.so.2 kaccounts-integration-20.04.3_1
libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
libibumad.so.3 rdma-core-22.1_1
libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
librdmacm.so.1 rdma-core-22.1_1
libdvdcss.so.2 libdvdcss-1.4.2_1
libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 25f1e1e6bb84..9017b9f53c5e 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
+version=43.0
revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
-license="GPL-2.0-or-later, BSD-2-Clause-FreeBSD"
+license="GPL-2.0-or-later, BSD-2-Clause"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,21 +26,18 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/usr/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
-
- # The cmake is bad
- mv ${DESTDIR}/usr/etc/* ${DESTDIR}/etc/
+post_patch() {
+ # install manpages not depending on pandoc and rst2man
+ sed -i buildlib/rdma_man.cmake \
+ -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
+ -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
+}
+post_install() {
# not needed
rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
-
- vlicense COPYING.BSD_FB
+ vlicense COPYING.BSD_FB LICENSE
}
rdma-core-devel_package() {
From 3d3cc19e65573893722817d52172b609dbfdd5ce Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:29:02 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/rdma-core/patches/manpages.patch | 22 ++++++++++++++++++++++
srcpkgs/rdma-core/template | 7 -------
srcpkgs/removed-packages/template | 2 ++
5 files changed, 24 insertions(+), 30 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 9017b9f53c5e..69062f5a4fe3 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -26,13 +26,6 @@ conf_files="/etc/iwpmd.conf
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_patch() {
- # install manpages not depending on pandoc and rst2man
- sed -i buildlib/rdma_man.cmake \
- -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
- -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
-}
-
post_install() {
# not needed
rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (4 preceding siblings ...)
2022-12-02 19:38 ` kruceter
@ 2022-12-02 19:51 ` kruceter
2022-12-02 19:51 ` [PR REVIEW] " kruceter
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-02 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 7218 bytes --]
From 2745415ccfacfbd23a65bb1094c9f1aac456cdd3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
common/shlibs | 4 ++++
srcpkgs/rdma-core/template | 35 +++++++++++++++++------------------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..44911fd1247c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,8 +3622,12 @@ libfrr.so.0 libfrr-6.0_1
libkaccounts.so.2 kaccounts-integration-20.04.3_1
libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
libibumad.so.3 rdma-core-22.1_1
libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
librdmacm.so.1 rdma-core-22.1_1
libdvdcss.so.2 libdvdcss-1.4.2_1
libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 25f1e1e6bb84..9017b9f53c5e 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
+version=43.0
revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
-license="GPL-2.0-or-later, BSD-2-Clause-FreeBSD"
+license="GPL-2.0-or-later, BSD-2-Clause"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,21 +26,18 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/usr/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
-
- # The cmake is bad
- mv ${DESTDIR}/usr/etc/* ${DESTDIR}/etc/
+post_patch() {
+ # install manpages not depending on pandoc and rst2man
+ sed -i buildlib/rdma_man.cmake \
+ -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
+ -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
+}
+post_install() {
# not needed
rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
-
- vlicense COPYING.BSD_FB
+ vlicense COPYING.BSD_FB LICENSE
}
rdma-core-devel_package() {
From c76804f7c7f66c336876623342f09344b5d97a6e Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:29:02 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/rdma-core/patches/manpages.patch | 22 ++++++++++++++++++++++
srcpkgs/rdma-core/template | 9 +++------
srcpkgs/removed-packages/template | 2 ++
5 files changed, 27 insertions(+), 29 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 9017b9f53c5e..84f6d644443a 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -26,12 +26,9 @@ conf_files="/etc/iwpmd.conf
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_patch() {
- # install manpages not depending on pandoc and rst2man
- sed -i buildlib/rdma_man.cmake \
- -e 's|"\${I}" MATCHES "\\\\\.md\$"|& AND PANDOC_FOUND|' \
- -e 's|"\${I}" MATCHES "\\\\\.in\\\\\.rst\$"|& AND RST2MAN_FOUND|'
-}
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
post_install() {
# not needed
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (5 preceding siblings ...)
2022-12-02 19:51 ` kruceter
@ 2022-12-02 19:51 ` kruceter
2022-12-02 19:52 ` kruceter
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-02 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#discussion_r1038477994
Comment:
Done. Thank you!
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (6 preceding siblings ...)
2022-12-02 19:51 ` [PR REVIEW] " kruceter
@ 2022-12-02 19:52 ` kruceter
2022-12-05 14:55 ` [PR PATCH] [Updated] " kruceter
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-02 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#issuecomment-1335764130
Comment:
> any common/shlibs entries from the removed package should be deleted
`common/shlibs` does not have any entries for libibmad.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (7 preceding siblings ...)
2022-12-02 19:52 ` kruceter
@ 2022-12-05 14:55 ` kruceter
2022-12-21 19:32 ` kruceter
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-05 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 6198 bytes --]
From f3a107605cbbcafa2a84f68f394d1d8029dba2c2 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
common/shlibs | 4 ++++
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
srcpkgs/rdma-core/template | 28 +++++++++++++-----------
3 files changed, 41 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..a94b39430ec7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3628,8 +3628,12 @@ libfrr.so.0 libfrr-6.0_1
libkaccounts.so.2 kaccounts-integration-20.04.3_1
libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
libibumad.so.3 rdma-core-22.1_1
libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
librdmacm.so.1 rdma-core-22.1_1
libdvdcss.so.2 libdvdcss-1.4.2_1
libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..250684baaa50 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=43.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
From aae342201d6abea84c473058ffc0e7b5c34581d6 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (8 preceding siblings ...)
2022-12-05 14:55 ` [PR PATCH] [Updated] " kruceter
@ 2022-12-21 19:32 ` kruceter
2022-12-26 3:22 ` kruceter
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-21 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5534 bytes --]
From e513da9ed3951dc4ddf7ddb66ff2778d62504bfa Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
srcpkgs/rdma-core/template | 28 +++++++++++++-----------
2 files changed, 37 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..250684baaa50 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=43.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
From 96e8ae42d373f87eb7cd249096612b20a622e19b Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..eda3d7025176 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -265,6 +265,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (9 preceding siblings ...)
2022-12-21 19:32 ` kruceter
@ 2022-12-26 3:22 ` kruceter
2023-01-02 3:19 ` kruceter
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2022-12-26 3:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5534 bytes --]
From b6fe215ad0315324ed65e0704101870823528f6c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.
---
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
srcpkgs/rdma-core/template | 28 +++++++++++++-----------
2 files changed, 37 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..250684baaa50 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=43.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
From 9fc8f54d893d2730974407c47bb6afaeda9c2dea Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 2/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..eda3d7025176 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -265,6 +265,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 43.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (10 preceding siblings ...)
2022-12-26 3:22 ` kruceter
@ 2023-01-02 3:19 ` kruceter
2023-01-06 12:29 ` [PR PATCH] [Closed]: rdma-core: update to 44.0 kruceter
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-02 3:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5534 bytes --]
From 3fe443709ee987d5b93b8d9abd88f3ee69de2271 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 1/2] libibmad: remove package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad-devel | 1 -
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/libibmad-devel
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..eda3d7025176 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -265,6 +265,8 @@ replaces="
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
liblrzip<=0.641_1
libmagick6-devel<=6.9.12.12_2
libmagick6-perl<=6.9.12.12_2
From 883cc232b9d1e6d2b6386969650450974f277c44 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 2 Jan 2023 06:18:18 +0300
Subject: [PATCH 2/2] rdma-core: update to 44.0.
---
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
srcpkgs/rdma-core/template | 28 +++++++++++++-----------
2 files changed, 37 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..4193324b301a 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=44.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=25d6601e60f27bbcd75e07fe340400cb80e6c3c487679700535385cfc9d9858b
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Closed]: rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (11 preceding siblings ...)
2023-01-02 3:19 ` kruceter
@ 2023-01-06 12:29 ` kruceter
2023-01-10 14:03 ` [PR PATCH] [Updated] " kruceter
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-06 12:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
There's a closed pull request on the void-packages repository
rdma-core: update to 44.0.
https://github.com/void-linux/void-packages/pull/40866
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (12 preceding siblings ...)
2023-01-06 12:29 ` [PR PATCH] [Closed]: rdma-core: update to 44.0 kruceter
@ 2023-01-10 14:03 ` kruceter
2023-01-10 14:12 ` kruceter
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 44.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5929 bytes --]
From 3dce76baeeccf2ec9f62bfa0705aefb20cbdcdc0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 1/2] libibmad: turn into a transitional package
Merged with rdma-core, obsoleted by upstream.
---
srcpkgs/libibmad | 1 +
srcpkgs/libibmad-devel | 2 +-
srcpkgs/libibmad/template | 22 ----------------------
srcpkgs/rdma-core/template | 12 ++++++++++++
4 files changed, 14 insertions(+), 23 deletions(-)
create mode 120000 srcpkgs/libibmad
delete mode 100644 srcpkgs/libibmad/template
diff --git a/srcpkgs/libibmad b/srcpkgs/libibmad
new file mode 120000
index 000000000000..db560d07ba4b
--- /dev/null
+++ b/srcpkgs/libibmad
@@ -0,0 +1 @@
+rdma-core
\ No newline at end of file
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
index 8c7ec3317f6a..36d5492005a9 120000
--- a/srcpkgs/libibmad-devel
+++ b/srcpkgs/libibmad-devel
@@ -1 +1 @@
-libibmad
\ No newline at end of file
+rdma-core-devel
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..7f7e54ff159e 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -46,3 +46,15 @@ rdma-core-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libibmad_package() {
+ depends="rdma-core>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
+
+libibmad-devel_package() {
+ depends="rdma-core-devel>=${version}_${revision}"
+ short_desc+=" - development files (transitional dummy package)"
+ build_style=meta
+}
From 74b097e13a52933d76a4c0cfbc22e9837846d917 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 2 Jan 2023 06:18:18 +0300
Subject: [PATCH 2/2] rdma-core: update to 44.0.
---
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
srcpkgs/rdma-core/template | 28 +++++++++++++-----------
2 files changed, 37 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index 7f7e54ff159e..c58afd6deeea 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=44.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=25d6601e60f27bbcd75e07fe340400cb80e6c3c487679700535385cfc9d9858b
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (13 preceding siblings ...)
2023-01-10 14:03 ` [PR PATCH] [Updated] " kruceter
@ 2023-01-10 14:12 ` kruceter
2023-01-10 14:13 ` kruceter
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 894 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#issuecomment-1377343991
Comment:
> 1. `libibmad` has been subsumed by `rdma-core`, not really "removed". This is an important distinction for people who might attempt partial updates.
I have been under the impression the unused package (no reverse dependencies) can be safely removed, but since some people might *need* `libibmad`, I see no harm to try and symlink `rdma-core`.
> 2\. Just dropping the template will still leave the old `libibmad` in repositories, which will stage the repos the next time `rdma-core` bumps the soname of `libibumad.so.3`. That would require manual cleanup, usually at the least opportune time.
libibmad and libibumad are two different libraries, Andrew.
Even if `libibumad`'s soname gets changed at some point, libibmad plays no role here.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (14 preceding siblings ...)
2023-01-10 14:12 ` kruceter
@ 2023-01-10 14:13 ` kruceter
2023-01-10 14:16 ` [PR PATCH] [Updated] " kruceter
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#issuecomment-1377343991
Comment:
> 1. `libibmad` has been subsumed by `rdma-core`, not really "removed". This is an important distinction for people who might attempt partial updates.
I have been under the impression the unused package (no reverse dependencies) can be safely removed, but since some people might *need* `libibmad`, I see no harm to try and symlink it to `rdma-core`.
> 2\. Just dropping the template will still leave the old `libibmad` in repositories, which will stage the repos the next time `rdma-core` bumps the soname of `libibumad.so.3`. That would require manual cleanup, usually at the least opportune time.
libibmad and libibumad are two different libraries, Andrew.
Even if `libibumad`'s soname gets changed at some point, libibmad plays no role here.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (15 preceding siblings ...)
2023-01-10 14:13 ` kruceter
@ 2023-01-10 14:16 ` kruceter
2023-01-10 14:30 ` kruceter
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 44.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5483 bytes --]
From 6224d479c18bde91f651c2c5e47f38df76163a54 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 2 Jan 2023 06:18:18 +0300
Subject: [PATCH] rdma-core: update to 44.0.
libibmad has been merged with this package and obsoleted upstream.
---
srcpkgs/libibmad | 1 +
srcpkgs/libibmad-devel | 2 +-
srcpkgs/libibmad/template | 22 -------------
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++
srcpkgs/rdma-core/template | 40 ++++++++++++++++--------
5 files changed, 51 insertions(+), 36 deletions(-)
create mode 120000 srcpkgs/libibmad
delete mode 100644 srcpkgs/libibmad/template
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/libibmad b/srcpkgs/libibmad
new file mode 120000
index 000000000000..db560d07ba4b
--- /dev/null
+++ b/srcpkgs/libibmad
@@ -0,0 +1 @@
+rdma-core
\ No newline at end of file
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
index 8c7ec3317f6a..36d5492005a9 120000
--- a/srcpkgs/libibmad-devel
+++ b/srcpkgs/libibmad-devel
@@ -1 +1 @@
-libibmad
\ No newline at end of file
+rdma-core-devel
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..c58afd6deeea 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=44.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=25d6601e60f27bbcd75e07fe340400cb80e6c3c487679700535385cfc9d9858b
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
@@ -46,3 +48,15 @@ rdma-core-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libibmad_package() {
+ depends="rdma-core>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
+
+libibmad-devel_package() {
+ depends="rdma-core-devel>=${version}_${revision}"
+ short_desc+=" - development files (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (16 preceding siblings ...)
2023-01-10 14:16 ` [PR PATCH] [Updated] " kruceter
@ 2023-01-10 14:30 ` kruceter
2023-01-10 14:36 ` [PR PATCH] [Closed]: " ahesford
2023-01-10 14:43 ` kruceter
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866
rdma-core: update to 44.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 5477 bytes --]
From 7bf488a5ba8f90fbbdadb7e5d3cb80a7537dcb84 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 2 Jan 2023 06:18:18 +0300
Subject: [PATCH] rdma-core: update to 44.0.
libibmad has been merged with this package and obsoleted upstream.
---
srcpkgs/libibmad | 1 +
srcpkgs/libibmad-devel | 2 +-
srcpkgs/libibmad/template | 22 -------------
srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++
srcpkgs/rdma-core/template | 40 ++++++++++++++++--------
5 files changed, 51 insertions(+), 36 deletions(-)
create mode 120000 srcpkgs/libibmad
delete mode 100644 srcpkgs/libibmad/template
create mode 100644 srcpkgs/rdma-core/patches/manpages.patch
diff --git a/srcpkgs/libibmad b/srcpkgs/libibmad
new file mode 120000
index 000000000000..db560d07ba4b
--- /dev/null
+++ b/srcpkgs/libibmad
@@ -0,0 +1 @@
+rdma-core
\ No newline at end of file
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
index 8c7ec3317f6a..db560d07ba4b 120000
--- a/srcpkgs/libibmad-devel
+++ b/srcpkgs/libibmad-devel
@@ -1 +1 @@
-libibmad
\ No newline at end of file
+rdma-core
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
- depends="libibmad-${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+ foreach(I ${ARGN})
+- if ("${I}" MATCHES "\\.md$")
++ if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ "${I}"
+ "${MAN_SECT}"
+ "${BASE_NAME}")
+- elseif ("${I}" MATCHES "\\.in\\.rst$")
++ elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+ string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+ string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+ get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..c58afd6deeea 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
# Template file for 'rdma-core'
pkgname=rdma-core
-version=23.3
-revision=2
+version=44.0
+revision=1
build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
makedepends="libnl3-devel eudev-libudev-devel python3-devel"
short_desc="RDMA core userspace libraries and daemons"
maintainer="Rich G <rich@richgannon.net>"
license="GPL-2.0-or-later, BSD-2-Clause, MIT"
homepage="https://github.com/linux-rdma/rdma-core"
distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=25d6601e60f27bbcd75e07fe340400cb80e6c3c487679700535385cfc9d9858b
+build_options="docs"
+desc_option_docs="Enable documentation"
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
/etc/srp_daemon.conf
/etc/rdma/modules/infiniband.conf
/etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
/etc/rdma/modules/roce.conf
/etc/rdma/modules/srp_daemon.conf"
-post_install() {
- # Fix path of udev rule
- mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
- ${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+ x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
- # Fix location of modprobe.d files
- mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+ # not needed
+ rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
vlicense COPYING.BSD_FB
vlicense COPYING.BSD_MIT
@@ -46,3 +48,15 @@ rdma-core-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libibmad_package() {
+ depends="rdma-core>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
+
+libibmad-devel_package() {
+ depends="rdma-core-devel>=${version}_${revision}"
+ short_desc+=" - development files (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Closed]: rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (17 preceding siblings ...)
2023-01-10 14:30 ` kruceter
@ 2023-01-10 14:36 ` ahesford
2023-01-10 14:43 ` kruceter
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-01-10 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
There's a closed pull request on the void-packages repository
rdma-core: update to 44.0.
https://github.com/void-linux/void-packages/pull/40866
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l-musl (cross)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: rdma-core: update to 44.0.
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
` (18 preceding siblings ...)
2023-01-10 14:36 ` [PR PATCH] [Closed]: " ahesford
@ 2023-01-10 14:43 ` kruceter
19 siblings, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-10 14:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40866#issuecomment-1377343991
Comment:
> 1. `libibmad` has been subsumed by `rdma-core`, not really "removed". This is an important distinction for people who might attempt partial updates.
I have been under the impression the unused package (no reverse dependencies) can be safely removed, but since some people might *need* `libibmad`, I see no harm to try and symlink it to `rdma-core`.
> 2\. Just dropping the template will still leave the old `libibmad` in repositories, which will stage the repos the next time `rdma-core` bumps the soname of `libibumad.so.3`. That would require manual cleanup, usually at the least opportune time.
libibmad and libibumad are two different libraries, Andrew.
Even if `libibumad`'s soname gets changed at some point, libibmad plays no role here.
**UPD**: based on the discussion in #xbps, `libibmad` apparently depends on `libibumad`. If it was merged as is, libibmad may become broken if `libibumad.so.3` is bumped at some point. I am guilty on this part.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-01-10 14:43 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-01 1:49 [PR PATCH] rdma-core: update to 43.0 kruceter
2022-12-02 3:57 ` classabbyamp
2022-12-02 19:26 ` [PR REVIEW] " ahesford
2022-12-02 19:29 ` ahesford
2022-12-02 19:35 ` [PR PATCH] [Updated] " kruceter
2022-12-02 19:38 ` kruceter
2022-12-02 19:51 ` kruceter
2022-12-02 19:51 ` [PR REVIEW] " kruceter
2022-12-02 19:52 ` kruceter
2022-12-05 14:55 ` [PR PATCH] [Updated] " kruceter
2022-12-21 19:32 ` kruceter
2022-12-26 3:22 ` kruceter
2023-01-02 3:19 ` kruceter
2023-01-06 12:29 ` [PR PATCH] [Closed]: rdma-core: update to 44.0 kruceter
2023-01-10 14:03 ` [PR PATCH] [Updated] " kruceter
2023-01-10 14:12 ` kruceter
2023-01-10 14:13 ` kruceter
2023-01-10 14:16 ` [PR PATCH] [Updated] " kruceter
2023-01-10 14:30 ` kruceter
2023-01-10 14:36 ` [PR PATCH] [Closed]: " ahesford
2023-01-10 14:43 ` kruceter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).