[arch-commits] Commit in vhba-module/trunk (60-vhba.rules PKGBUILD)

[Jan Steffens]

    Date: Sunday, November 21, 2021 @ 00:55:31
  Author: heftig
Revision: 1052920

20211023-9: move config to cdemu-daemon

Modified:
  vhba-module/trunk/PKGBUILD
Deleted:
  vhba-module/trunk/60-vhba.rules

---------------+
 60-vhba.rules |    1 -
 PKGBUILD      |   17 +++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

Deleted: 60-vhba.rules
===================================================================
--- 60-vhba.rules	2021-11-20 23:59:51 UTC (rev 1052919)
+++ 60-vhba.rules	2021-11-21 00:55:31 UTC (rev 1052920)
@@ -1 +0,0 @@
-ACTION=="add", KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 23:59:51 UTC (rev 1052919)
+++ PKGBUILD	2021-11-21 00:55:31 UTC (rev 1052920)
@@ -6,7 +6,7 @@
 pkgbase=vhba-module
 pkgname=(vhba-module vhba-module-dkms)
 pkgver=20211023
-pkgrel=8
+pkgrel=9
 pkgdesc="Kernel module that emulates SCSI devices"
 url="https://cdemu.sourceforge.io/"
 arch=(x86_64)
@@ -13,14 +13,12 @@
 license=(GPL)
 makedepends=('linux-headers')
 source=("https://downloads.sourceforge.net/cdemu/$pkgbase-$pkgver.tar.xz"
-        60-vhba.rules dkms.conf)
+        dkms.conf)
 sha256sums=('60087baaa928cefa06d5684706fef3d48712acfef92cb32afc507ab19adebf10'
-            '5265eba8042d0483088c233c74640069caf2cbd290bc689cfcc4373ae3e18e83'
             '8cab0ebb4fee72069d63616b0983f105b98d1261e72e9bef5509a6e60bc382a7')
 
 prepare() {
   cd $pkgbase-$pkgver
-  sed -i 's/20190302/20190410/' Makefile  # Fixup VHBA_VERSION
 }
 
 build() {
@@ -33,10 +31,7 @@
   provides=(VHBA-MODULE)
 
   local extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
-  cd $pkgbase-$pkgver
-  install -Dt "$pkgdir$extradir" -m644 *.ko
-  install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
-  echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+  install -Dt "$pkgdir$extradir" -m644 $pkgbase-$pkgver/*.ko
 
   find "$pkgdir" -name '*.ko' -exec strip --strip-debug {} +
   find "$pkgdir" -name '*.ko' -exec xz {} +
@@ -47,10 +42,8 @@
   provides=(VHBA-MODULE)
   conflicts=(vhba-module)
 
-  cd $pkgbase-$pkgver
-  install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile vhba.c ../dkms.conf
-  install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
-  echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+  install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 \
+    dkms.conf $pkgbase-$pkgver/{Makefile,vhba.c}
 }
 
 # vim:set ts=2 sw=2 et: