From patchwork Sat Jul 4 18:54:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 23055 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 199A027BBE3; Sat, 4 Jul 2020 19:55:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1EE6027BBE1 for ; Sat, 4 Jul 2020 19:55:24 +0100 (BST) Received: from localhost ([::1]:47884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnJr-00076V-MZ for patchwork@mira.cbaines.net; Sat, 04 Jul 2020 14:55:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrnJY-0006b2-0K for guix-patches@gnu.org; Sat, 04 Jul 2020 14:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrnJX-0006qP-NW for guix-patches@gnu.org; Sat, 04 Jul 2020 14:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jrnJX-0005HS-N9 for guix-patches@gnu.org; Sat, 04 Jul 2020 14:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42193] [WIP 2/6] services: Add 'kernel-profile-service-type'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Jul 2020 18:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42193 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42193@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159388888520231 (code B ref -1); Sat, 04 Jul 2020 18:55:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2020 18:54:45 +0000 Received: from localhost ([127.0.0.1]:59629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrnJE-0005G8-W5 for submit@debbugs.gnu.org; Sat, 04 Jul 2020 14:54:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:45502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrnJC-0005FM-5d for submit@debbugs.gnu.org; Sat, 04 Jul 2020 14:54:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrnJB-0006TM-Tq for guix-patches@gnu.org; Sat, 04 Jul 2020 14:54:41 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:43355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrnJ9-0006nH-5b for guix-patches@gnu.org; Sat, 04 Jul 2020 14:54:41 -0400 X-Originating-IP: 176.181.186.101 Received: from localhost (i15-les02-ntr-176-181-186-101.sfr.lns.abo.bbox.fr [176.181.186.101]) (Authenticated sender: brice@waegenei.re) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 0178A20002 for ; Sat, 4 Jul 2020 18:54:36 +0000 (UTC) From: Brice Waegeneire Date: Sat, 4 Jul 2020 20:54:27 +0200 Message-Id: <20200704185431.13739-3-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200704185234.12571-1-brice@waegenei.re> References: <20200704185234.12571-1-brice@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.200; envelope-from=brice@waegenei.re; helo=relay7-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 14:54:37 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/system.scm (operating-system-default-essential-services): Use 'kernel-profile-service-type'. (operating-system-default-essential-services): Remove kernel profile. (package-for-kernel): Move it to … * gnu/services.scm (package-for-kernel): … here. (kernel-profile-configuration, kernel-profile-configuration->profile-entry, kernel-profile-service-type): New variables. * gnu/tests/linux-modules.scm (run-loadable-kernel-modules-test): Test 'kernel-profile-service-type'. --- gnu/services.scm | 66 ++++++++++++++++++++++++++++++++++++- gnu/system.scm | 14 +++----- gnu/tests/linux-modules.scm | 10 +++--- 3 files changed, 75 insertions(+), 15 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index f6dc56d940..b5ec222207 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,9 +31,11 @@ #:use-module (guix describe) #:use-module (guix sets) #:use-module (guix ui) - #:use-module ((guix utils) #:select (source-properties->location)) + #:use-module ((guix utils) #:select (source-properties->location + substitute-keyword-arguments)) #:autoload (guix openpgp) (openpgp-format-fingerprint) #:use-module (guix modules) + #:use-module (guix packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages hurd) @@ -105,6 +108,12 @@ firmware-service-type gc-root-service-type + kernel-profile-configuration + kernel-profile-configuration? + kernel-profile-configuration-kernel + kernel-profile-configuration-packages + kernel-profile-service-type + %boot-service %activation-service etc-service)) @@ -474,6 +483,61 @@ channels in use and CONFIG-FILE, if it is true." itself: the channels used when building the system, and its configuration file, when available."))) + +;;; +;;; Kernel profile. +;;; + +(define-record-type* + kernel-profile-configuration make-kernel-profile-configuration + kernel-profile-configuration? + (kernel kernel-profile-configuration-kernel) ; + (packages kernel-profile-configuration-packages ; list of + (default '()))) + +(define (package-for-kernel target-kernel module-package) + "Return a package like MODULE-PACKAGE, adapted for TARGET-KERNEL, if +possible (that is if there's a LINUX keyword argument in the build system)." + (package + (inherit module-package) + (arguments + (substitute-keyword-arguments (package-arguments module-package) + ((#:linux kernel #f) + target-kernel))))) + +(define (kernel-profile-configuration->profile-entry config) + "Return a system entry for the kernel profile CONFIG." + (let* ((kernel (kernel-profile-configuration-kernel config)) + (packages (map (lambda (package) + (if (package? package) + (package-for-kernel kernel + package) + package)) + (kernel-profile-configuration-packages config)))) + (with-monad %store-monad + (return `(("kernel" + ,(profile + (content (packages->manifest + (cons kernel + (delete-duplicates packages eq?)))) + (hooks (list linux-module-database))))))))) + +(define kernel-profile-service-type + (service-type (name 'kernel-profile) + (description "This is the @dfn{kernel profile}, available as +@file{/run/current-system/kernel}.") + (extensions + (list (service-extension + system-service-type + kernel-profile-configuration->profile-entry))) + (compose concatenate) + (extend (lambda (config additional-packages) + (match-record config + (kernel packages) + (kernel-profile-configuration + (kernel kernel) ;the kernel package to use + (packages (append packages additional-packages)))))))) + ;;; ;;; Cleanup. diff --git a/gnu/system.scm b/gnu/system.scm index bfbcb6fbdd..ff374dddda 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -511,16 +511,6 @@ OS." (file-append (operating-system-kernel os) "/" (system-linux-image-file-name)))) -(define (package-for-kernel target-kernel module-package) - "Return a package like MODULE-PACKAGE, adapted for TARGET-KERNEL, if -possible (that is if there's a LINUX keyword argument in the build system)." - (package - (inherit module-package) - (arguments - (substitute-keyword-arguments (package-arguments module-package) - ((#:linux kernel #f) - target-kernel))))) - (define %default-modprobe-blacklist ;; List of kernel modules to blacklist by default. '("usbmouse" ;races with bcm5974, see @@ -574,6 +564,10 @@ bookkeeping." (host-name (host-name-service (operating-system-host-name os))) (entries (operating-system-directory-base-entries os))) (cons* (service system-service-type entries) + (service kernel-profile-service-type + (kernel-profile-configuration + (kernel (operating-system-kernel os)) + (packages (operating-system-kernel-loadable-modules os)))) %boot-service ;; %SHEPHERD-ROOT-SERVICE must come last so that the gexp that diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm index 953b132ef7..22e9a0c65c 100644 --- a/gnu/tests/linux-modules.scm +++ b/gnu/tests/linux-modules.scm @@ -73,10 +73,12 @@ are loaded in memory." (marionette-operating-system (operating-system (inherit (simple-operating-system)) - (services (cons (service kernel-module-loader-service-type module-names) - (operating-system-user-services - (simple-operating-system)))) - (kernel-loadable-modules module-packages)) + (services (cons* (service kernel-module-loader-service-type module-names) + (simple-service 'kernel-module-packages + kernel-profile-service-type + module-packages) + (operating-system-user-services + (simple-operating-system))))) #:imported-modules '((guix combinators)))) (define vm (virtual-machine os)) (define (test script)