[pkgsrc/trunk]: pkgsrc/sysutils/xentools415 Workaround a bug in NetBSD 9.99 k...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59167beb7c9a
branches:  trunk
changeset: 380161:59167beb7c9a
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon May 30 09:09:33 2022 +0000

description:
Workaround a bug in NetBSD 9.99 kernel: don't pass the path to the
vnd block device to vnconfig, but the vnd name.
Bump PKGREVISION

diffstat:

 sysutils/xentools415/Makefile                                 |   3 +-
 sysutils/xentools415/distinfo                                 |   3 +-
 sysutils/xentools415/patches/patch-tools_hotplug_NetBSD_block |  27 +++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 4a1bb3cf4eba -r 59167beb7c9a sysutils/xentools415/Makefile
--- a/sysutils/xentools415/Makefile     Sun May 29 21:44:13 2022 +0000
+++ b/sysutils/xentools415/Makefile     Mon May 30 09:09:33 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/05/13 16:04:23 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/30 09:09:33 bouyer Exp $
 #
 VERSION=       4.15.2
+PKGREVISION=   1
 
 DIST_SUBDIR=           xen415
 DISTNAME=              xen-${VERSION}
diff -r 4a1bb3cf4eba -r 59167beb7c9a sysutils/xentools415/distinfo
--- a/sysutils/xentools415/distinfo     Sun May 29 21:44:13 2022 +0000
+++ b/sysutils/xentools415/distinfo     Mon May 30 09:09:33 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2022/05/13 16:04:23 wiz Exp $
+$NetBSD: distinfo,v 1.9 2022/05/30 09:09:33 bouyer Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
@@ -24,6 +24,7 @@
 SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf
 SHA1 (patch-tools_firmware_etherboot_Makefile) = 61741d59c72430d53682ea83deed91ee4ff3d220
 SHA1 (patch-tools_hotplug_NetBSD_Makefile) = c032af025b18e888019247c47016dcf649c4f391
+SHA1 (patch-tools_hotplug_NetBSD_block) = 23a18f1ebfa3bc4a689707fd5c8afa07fa232bee
 SHA1 (patch-tools_hotplug_common_Makefile) = 590186dfb31713e8d9ee675186f826bcbcba3c15
 SHA1 (patch-tools_include_xen-sys_NetBSD_evtchn.h) = cac834bdddfab8bb76be3b4766f084f6fc2a7bc2
 SHA1 (patch-tools_include_xen-sys_NetBSD_privcmd.h) = b47ef90b0e823b270c491b9206ae10b9f230971d
diff -r 4a1bb3cf4eba -r 59167beb7c9a sysutils/xentools415/patches/patch-tools_hotplug_NetBSD_block
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools415/patches/patch-tools_hotplug_NetBSD_block     Mon May 30 09:09:33 2022 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-tools_hotplug_NetBSD_block,v 1.1 2022/05/30 09:09:34 bouyer Exp $
+
+work around an issue in NetBSD 9.99.x kernel: pass the vnd name to vnconfig,
+not the path to the block device.
+
+--- tools/hotplug/NetBSD/block.orig    2022-01-31 10:42:09.000000000 +0100
++++ tools/hotplug/NetBSD/block 2022-05-30 10:50:42.821527086 +0200
+@@ -64,8 +64,9 @@
+               for disk in $available_disks; do
+                       eval status=\$$disk
+                       if [ "$status" = "free" ] && \
+-                          vnconfig /dev/${disk}d $xparams >/dev/null; then
++                          vnconfig ${disk} $xparams >/dev/null; then
+                               device=/dev/${disk}d
++                              vnd_device=$disk
+                               break   
+                       fi
+               done
+@@ -73,7 +74,7 @@
+               if [ x$device = x ] ; then
+                       error "no available vnd device"
+               fi
+-              xenstore-write $xpath/vnd $device
++              xenstore-write $xpath/vnd $vnd_device
+               ;;
+       phy)
+               device=$xparams