From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmzyo-0008AO-Oi for guix-patches@gnu.org; Fri, 25 Jan 2019 06:49:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmzyn-0003zG-WA for guix-patches@gnu.org; Fri, 25 Jan 2019 06:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmzyn-0003xy-S0 for guix-patches@gnu.org; Fri, 25 Jan 2019 06:49:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gmzyn-0003ax-KJ for guix-patches@gnu.org; Fri, 25 Jan 2019 06:49:01 -0500 Subject: [bug#34195] [PATCH v2] linux-modules: Add modules-soft-dependencies. Resent-Message-ID: From: Danny Milosavljevic Date: Fri, 25 Jan 2019 12:48:38 +0100 Message-Id: <20190125114838.8680-1-dannym@scratchpost.org> In-Reply-To: <20190125113032.8372-1-dannym@scratchpost.org> References: <20190125113032.8372-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34195@debbugs.gnu.org, ludo@gnu.org * gnu/build/linux-modules.scm (not-softdep-whitespace): New variable. (module-soft-dependencies): New procedure. --- gnu/build/linux-modules.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index 2d8117504..1632f20d5 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -33,6 +33,7 @@ ensure-dot-ko module-aliases module-dependencies + module-soft-dependencies normalize-module-name file-name->module-name find-module-file @@ -100,6 +101,37 @@ contains module names, not actual file names." (('depends . what) (string-tokenize what %not-comma))))) +(define not-softdep-whitespace + (char-set-complement (char-set #\space #\tab))) + +(define (module-soft-dependencies file) + "Return a list of (cons mode soft-dependency) of module FILE." + ;; TEXT: "pre: baz blubb foo post: bax bar" + (define (parse-softdep text) + (let loop ((value '()) + (tokens (string-tokenize text not-softdep-whitespace)) + (section #f)) + (match tokens + ((token _ ...) + (if (string=? (string-take-right token 1) ":") ; section + (loop value + (cdr tokens) + (string-trim-both token)) + (loop (cons (cons section token) value) + (cdr tokens) + section))) + (() + value)))) + + ;; Note: Multiple 'softdep sections are allowed. + (let ((info (modinfo-section-contents file))) + (apply append + (filter-map (match-lambda + (('softdep . value) + (parse-softdep value)) + (_ #f)) + (modinfo-section-contents file))))) + (define (module-aliases file) "Return the list of aliases of module FILE." (let ((info (modinfo-section-contents file)))