summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames P. Harvey2018-10-13 17:46:19 -0400
committerJames P. Harvey2018-10-13 17:46:19 -0400
commitcde8f15d3f9c6ee57007ec962a6906b1da52d9fd (patch)
tree410c701f804b740961abd8670fd2eab8048a6766
parent1e42a5a2662c558a8cb973b58358bf9ba1ab3945 (diff)
downloadaur-cde8f15d3f9c6ee57007ec962a6906b1da52d9fd.tar.gz
Upstream moved, and released 2.0.0.
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD19
-rw-r--r--rdma-ndd.service13
3 files changed, 16 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8b8a734b19c..ab48b5a1747c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
-# Generated by mksrcinfo v8
-# Wed Aug 17 23:47:33 UTC 2016
pkgbase = infiniband-diags
pkgdesc = OpenFabrics Alliance diagnostic programs and scripts for InfiniBand subnets
- pkgver = 1.6.7
+ pkgver = 2.0.0
pkgrel = 1
url = https://www.openfabrics.org/index.php/overview.html
arch = x86_64
arch = i686
license = GPL2
license = custom:"Open Fabrics Alliance BSD"
- depends = libibmad
depends = opensm
depends = systemd
depends = glib2
- source = https://www.openfabrics.org/downloads/management/infiniband-diags-1.6.7.tar.gz
- source = rdma-ndd.service
- md5sums = e100bb49f4227a70e0831152b2e4d61e
- md5sums = 4958d94ab0760c4b5b1908d66895e118
+ provides = libibmad
+ conflicts = libibmad
+ replaces = libibmad
+ source = https://github.com/linux-rdma/infiniband-diags/archive/2.0.0.tar.gz
+ md5sums = 4357e6563477a693949efa18d5f7d720
pkgname = infiniband-diags
diff --git a/PKGBUILD b/PKGBUILD
index 0aac4bdc9354..49bb8748de29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,22 @@
# Up to date with fedora's infiniband-diags-1.6.4-4.fc23.src.rpm
pkgname=infiniband-diags
-pkgver=1.6.7
+pkgver=2.0.0
pkgrel=1
pkgdesc='OpenFabrics Alliance diagnostic programs and scripts for InfiniBand subnets'
arch=('x86_64' 'i686')
url='https://www.openfabrics.org/index.php/overview.html'
license=('GPL2' 'custom:"Open Fabrics Alliance BSD"')
-depends=('libibmad' 'opensm' 'systemd' 'glib2')
-source=("https://www.openfabrics.org/downloads/management/${pkgname}-${pkgver}.tar.gz"
- 'rdma-ndd.service')
-md5sums=('e100bb49f4227a70e0831152b2e4d61e'
- '4958d94ab0760c4b5b1908d66895e118')
+provides=('libibmad')
+conflicts=('libibmad')
+replaces=('libibmad')
+depends=('opensm' 'systemd' 'glib2')
+source=("https://github.com/linux-rdma/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('4357e6563477a693949efa18d5f7d720')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh
./configure --prefix=/usr \
--sbindir=/usr/bin \
--libexecdir=/usr/lib \
@@ -32,11 +34,10 @@ package() {
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
chmod 644 "${pkgdir}/etc/infiniband-diags/ibdiag.conf"
- # Convert from init.d to systemd
+ # Remove init.d script. (rdma-ndd and its .service were moved upstream ito rdma-core.)
rm -rf ${pkgdir}/etc/init.d
- install -Dm644 "${srcdir}/rdma-ndd.service" "${pkgdir}/usr/lib/systemd/system/rdma-ndd.service"
- # 1.6.7 erroneously makes an empty /var/run directory - remove /var/run and /var with rmdir rather than "rm -r" so it will fail if not empty (future versions)
+ # 1.6.7 - 2.0.0 erroneously makes an empty /var/run directory - remove /var/run and /var with rmdir rather than "rm -r" so it will fail if not empty (future versions)
rmdir "${pkgdir}/var/run"
rmdir "${pkgdir}/var"
}
diff --git a/rdma-ndd.service b/rdma-ndd.service
deleted file mode 100644
index da1deca04f25..000000000000
--- a/rdma-ndd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-# Freshly created, didn't find an existing rdma-ndd.service anywhere
-# Skeleton systemd service file, may need additional work such as Before/Requires/After
-
-[Unit]
-Description=Start or stop the srptools rdma-ndd daemon
-Documentation=file:///etc/infiniband-diags/ibdiag.conf
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rdma-ndd
-
-[Install]
-WantedBy=network.target