Control: tags -1 patch On 09/03/2017 01:40 PM, John Paul Adrian Glaubitz wrote: > Can we get this fixed, please? If the maintainer doesn't have time > or resources at the moment, I'd be happy to perform a NMU.
Attached debdiff contains the patch which fixes the issue for me. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru aranym-1.0.2/debian/changelog aranym-1.0.2/debian/changelog --- aranym-1.0.2/debian/changelog 2014-10-20 11:32:27.000000000 +0200 +++ aranym-1.0.2/debian/changelog 2017-09-03 15:53:18.000000000 +0200 @@ -1,3 +1,11 @@ +aranym (1.0.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to fix kernel soft-lock up during SCSI driver + initialization when running Linux (Closes: #865928) + + -- John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> Sun, 03 Sep 2017 15:53:18 +0200 + aranym (1.0.2-2) unstable; urgency=medium * [1ac234e] Update autoconf configs (Closes: #727321) diff -Nru aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch --- aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch 1970-01-01 01:00:00.000000000 +0100 +++ aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch 2017-09-03 15:52:56.000000000 +0200 @@ -0,0 +1,47 @@ +Description: Emulate NCR5380 MODE register + Fixes a kernel soft-lockup with newer Linux kernels + running inside Aranym when initializing SCSI drivers. +Author: Andreas Schwab <sch...@linux-m68k.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865928 +Origin: upstream, https://github.com/aranym/aranym/commit/7af1cbfc5257d2c524ffe009790045d687c69fa5 +Bug: <url in upstream bugtracker> +Forwarded: not-needed +Last-Update: 2017-09-03 + +--- aranym-1.0.2.orig/src/include/ncr5380.h ++++ aranym-1.0.2/src/include/ncr5380.h +@@ -33,6 +33,7 @@ class NCR5380 { + uae_u8 hd_count; + + uae_u8 hd_initiator; ++ uae_u8 hd_mode; + + public: + NCR5380(void); +--- aranym-1.0.2.orig/src/ncr5380.cpp ++++ aranym-1.0.2/src/ncr5380.cpp +@@ -120,7 +120,7 @@ NCR5380::~NCR5380(void) + + void NCR5380::reset(void) + { +- hd_count = hd_status = hd_initiator = 0; ++ hd_count = hd_status = hd_initiator = hd_mode = 0; + + D(bug("ncr5380: reset")); + } +@@ -140,6 +140,7 @@ uae_u8 NCR5380::ReadData(uae_u16 control + data = hd_initiator = ICR_ARBITRATION_PROGRESS; + break; + case MODE_REG: ++ data = hd_mode; + break; + case TARGET_COMMAND_REG: + break; +@@ -172,6 +173,7 @@ void NCR5380::WriteData(uae_u16 control, + hd_initiator = data; + break; + case MODE_REG: ++ hd_mode = data; + break; + case TARGET_COMMAND_REG: + break; diff -Nru aranym-1.0.2/debian/patches/series aranym-1.0.2/debian/patches/series --- aranym-1.0.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ aranym-1.0.2/debian/patches/series 2017-09-03 15:47:48.000000000 +0200 @@ -0,0 +1 @@ +0001-emulate-NCR5380-MODE-register.patch
