From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47758)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gLRzi-0001bM-Jb
	for guix-patches@gnu.org; Sat, 10 Nov 2018 07:04:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gLRze-0004jg-Kk
	for guix-patches@gnu.org; Sat, 10 Nov 2018 07:04:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:39962)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gLRze-0004jK-AI
	for guix-patches@gnu.org; Sat, 10 Nov 2018 07:04:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gLRze-00013y-1I
	for guix-patches@gnu.org; Sat, 10 Nov 2018 07:04:02 -0500
Subject: [bug#33329] [PATCH] gnu: Deprecate linux-module shpchp and tell user
	to remove it.
Resent-Message-ID: <handler.33329.B33329.15418514224061@debbugs.gnu.org>
From: swedebugia <swedebugia@riseup.net>
References: <87h8jbang2.fsf@elephly.net>
	<01fa8c80-c57c-f73a-cec1-af91cacb58bf@riseup.net>
Message-ID: <290b28ec-cd1e-e5e8-275e-133771c7d4f3@riseup.net>
Date: Sat, 10 Nov 2018 13:03:29 +0100
MIME-Version: 1.0
In-Reply-To: <01fa8c80-c57c-f73a-cec1-af91cacb58bf@riseup.net>
Content-Type: multipart/mixed; boundary="------------8567A496F7E0F493822FE6A8"
Content-Language: en-US
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 33329@debbugs.gnu.org, rekado@elephly.net

This is a multi-part message in MIME format.
--------------8567A496F7E0F493822FE6A8
Content-Type: multipart/alternative;
 boundary="------------2092B0EBC8F6EEF47AEB8061"


--------------2092B0EBC8F6EEF47AEB8061
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit

Hi

Updated patch attached with a fix of parens and removed my changes to 
linux-modules.scm.

I look forward to the review.

Cheers

On 2018-11-09 23:47, swedebugia wrote:
>
> Hi
>
> Ricardo, you mentioned that this needs to be fixed.
>
> I made a patch to fix this. I did not test the patch as I have no idea 
> how to do that.
>
> I have not run the indent script on it.
>
> Se attachment
>
>
> -------- Forwarded Message --------
> Subject: 	Re: GuixSD system reconfigure error
> Date: 	Thu, 30 Aug 2018 17:22:53 +0200
> From: 	Ricardo Wurmus <rekado@elephly.net>
> To: 	Hebi Li <lihebi.com@gmail.com>
> CC: 	help-guix@gnu.org
>
>
>
>
> Hi,
>
>>      https://github.com/lihebi/dothebi/blob/master/config.scm
>
> I see you use the “shpchp” kernel module. This no longer exists in the
> latest version of the kernel Linux. That’s what this really bad error
> message tries to tell you:
>
>> Backtrace:
>>             8 (primitive-load "/gnu/store/vz7ci9rh483f2zps2cl174rd91b?")
>> In ice-9/eval.scm:
>>      619:8  7 (_ #f)
>>     626:19  6 (_ #<directory (guile-user) 7cf140>)
>>      159:9  5 (_ _)
>> In gnu/build/linux-modules.scm:
>>     184:47  4 (recursive-module-dependencies _ #:lookup-module _)
>>      98:14  3 (module-dependencies _)
>>      85:18  2 (modinfo-section-contents _)
>> In ice-9/ports.scm:
>>     439:11  1 (call-with-input-file #f #<procedure get-bytevector-al?> ?)
>> In unknown file:
>>             0 (open-file #f "r" #:encoding #f #:guess-encoding #f)
>>
>> ERROR: In procedure open-file:
>> Wrong type (expecting string): #f
>> builder for `/gnu/store/0ahsvp7wx52zzh1rywbdbq78llcwb7id-linux-modules.drv' failed with exit code 1
>
> (I only know this because I had the same problem.) Obviously, this
> error message should be changed.
>
> As a workaround you could switch to the LTS kernel where that module
> still exists.
>
> --
> Ricardo
>
>
-- 
Cheers
Swedebugia


--------------2092B0EBC8F6EEF47AEB8061
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: 8bit

<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p>Hi</p>
    <p>Updated patch attached with a fix of parens and removed my
      changes to linux-modules.scm.<br>
    </p>
    <p>I look forward to the review.</p>
    <p>Cheers<br>
    </p>
    <div class="moz-cite-prefix">On 2018-11-09 23:47, swedebugia wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:01fa8c80-c57c-f73a-cec1-af91cacb58bf@riseup.net">
      <meta http-equiv="content-type" content="text/html; charset=UTF-8">
      <p>Hi</p>
      <p>Ricardo, you mentioned that this needs to be fixed.</p>
      <p>I made a patch to fix this. I did not test the patch as I have
        no idea how to do that.</p>
      <p>I have not run the indent script on it.<br>
      </p>
      <p>Se attachment<br>
      </p>
      <div class="moz-forward-container"><br>
        -------- Forwarded Message --------
        <table class="moz-email-headers-table" cellspacing="0"
          cellpadding="0" border="0">
          <tbody>
            <tr>
              <th valign="BASELINE" nowrap="nowrap" align="RIGHT">Subject:
              </th>
              <td>Re: GuixSD system reconfigure error</td>
            </tr>
            <tr>
              <th valign="BASELINE" nowrap="nowrap" align="RIGHT">Date:
              </th>
              <td>Thu, 30 Aug 2018 17:22:53 +0200</td>
            </tr>
            <tr>
              <th valign="BASELINE" nowrap="nowrap" align="RIGHT">From:
              </th>
              <td>Ricardo Wurmus <a class="moz-txt-link-rfc2396E"
                  href="mailto:rekado@elephly.net"
                  moz-do-not-send="true">&lt;rekado@elephly.net&gt;</a></td>
            </tr>
            <tr>
              <th valign="BASELINE" nowrap="nowrap" align="RIGHT">To: </th>
              <td>Hebi Li <a class="moz-txt-link-rfc2396E"
                  href="mailto:lihebi.com@gmail.com"
                  moz-do-not-send="true">&lt;lihebi.com@gmail.com&gt;</a></td>
            </tr>
            <tr>
              <th valign="BASELINE" nowrap="nowrap" align="RIGHT">CC: </th>
              <td><a class="moz-txt-link-abbreviated"
                  href="mailto:help-guix@gnu.org" moz-do-not-send="true">help-guix@gnu.org</a></td>
            </tr>
          </tbody>
        </table>
        <br>
        <br>
        <br>
        Hi,<br>
        <br>
        <blockquote type="cite">
          <pre class="moz-quote-pre" wrap="">    <a class="moz-txt-link-freetext" href="https://github.com/lihebi/dothebi/blob/master/config.scm" moz-do-not-send="true">https://github.com/lihebi/dothebi/blob/master/config.scm</a>
</pre>
        </blockquote>
        <br>
        I see you use the “shpchp” kernel module. This no longer exists
        in the<br>
        latest version of the kernel Linux. That’s what this really bad
        error<br>
        message tries to tell you:<br>
        <br>
        <blockquote type="cite">
          <pre class="moz-quote-pre" wrap="">Backtrace:
           8 (primitive-load "/gnu/store/vz7ci9rh483f2zps2cl174rd91b?")
In ice-9/eval.scm:
    619:8  7 (_ #f)
   626:19  6 (_ #&lt;directory (guile-user) 7cf140&gt;)
    159:9  5 (_ _)
In gnu/build/linux-modules.scm:
   184:47  4 (recursive-module-dependencies _ #:lookup-module _)
    98:14  3 (module-dependencies _)
    85:18  2 (modinfo-section-contents _)
In ice-9/ports.scm:
   439:11  1 (call-with-input-file #f #&lt;procedure get-bytevector-al?&gt; ?)
In unknown file:
           0 (open-file #f "r" #:encoding #f #:guess-encoding #f)

ERROR: In procedure open-file:
Wrong type (expecting string): #f
builder for `/gnu/store/0ahsvp7wx52zzh1rywbdbq78llcwb7id-linux-modules.drv' failed with exit code 1
</pre>
        </blockquote>
        <br>
        (I only know this because I had the same problem.) Obviously,
        this<br>
        error message should be changed.<br>
        <br>
        As a workaround you could switch to the LTS kernel where that
        module<br>
        still exists.<br>
        <br>
        --<br>
        Ricardo<br>
        <br>
        <br>
      </div>
    </blockquote>
    <pre class="moz-signature" cols="72">-- 
Cheers
Swedebugia</pre>
  </body>
</html>

--------------2092B0EBC8F6EEF47AEB8061--

--------------8567A496F7E0F493822FE6A8
Content-Type: text/x-patch;
 name="0001-V2-gnu-Check-for-linux-module-shpchp-and-tell-user-t.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
 filename*0="0001-V2-gnu-Check-for-linux-module-shpchp-and-tell-user-t.pa";
 filename*1="tch"

>From 4d70dda8c2f119fc6ff9d221eae6f060ff1fcd98 Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Fri, 9 Nov 2018 22:52:12 +0100
Subject: [PATCH] [V2] gnu: Check for linux-module shpchp and tell user to
 remove it.

 * gnu/system/mapped-devices.scm (check-device-initrd-modules): New if
 statement raising a condition if shpchp is found.
---
 gnu/packages/cran.go.3Q3wbP   |  0
 gnu/system/mapped-devices.scm | 28 +++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/cran.go.3Q3wbP

diff --git a/gnu/packages/cran.go.3Q3wbP b/gnu/packages/cran.go.3Q3wbP
new file mode 100644
index 000000000..e69de29bb
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index a87466646..483f952c6 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2018 swedebugia <swedebugia@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -142,13 +143,22 @@ DEVICE must be a \"/dev\" file name."
         ;; "usb_storage"), not file names (e.g., "usb-storage.ko").  This is
         ;; OK because we have machinery that accepts both the hyphen and the
         ;; underscore version.
-        (raise (condition
-                (&message
-                 (message (format #f (G_ "you may need these modules \
+        (if (eqv? (missing 'shpchp))
+                 ;; Tell user to remove shpchp from config.scm
+                 ;; True
+                 (raise (condition
+                         (&message
+                          (message (format #f (G_ "shpchp is no longer \
+needed because it has been included in linux-libre. Please remove it from \
+your config.scm to continue"))))))
+                 ;; Else
+                 (raise (condition
+                         (&message
+                          (message (format #f (G_ "you may need these modules \
 in the initrd for ~a:~{ ~a~}")
-                                  device missing)))
-                (&fix-hint
-                 (hint (format #f (G_ "Try adding them to the
+                                           device missing)))
+                         (&fix-hint
+                          (hint (format #f (G_ "Try adding them to the
 @code{initrd-modules} field of your @code{operating-system} declaration, along
 these lines:
 
@@ -161,9 +171,9 @@ these lines:
 
 If you think this diagnostic is inaccurate, use the @option{--skip-checks}
 option of @command{guix system}.\n")
-                               missing)))
-                (&error-location
-                 (location (source-properties->location location)))))))))
+                                        missing)))
+                         (&error-location
+                          (location (source-properties->location location))))))))))
 
 
 ;;;
-- 
2.18.0


--------------8567A496F7E0F493822FE6A8--