From patchwork Sat Nov 10 12:03:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: swedebugia X-Patchwork-Id: 160 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D07A167ED; Sat, 10 Nov 2018 12:04:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 572C716789 for ; Sat, 10 Nov 2018 12:04:10 +0000 (GMT) Received: from localhost ([::1]:38024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLRzl-0001bT-74 for patchwork@mira.cbaines.net; Sat, 10 Nov 2018 07:04:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ) id 1gLRze-00013y-1I for guix-patches@gnu.org; Sat, 10 Nov 2018 07:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33329] [PATCH] gnu: Deprecate linux-module shpchp and tell user to remove it. Resent-From: swedebugia Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Nov 2018 12:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33329@debbugs.gnu.org, rekado@elephly.net Received: via spool by 33329-submit@debbugs.gnu.org id=B33329.15418514224061 (code B ref 33329); Sat, 10 Nov 2018 12:04:01 +0000 Received: (at 33329) by debbugs.gnu.org; 10 Nov 2018 12:03:42 +0000 Received: from localhost ([127.0.0.1]:44220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLRzI-00013Q-OH for submit@debbugs.gnu.org; Sat, 10 Nov 2018 07:03:42 -0500 Received: from mx1.riseup.net ([198.252.153.129]:37409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLRzD-00013D-54 for 33329@debbugs.gnu.org; Sat, 10 Nov 2018 07:03:38 -0500 Received: from cotinga.riseup.net (cotinga-pn.riseup.net [10.0.1.164]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 4A60F1A0490; Sat, 10 Nov 2018 04:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1541851414; bh=1Avds+Ok/ZTLmSzZxUT0NnM7r0vdpl+OwxsubpHmmKQ=; h=Subject:From:To:References:Date:In-Reply-To:From; b=mRK+vrARfZHr8lvrPqE/gmg5na9dzAfJG8qMO4MUf6a/SiN0VN+MFEQUQJGba9t3K ZA5P0xMZylz/WH9JcJ1yQ5yZNHQgfGRv7hPIKhLAdCLi53IaKk8HenCWGQ0Yq7wiEG WLO8iyZgjpd2hkCcEwPzglgp8Zfq9iJMpfFjKcM4= X-Riseup-User-ID: 59B581F72D0FE3A4F04B972EF154F52DCD6F31BF7575E78804A90A5C3388931A Received: from [127.0.0.1] (localhost [127.0.0.1]) by cotinga.riseup.net with ESMTPSA id 437CC102508; Sat, 10 Nov 2018 04:03:33 -0800 (PST) From: swedebugia 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-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 > To: Hebi Li > 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 (_ #) >> 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 # ?) >> 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 > > From 4d70dda8c2f119fc6ff9d221eae6f060ff1fcd98 Mon Sep 17 00:00:00 2001 From: swedebugia 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 ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017, 2018 Mark H Weaver +;;; Copyright © 2018 swedebugia ;;; ;;; 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