emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#41924: closed ([PATCH] profiles: Make linux-module-database skip ina


From: GNU bug Tracking System
Subject: bug#41924: closed ([PATCH] profiles: Make linux-module-database skip inappropriate inputs)
Date: Fri, 19 Jun 2020 20:28:01 +0000

Your message dated Fri, 19 Jun 2020 22:27:08 +0200
with message-id <87o8peg5sz.fsf@gnu.org>
and subject line Re: [bug#41924] [PATCH] profiles: Make linux-module-database 
skip inappropriate inputs
has caused the debbugs.gnu.org bug report #41924,
regarding [PATCH] profiles: Make linux-module-database skip inappropriate inputs
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
41924: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41924
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [PATCH] profiles: Make linux-module-database skip inappropriate inputs Date: Wed, 17 Jun 2020 21:44:35 +0300
This allows a Linux package with CONFIG_MODULES=n, that doesn’t contain the 
‘lib/modules’ directory, to be used.

* guix/profiles.scm (linux-module-database): Add if clause to ignore unrelated 
inputs. Allow empty result.
---
 guix/profiles.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 25ff146bdf..a3868e8343 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1220,9 +1220,11 @@ This is meant to be used as a profile hook."
                        inputs))
                  (directory-entries
                   (lambda (directory)
-                    (scandir directory (lambda (basename)
-                                         (not
-                                           (string-prefix? "." basename))))))
+                    (if (file-exists? directory)
+                        (scandir directory (lambda (basename)
+                                             (not
+                                              (string-prefix? "." basename))))
+                        '())))
                  ;; Note: Should usually result in one entry.
                  (versions (delete-duplicates
                             (append-map directory-entries
@@ -1233,6 +1235,8 @@ This is meant to be used as a profile hook."
                   (setenv "PATH" #+(file-append kmod "/bin"))
                   (make-linux-module-directory inputs version #$output)
                   (setenv "PATH" old-path)))
+               ;; Do nothing when there is nothing to do
+               (() (mkdir #$output))
                (_ (error "Specified Linux kernel and Linux kernel modules
 are not all of the same version")))))))
   (gexp->derivation "linux-module-database" build
-- 
2.26.2





--- End Message ---
--- Begin Message --- Subject: Re: [bug#41924] [PATCH] profiles: Make linux-module-database skip inappropriate inputs Date: Fri, 19 Jun 2020 22:27:08 +0200 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
Hi,

Ivan Kozlov <kanichos@yandex.ru> skribis:

> Thanks, I’m happy enough with this.

Cool, closing.  Thank you.

Ludo’.


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]