summaryrefslogtreecommitdiff
path: root/emulators/gxemul
diff options
context:
space:
mode:
authorchristos <christos@pkgsrc.org>2019-04-11 12:50:30 +0000
committerchristos <christos@pkgsrc.org>2019-04-11 12:50:30 +0000
commit8c3cd3ebc990a4880e85bd2c1b1e59dc5e8b2d5a (patch)
treeabad25b0d01036f11a32374badf284d6dd989b44 /emulators/gxemul
parent9e432c0718c9eec4e45793a6ac7b7e51b685168f (diff)
downloadpkgsrc-8c3cd3ebc990a4880e85bd2c1b1e59dc5e8b2d5a.tar.gz
PR/54114: Ignore unimplemented scsi commands.
Diffstat (limited to 'emulators/gxemul')
-rw-r--r--emulators/gxemul/Makefile4
-rw-r--r--emulators/gxemul/distinfo3
-rw-r--r--emulators/gxemul/patches/patch-src_disk_diskimage__scsicmd.cc18
3 files changed, 22 insertions, 3 deletions
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 15030204115..66fe4447c30 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2019/03/03 10:41:28 gson Exp $
+# $NetBSD: Makefile,v 1.64 2019/04/11 12:50:30 christos Exp $
DISTNAME= gxemul-0.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gxemul/}
diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
index a044a4c041d..e159a4c000f 100644
--- a/emulators/gxemul/distinfo
+++ b/emulators/gxemul/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2019/03/03 10:41:28 gson Exp $
+$NetBSD: distinfo,v 1.57 2019/04/11 12:50:30 christos Exp $
SHA1 (gxemul-0.6.1.tar.gz) = 150e495e91a968a49ffc7fe2390c3edff100508d
RMD160 (gxemul-0.6.1.tar.gz) = 0434bff07970d8828531d222cc8b95c64c2d62f1
@@ -12,6 +12,7 @@ SHA1 (patch-src_console_console.cc) = 0b9c07eaa26a39b20a6f6769cdf02208fc9667d3
SHA1 (patch-src_cpus_cpu_mips.cc) = ad6d9c8b452b1b8422d9194cadfa1c8c3d29ef21
SHA1 (patch-src_devices_dev__footbridge.cc) = 2dc76e65fff7e6c846d9d06b74bed76075b0c79a
SHA1 (patch-src_devices_dev__sh4.cc) = 81e3dcc01934c71389a91861343bc8aa32284160
+SHA1 (patch-src_disk_diskimage__scsicmd.cc) = fc0d9cff9afb057051c4f2cb65c898a31a1463bd
SHA1 (patch-src_include_components_CPUDyntransComponent.h) = f60d31261a03a0a73fa4844143da4931cae85ce6
SHA1 (patch-src_include_components_M88K__CPUComponent.h) = 5232386ac337c552d88cbdb829b6f0f3e94ba0f2
SHA1 (patch-src_include_components_MIPS__CPUComponent.h) = 48bc9ea9dacbe7afd9734ee04e270943208db148
diff --git a/emulators/gxemul/patches/patch-src_disk_diskimage__scsicmd.cc b/emulators/gxemul/patches/patch-src_disk_diskimage__scsicmd.cc
new file mode 100644
index 00000000000..63d6cb242a4
--- /dev/null
+++ b/emulators/gxemul/patches/patch-src_disk_diskimage__scsicmd.cc
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_disk_diskimage__scsicmd.cc,v 1.1 2019/04/11 12:50:30 christos Exp $
+
+Ignore unimplemented disk commands instead of exiting.
+
+--- src/disk/diskimage_scsicmd.cc.orig 2018-12-07 01:29:22.000000000 -0500
++++ src/disk/diskimage_scsicmd.cc 2019-04-11 08:13:01.813050193 -0400
+@@ -1145,9 +1145,9 @@
+ break;
+
+ default:
+- fatal("[ UNIMPLEMENTED SCSI command 0x%02x, disk id=%i ]\n",
++ debug("[ UNIMPLEMENTED SCSI command 0x%02x, disk id=%i ]\n",
+ xferp->cmd[0], id);
+- exit(1);
++ break;
+ }
+ debug(" ]\n");
+