[arch-commits] Commit in open-iscsi/trunk (PKGBUILD)

[Christian Hesse]

    Date: Wednesday, June 1, 2022 @ 14:51:21
  Author: eworm
Revision: 1218308

upgpkg: open-iscsi 2.1.7-1: new upstream release

Modified:
  open-iscsi/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-01 12:52:03 UTC (rev 1218307)
+++ PKGBUILD	2022-06-01 14:51:21 UTC (rev 1218308)
@@ -2,7 +2,7 @@
 # Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
 
 pkgname=open-iscsi
-pkgver=2.1.6
+pkgver=2.1.7
 pkgrel=1
 pkgdesc='iSCSI userland tools'
 arch=('x86_64')
@@ -15,18 +15,28 @@
 	'etc/iscsi/initiatorname.iscsi')
 options=('docs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz")
-sha256sums=('b67350d106696779c6bee421c60a64ade2a9dabe247dc4bd44f59c751e22d7f7')
+sha256sums=('d96761e47a69f8214c5fbd251d844f37961b14c3e437b63a15cc64f5b8cba2f0')
 
 build() {
   cd "$srcdir"/${pkgname}-${pkgver}
 
-  make user LIB_DIR=/usr/lib
+  make \
+    LIB_DIR=/usr/lib \
+    RULESDIR=/usr/lib/udev/rules.d \
+    SBINDIR=/usr/bin \
+    user
 }
 
 package() {
   cd "$srcdir"/${pkgname}-${pkgver}
 
-  make DESTDIR="$pkgdir" LIB_DIR=/usr/lib install install_systemd
+  make -j1 \
+    DESTDIR="$pkgdir" \
+    LIB_DIR=/usr/lib \
+    RULESDIR=/usr/lib/udev/rules.d \
+    SBINDIR=/usr/bin \
+    install \
+    install_systemd
 
   install -D -m0644 "$srcdir"/${pkgname}-${pkgver}/etc/iscsid.conf "$pkgdir"/etc/iscsi
   echo -n > "$pkgdir"/etc/iscsi/initiatorname.iscsi
@@ -35,6 +45,4 @@
   mkdir -p "$pkgdir"/usr/share/doc/${pkgname}
   install -m0644 Changelog "$pkgdir"/usr/share/doc/${pkgname}/
   install -m0644 README "$pkgdir"/usr/share/doc/${pkgname}/
-
-  mv "$pkgdir"/sbin "$pkgdir"/usr/bin
 }