| Message ID | 290b28ec-cd1e-e5e8-275e-133771c7d4f3@riseup.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#33329] gnu: Deprecate linux-module shpchp and tell user to remove it. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | success | Successfully applied |
| cbaines/applying patch | success | Successfully applied |
Hello, swedebugia <swedebugia@riseup.net> skribis: > 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. I don’t think we should hard-code things like this: they would accumulate over the years and become unmanageable. If anything, what should be improved IMO is the error message you get when specifying a module that is unavailable. That’s not easily done though since that happens at build time. Thoughts? Ludo’.
Ludovic Courtès writes: > If anything, what should be improved IMO is the error message you get > when specifying a module that is unavailable. That’s not easily done > though since that happens at build time. I think Ludo is correct in this, an error message seems to be the only option we have to ensure that maintainability and reproducibility are respected. To add onto that, I was thinking that maybe it could be part of the configuration process that we could modify to ensure that all of the specified modules that are needed are available else it throws an error? Brett Gilio
On 2018-11-11 01:15, Brett Gilio wrote: > > Ludovic Courtès writes: > >> If anything, what should be improved IMO is the error message you get >> when specifying a module that is unavailable. That’s not easily done >> though since that happens at build time. > > I think Ludo is correct in this, an error message seems to be the only > option we have to ensure that maintainability and reproducibility are > respected. To add onto that, I was thinking that maybe it could be part > of the configuration process that we could modify to ensure that all of > the specified modules that are needed are available else it throws an > error? Ok. Would my patch have worked anyway? So where would that error message be produced? In gnu/build/linux-modules? load-linux-modules?
Brett Gilio <brettg@posteo.net> skribis: > Ludovic Courtès writes: > >> If anything, what should be improved IMO is the error message you get >> when specifying a module that is unavailable. That’s not easily done >> though since that happens at build time. > > I think Ludo is correct in this, an error message seems to be the only > option we have to ensure that maintainability and reproducibility are > respected. To add onto that, I was thinking that maybe it could be part > of the configuration process that we could modify to ensure that all of > the specified modules that are needed are available else it throws an > error? That already happens, but the check cannot be 100% accurate because it relies on information from the currently running kernel, which is why there’s the ‘--skip-checks’ option. Ludo’.
swedebugia <swedebugia@riseup.net> skribis: > On 2018-11-11 01:15, Brett Gilio wrote: >> >> Ludovic Courtès writes: >> >>> If anything, what should be improved IMO is the error message you get >>> when specifying a module that is unavailable. That’s not easily done >>> though since that happens at build time. >> >> I think Ludo is correct in this, an error message seems to be the only >> option we have to ensure that maintainability and reproducibility are >> respected. To add onto that, I was thinking that maybe it could be part >> of the configuration process that we could modify to ensure that all of >> the specified modules that are needed are available else it throws an >> error? > > Ok. Would my patch have worked anyway? I spotted a typo: (eqv? (missing 'shpchp)) is wrong because ‘eqv?’ should take two arguments and ‘missing’ is not a procedure. Apart from this the patch could have worked I guess. > So where would that error message be produced? > In gnu/build/linux-modules? load-linux-modules? An error message is produced while building the initrd; see commit 4db7a9dc663c5b26e45ec35538bf68ff87acdf7b. For now, what about closing this issue and opening a new one when we have an idea on how to improve on this? Thanks, Ludo’.
On 2018-11-11 12:32, Ludovic Courtès wrote: >> swedebugia <swedebugia@riseup.net> skribis: snip >> Ok. Would my patch have worked anyway? > > I spotted a typo: (eqv? (missing 'shpchp)) is wrong because ‘eqv?’ > should take two arguments and ‘missing’ is not a procedure. Ok. Thanks for taking your time. > > Apart from this the patch could have worked I guess. > >> So where would that error message be produced? >> In gnu/build/linux-modules? load-linux-modules? > > An error message is produced while building the initrd; see commit > 4db7a9dc663c5b26e45ec35538bf68ff87acdf7b. Good, I had not seen that. > > For now, what about closing this issue and opening a new one when we > have an idea on how to improve on this? Fine with me :)
swedebugia <swedebugia@riseup.net> skribis: > On 2018-11-11 12:32, Ludovic Courtès wrote: [...] >>> So where would that error message be produced? >>> In gnu/build/linux-modules? load-linux-modules? >> >> An error message is produced while building the initrd; see commit >> 4db7a9dc663c5b26e45ec35538bf68ff87acdf7b. > > Good, I had not seen that. > >> >> For now, what about closing this issue and opening a new one when we >> have an idea on how to improve on this? > > Fine with me :) Alright, done! Ludo’.
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