From 52319edcc41e496bf8952ff9ad17b3e00f428c39 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Wed, 30 Nov 2022 02:09:18 +0000 Subject: gnu: rasdaemon: Add perl to inputs. Required for ras-mc-ctl. * gnu/packages/linux.scm (rasdaemon)[inputs]: Add perl for ras-mc-ctl. Signed-off-by: Maxim Cournoyer --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c417fb600..50cf227ea0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9444,7 +9444,7 @@ provides user-space tools for creating EROFS file systems.") (sha256 (base32 "0r0339mg4rc12p63iiq2kwdqn1zjakyiv014i2a2l9s8v5rjik41")))) (native-inputs (list autoconf automake libtool)) - (inputs (list sqlite)) + (inputs (list perl sqlite)) (arguments `(#:configure-flags (list "--enable-all" -- cgit v1.3 From 248b40cd2d0aec1224352fb13f746f4546979edd Mon Sep 17 00:00:00 2001 From: Demis Balbach Date: Mon, 28 Nov 2022 23:17:58 +0100 Subject: gnu: Add tuxedo-keyboard. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (tuxedo-keyboard): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 50cf227ea0..49e90a9ba6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -68,6 +68,7 @@ ;;; Copyright © 2022 Hunter Jozwiak ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Stefan +;;; Copyright © 2022 Demis Balbach ;;; ;;; This file is part of GNU Guix. ;;; @@ -1531,6 +1532,33 @@ battery charging thresholds, keyboard backlight, fans and thermal monitors, and the notification, WiFi, and Bluetooth LED.") (license license:gpl2))) +(define-public tuxedo-keyboard + (package + (name "tuxedo-keyboard") + (version "3.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tuxedocomputers/tuxedo-keyboard.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17n14yh55yrxx4qbx4ph9drbzx2ll4kdsfmlngrdgizhyzk7z7zv")))) + (build-system linux-module-build-system) + (arguments + (list #:tests? #f)) ; no test suite + (home-page "https://github.com/tuxedocomputers/tuxedo-keyboard") + (synopsis "Linux kernel modules to control keyboard on most Tuxedo computers") + (description + "This package provides the @code{tuxedo_keyboard}, @code{tuxedo_io}, +@code{clevo_wmi} @acronym{WMI, Windows Management Engine} and the +@code{clevo_acpi} @acronym{ACPI, Advanced Configuration and Power Interface} +kernel modules to control the keyboard on most Tuxedo computers. Only white +backlight only models are currently not supported. The @code{tuxedo_io} module +is also needed for the @code{tuxedo-control-center} (short tcc) package.") + (license license:gpl3+))) + (define-public ec (package (name "ec") -- cgit v1.3 From f57fbc2fb1b20823f433781d08047df5d7bc31df Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 3 Dec 2022 20:57:24 -0500 Subject: gnu: linux-libre: Move documentation to a separate package. * gnu/packages/linux.scm (linux-libre-5.15-source) (linux-libre-5.10-source): Do not apply linux-libre-infodocs-target.patch. (make-linux-libre): Remove BUILD-DOC? argument, and adjust patches conditional. (make-linux-libre*): Likewise. Remove build-doc? validation. [arguments]: Move documentation related phases to the new linux-libre-documentation. [native-inputs]: Move the documentation related native inputs to linux-libre-documentation. (linux-libre-documentation): New variable. * guix/build-system/linux-module.scm (make-linux-module-builder) [arguments]: Do not delete build-doc and install-doc phases, which no longer exist for linux-libre. --- gnu/packages/linux.scm | 81 ++++++++++++++++++++------------------ guix/build-system/linux-module.scm | 2 - 2 files changed, 42 insertions(+), 41 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 49e90a9ba6..18e9016806 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -524,14 +524,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.15-source (source-with-patches linux-libre-5.15-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch "linux-libre-infodocs-target.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch "linux-libre-infodocs-target.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source @@ -799,10 +797,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (configuration-file #f) (defconfig "defconfig") (extra-options %default-extra-linux-options) - (build-doc? (doc-supported? version)) (patches `(,%boot-logo-patch - ,@(if build-doc? + ,@(if (doc-supported? version) (list (search-patch "linux-libre-infodocs-target.patch")) '())))) @@ -816,8 +813,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #:extra-version extra-version #:configuration-file configuration-file #:defconfig defconfig - #:extra-options extra-options - #:build-doc? build-doc?)) + #:extra-options extra-options)) (define* (make-linux-libre* version gnu-revision source supported-systems #:key @@ -826,10 +822,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ;; See kernel-config for an example. (configuration-file #f) (defconfig "defconfig") - (extra-options %default-extra-linux-options) - (build-doc? (doc-supported? version))) - (when (and build-doc? (not (doc-supported? version))) - (error "unsupported 'build-doc?' for kernels <5.10")) + (extra-options %default-extra-linux-options)) (package (name (if extra-version (string-append "linux-libre-" extra-version) @@ -854,20 +847,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")))) - #$@(if build-doc? - #~((add-before 'configure 'build-doc - (lambda _ - (substitute* "Documentation/Makefile" - ;; Remove problematic environment check script. - ((".*scripts/sphinx-pre-install.*") "")) - (invoke "make" "infodocs"))) - (add-after 'build-doc 'install-doc - (lambda _ - (with-directory-excursion "Documentation/output" - (invoke "make" "-C" "texinfo" "install-info" - (string-append "infodir=" #$output - "/share/info")))))) - #~()) (add-before 'configure 'set-environment (lambda* (#:key target #:allow-other-keys) ;; Avoid introducing timestamps. @@ -967,19 +946,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("gmp" ,gmp) ("mpfr" ,mpfr) ("mpc" ,mpc) - - ;; For generating the documentation. - ,@(if build-doc? - ;; TODO: remove fontconfig after the 5.10 kernel is dropped. - ;; Also replace python-wrapper by python at that time. - `(("fontconfig" ,fontconfig) - ("graphviz" ,graphviz) - ("python" ,python-wrapper) - ("python-sphinx" ,python-sphinx) - ("texinfo" ,texinfo) - ("which" ,which)) - '()) - ,@(match (let ((arch (platform-linux-architecture (lookup-platform-by-target-or-system (or (%current-target-system) @@ -1018,6 +984,43 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") (define-public linux-libre-source linux-libre-6.0-source) (define-public linux-libre linux-libre-6.0) +(define-public linux-libre-documentation + (package + (inherit linux-libre) + (name "linux-libre-documentation") + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (substitute* "Documentation/Makefile" + ;; Remove problematic environment check script. + ((".*scripts/sphinx-pre-install.*") "")) + (invoke "make" "infodocs"))) + (replace 'install + (lambda _ + (let* ((info-dir (string-append #$output "/share/info")) + (info (string-append info-dir + "/TheLinuxKernel.info.gz"))) + (with-directory-excursion "Documentation/output" + (invoke "make" "-C" "texinfo" "install-info" + (string-append "infodir=" info-dir))) + ;; Create a symlink, for convenience. + (symlink info (string-append info-dir + "/linux.info.gz")))))))) + (native-inputs + (list graphviz + perl + python + python-sphinx + texinfo + which)) + (synopsis "Documentation for the kernel Linux-Libre") + (description "This package provides the documentation for the kernel +Linux-Libre, as an Info manual. To consult it, run @samp{info linux}."))) + (define-public linux-libre-5.15 (make-linux-libre* linux-libre-5.15-version linux-libre-5.15-gnu-revision diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index c1ddeaea10..e46195b53c 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -67,8 +67,6 @@ (lambda _ (invoke "make" "modules_prepare"))) (delete 'strip) ;faster - (delete 'build-doc) ;costly and not useful here - (delete 'install-doc) (replace 'install (lambda* (#:key inputs #:allow-other-keys) (let ((out-lib-build (string-append #$output "/lib/modules/build"))) -- cgit v1.3 From 1e05b4a7fd862f7abafb745d52d89e0f20f0c1ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 7 Dec 2022 00:33:46 -0500 Subject: gnu: linux: Move customization procedures near the top. This makes it possible to use them to define Linux kernel variants in the same file. * gnu/packages/linux.scm (customize-linux), make-defconfig): Move near the top of the module. --- gnu/packages/linux.scm | 211 +++++++++++++++++++++++++------------------------ 1 file changed, 106 insertions(+), 105 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 18e9016806..8d86ec67e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -195,6 +195,112 @@ #:export (customize-linux make-defconfig)) + + +;;; +;;; Linux kernel customization functions. +;;; + +(define* (customize-linux #:key name + (linux linux-libre) + source + defconfig + (configs "") + extra-version) + "Make a customized Linux package NAME derived from the LINUX package. + +If NAME is not given, then it defaults to the same name as the LINUX package. + +Unless SOURCE is given the source of LINUX is used. + +A DEFCONFIG file to be used can be given as an origin, as a file-like object +(file-append, local-file etc.), or as a string with the name of a defconfig file +available in the Linux sources. If DEFCONFIG is not given, then a defconfig +file will be saved from the LINUX package configuration. + +Additional CONFIGS will be used to modify the given or saved defconfig, which +will finally be used to build Linux. + +CONFIGS can be a list of strings, with one configuration per line. The usual +defconfig syntax has to be used, but there is a special extension to ease the +removal of configurations. Comment lines are supported as well. + +Here is an example: + + '(;; This string defines the version tail in 'uname -r'. + \"CONFIG_LOCALVERSION=\\\"-handcrafted\\\" + ;; This '# CONFIG_... is not set' syntax has to match exactly! + \"# CONFIG_BOOT_CONFIG is not set\" + \"CONFIG_NFS_SWAP=y\" + ;; This is a multiline configuration: + \"CONFIG_E1000=y +# This is a comment, below follows an extension to unset a configuration: +CONFIG_CMDLINE_EXTEND\") + +A string of configurations instead of a list of configuration strings is also +possible. + +EXTRA-VERSION can be a string overwriting the EXTRAVERSION setting of the LINUX +package, after being prepended by a hyphen. It will be visible in the output +of 'uname -r' behind the Linux version numbers." + (package + (inherit linux) + (name (or name (package-name linux))) + (source (or source (package-source linux))) + (arguments + (substitute-keyword-arguments + (package-arguments linux) + ((#:imported-modules imported-modules %gnu-build-system-modules) + `((guix build kconfig) ,@imported-modules)) + ((#:modules modules) + `((guix build kconfig) ,@modules)) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest arguments) + (setenv "EXTRAVERSION" + #$(and extra-version + (not (string-null? extra-version)) + (string-append "-" extra-version))) + (let* ((configs + (string-append "arch/" #$(linux-srcarch) "/configs/")) + (guix_defconfig + (string-append configs "guix_defconfig"))) + #$(cond + ((not defconfig) + #~(begin + ;; Call the original 'configure phase. + (apply (assoc-ref #$phases 'configure) arguments) + ;; Save a defconfig file. + (invoke "make" "savedefconfig") + ;; Move the saved defconfig to the proper location. + (rename-file "defconfig" + guix_defconfig))) + ((string? defconfig) + ;; Use another existing defconfig from the Linux sources. + #~(rename-file (string-append configs #$defconfig) + guix_defconfig)) + (else + ;; Copy the defconfig input to the proper location. + #~(copy-file (assoc-ref inputs "guix_defconfig") + guix_defconfig))) + (chmod guix_defconfig #o644) + (modify-defconfig guix_defconfig '#$configs) + (invoke "make" "guix_defconfig") + (verify-config ".config" guix_defconfig)))))))) + (native-inputs + (append (if (or (not defconfig) + (string? defconfig)) + '() + ;; The defconfig should be an origin or file-like object. + `(("guix_defconfig" ,defconfig))) + (package-native-inputs linux))))) + +(define (make-defconfig uri sha256-as-base32) + (origin (method url-fetch) + (uri uri) + (sha256 (base32 sha256-as-base32)))) + (define (linux-srcarch) "Return the linux SRCARCH name, which is set in the toplevel Makefile of Linux and denotes the architecture-specific directory name below arch/ in its @@ -1264,111 +1370,6 @@ Linux-Libre, as an Info manual. To consult it, run @samp{info linux}."))) (inputs (modify-inputs (package-inputs base-linux-libre) (prepend cpio)))))) - -;;; -;;; Linux kernel customization functions. -;;; - -(define* (customize-linux #:key name - (linux linux-libre) - source - defconfig - (configs "") - extra-version) - "Make a customized Linux package NAME derived from the LINUX package. - -If NAME is not given, then it defaults to the same name as the LINUX package. - -Unless SOURCE is given the source of LINUX is used. - -A DEFCONFIG file to be used can be given as an origin, as a file-like object -(file-append, local-file etc.), or as a string with the name of a defconfig file -available in the Linux sources. If DEFCONFIG is not given, then a defconfig -file will be saved from the LINUX package configuration. - -Additional CONFIGS will be used to modify the given or saved defconfig, which -will finally be used to build Linux. - -CONFIGS can be a list of strings, with one configuration per line. The usual -defconfig syntax has to be used, but there is a special extension to ease the -removal of configurations. Comment lines are supported as well. - -Here is an example: - - '(;; This string defines the version tail in 'uname -r'. - \"CONFIG_LOCALVERSION=\\\"-handcrafted\\\" - ;; This '# CONFIG_... is not set' syntax has to match exactly! - \"# CONFIG_BOOT_CONFIG is not set\" - \"CONFIG_NFS_SWAP=y\" - ;; This is a multiline configuration: - \"CONFIG_E1000=y -# This is a comment, below follows an extension to unset a configuration: -CONFIG_CMDLINE_EXTEND\") - -A string of configurations instead of a list of configuration strings is also -possible. - -EXTRA-VERSION can be a string overwriting the EXTRAVERSION setting of the LINUX -package, after being prepended by a hyphen. It will be visible in the output -of 'uname -r' behind the Linux version numbers." - (package - (inherit linux) - (name (or name (package-name linux))) - (source (or source (package-source linux))) - (arguments - (substitute-keyword-arguments - (package-arguments linux) - ((#:imported-modules imported-modules %gnu-build-system-modules) - `((guix build kconfig) ,@imported-modules)) - ((#:modules modules) - `((guix build kconfig) ,@modules)) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest arguments) - (setenv "EXTRAVERSION" - #$(and extra-version - (not (string-null? extra-version)) - (string-append "-" extra-version))) - (let* ((configs - (string-append "arch/" #$(linux-srcarch) "/configs/")) - (guix_defconfig - (string-append configs "guix_defconfig"))) - #$(cond - ((not defconfig) - #~(begin - ;; Call the original 'configure phase. - (apply (assoc-ref #$phases 'configure) arguments) - ;; Save a defconfig file. - (invoke "make" "savedefconfig") - ;; Move the saved defconfig to the proper location. - (rename-file "defconfig" - guix_defconfig))) - ((string? defconfig) - ;; Use another existing defconfig from the Linux sources. - #~(rename-file (string-append configs #$defconfig) - guix_defconfig)) - (else - ;; Copy the defconfig input to the proper location. - #~(copy-file (assoc-ref inputs "guix_defconfig") - guix_defconfig))) - (chmod guix_defconfig #o644) - (modify-defconfig guix_defconfig '#$configs) - (invoke "make" "guix_defconfig") - (verify-config ".config" guix_defconfig)))))))) - (native-inputs - (append (if (or (not defconfig) - (string? defconfig)) - '() - ;; The defconfig should be an origin or file-like object. - `(("guix_defconfig" ,defconfig))) - (package-native-inputs linux))))) - -(define (make-defconfig uri sha256-as-base32) - (origin (method url-fetch) - (uri uri) - (sha256 (base32 sha256-as-base32)))) - ;;; ;;; Linux kernel modules. -- cgit v1.3 From 234190df00ae8032db38c7a4e2c82d7d8f364990 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 7 Dec 2022 08:57:37 -0500 Subject: gnu: linux: customize-linux: Remove input labels. * gnu/packages/linux.scm (make-linux-libre-source) [native-inputs]: Delete field, using the defconfig gexp directly... [phases] : ... here. --- gnu/packages/linux.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8d86ec67e1..5ae9d82530 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -262,10 +262,10 @@ of 'uname -r' behind the Linux version numbers." #$(and extra-version (not (string-null? extra-version)) (string-append "-" extra-version))) - (let* ((configs - (string-append "arch/" #$(linux-srcarch) "/configs/")) - (guix_defconfig - (string-append configs "guix_defconfig"))) + (let* ((configs (string-append "arch/" #$(linux-srcarch) + "/configs/")) + (guix_defconfig (string-append configs + "guix_defconfig"))) #$(cond ((not defconfig) #~(begin @@ -282,19 +282,11 @@ of 'uname -r' behind the Linux version numbers." guix_defconfig)) (else ;; Copy the defconfig input to the proper location. - #~(copy-file (assoc-ref inputs "guix_defconfig") - guix_defconfig))) + #~(copy-file #$defconfig guix_defconfig))) (chmod guix_defconfig #o644) (modify-defconfig guix_defconfig '#$configs) (invoke "make" "guix_defconfig") - (verify-config ".config" guix_defconfig)))))))) - (native-inputs - (append (if (or (not defconfig) - (string? defconfig)) - '() - ;; The defconfig should be an origin or file-like object. - `(("guix_defconfig" ,defconfig))) - (package-native-inputs linux))))) + (verify-config ".config" guix_defconfig)))))))))) (define (make-defconfig uri sha256-as-base32) (origin (method url-fetch) -- cgit v1.3 From dfc6957a5af7d179d4618eb19d4f555c519bc6f2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Dec 2022 20:18:21 -0500 Subject: gnu: make-linux-libre*: Remove input labels. * gnu/packages/linux.scm (kernel-config): Make the return value a gexp, using local-file. Adjust doc. (make-linux-libre*): Adjust doc. [native-inputs]: Remove input labels. Rewrite config input to be directly expanded... [phases] : ... here. Re-flow comments. Remove extraneous INPUTS argument. : Likewise. --- gnu/packages/linux.scm | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5ae9d82530..c9a21f590f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -777,12 +777,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;;; (define* (kernel-config arch #:key variant) - "Return the absolute file name of the Linux-Libre build configuration file -for ARCH and optionally VARIANT, or #f if there is no such configuration." + "Return a file-like object of the Linux-Libre build configuration file for +ARCH and optionally VARIANT, or #f if there is no such configuration." (let* ((name (string-append (if variant (string-append variant "-") "") (if (string=? "i386" arch) "i686" arch) ".conf")) (file (string-append "linux-libre/" name))) - (search-auxiliary-file file))) + (local-file (search-auxiliary-file file)))) (define %default-extra-linux-options `(;; Make the kernel config available at /proc/config.gz @@ -890,8 +890,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (define* (make-linux-libre version gnu-revision hash-string supported-systems #:key (extra-version #f) - ;; A function that takes an arch and a variant. - ;; See kernel-config for an example. + ;; A function that takes an arch and a variant, and + ;; return a file-like object. See kernel-config + ;; for an example. (configuration-file #f) (defconfig "defconfig") (extra-options %default-extra-linux-options) @@ -975,8 +976,20 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #$(and extra-version (string-append "-" extra-version))))) (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((config (assoc-ref inputs "kconfig"))) + (lambda _ + (let ((config + #$(match (let ((arch (platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))))) + (and configuration-file arch + (configuration-file + arch + #:variant (version-major+minor version)))) + (#f ;no config for this platform + #f) + ((? file-like? config) + config)))) ;; Use a custom kernel configuration file or a default ;; configuration file. (if config @@ -984,15 +997,15 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (copy-file config ".config") (chmod ".config" #o666)) (invoke "make" #$defconfig)) - ;; Appending works even when the option wasn't in the - ;; file. The last one prevails if duplicated. + ;; Appending works even when the option wasn't in the file. + ;; The last one prevails if duplicated. (let ((port (open-file ".config" "a")) (extra-configuration #$(config->string extra-options))) (display extra-configuration port) (close-port port)) (invoke "make" "oldconfig")))) (replace 'install - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (let ((moddir (string-append #$output "/lib/modules")) (dtbdir (string-append #$output "/lib/dtbs"))) ;; Install kernel image, kernel configuration and link map. @@ -1007,11 +1020,11 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ;; Install kernel modules (mkdir-p moddir) (invoke "make" - ;; Disable depmod because the Guix system's - ;; module directory is an union of potentially - ;; multiple packages. It is not possible to use - ;; depmod to usefully calculate a dependency - ;; graph while building only one of them. + ;; Disable depmod because the Guix system's module + ;; directory is an union of potentially multiple + ;; packages. It is not possible to use depmod to + ;; usefully calculate a dependency graph while + ;; building only one of them. "DEPMOD=true" (string-append "MODULE_DIR=" moddir) (string-append "INSTALL_PATH=" #$output) @@ -1024,8 +1037,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (version (match versions ((x) x)))) ;; There are symlinks to the build and source directory. - ;; Both will point to target /tmp/guix-build* and thus - ;; not be useful in a profile. Delete the symlinks. + ;; Both will point to target /tmp/guix-build* and thus not + ;; be useful in a profile. Delete the symlinks. (false-if-file-not-found (delete-file (string-append moddir "/" version "/build"))) @@ -1033,35 +1046,22 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (delete-file (string-append moddir "/" version "/source")))))))))) (native-inputs - `(("perl" ,perl) - ("bc" ,bc) - ("openssl" ,openssl) - ("elfutils" ,elfutils) ;needed to enable CONFIG_STACK_VALIDATION - ("flex" ,flex) - ("bison" ,bison) - - ;; These are needed to compile the GCC plugins. - ("gmp" ,gmp) - ("mpfr" ,mpfr) - ("mpc" ,mpc) - ,@(match (let ((arch (platform-linux-architecture - (lookup-platform-by-target-or-system - (or (%current-target-system) - (%current-system)))))) - (and configuration-file arch - (configuration-file - arch - #:variant (version-major+minor version)))) - (#f ;no config for this platform - '()) - ((? string? config) - `(("kconfig" ,config)))))) + (list perl + bc + openssl + elfutils ;needed to enable CONFIG_STACK_VALIDATION + flex + bison + ;; These are needed to compile the GCC plugins. + gmp + mpfr + mpc)) (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. It has been modified to remove all non-free binary blobs.") (license license:gpl2) - (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan. + (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan ;;; -- cgit v1.3 From f4504b61ed9ef1b25188ebfaf9021ea9fec6d4a1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Dec 2022 20:33:09 -0500 Subject: gnu: linux-libre: Update to 6.0.11. * gnu/packages/linux.scm (linux-libre-6.0-version): Update to 6.0.11. (linux-libre-6.0-pristine-source, deblob-scripts-6.0): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c9a21f590f..6e4c3baa6c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -477,17 +477,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.0-version "6.0.10") +(define-public linux-libre-6.0-version "6.0.11") (define-public linux-libre-6.0-gnu-revision "gnu") (define deblob-scripts-6.0 (linux-libre-deblob-scripts linux-libre-6.0-version linux-libre-6.0-gnu-revision (base32 "0iwbjrgiwch5v1xpnm9wk9zqw2v6lxja0k8yj2x0amxc9ma68176") - (base32 "06iqxkg5hakzvmz6gcz878k1sr553zbng2j1b2whgfg7zmhxkb34"))) + (base32 "16g2bin3xay30zfss1vlb7pwcss5giaxaksp4v1gk05wn51wjrqr"))) (define-public linux-libre-6.0-pristine-source (let ((version linux-libre-6.0-version) - (hash (base32 "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r"))) + (hash (base32 "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.0))) -- cgit v1.3 From ac123ed303d0de5fedc5288017c8704725a1dd7b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Dec 2022 20:33:39 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.81. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.81. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6e4c3baa6c..37947ad842 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -495,17 +495,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.80") +(define-public linux-libre-5.15-version "5.15.81") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") - (base32 "0h8a48dvgxyj3v08lp99kh5pfa93r4rks78cj0j1rwz1516xk8h3"))) + (base32 "1m73pgx8v047xb2gck2g7j7khniis8c9akn9vhzgsdfglrf8p6fj"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv"))) + (hash (base32 "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.3 From 0cd12c2d75fab47ccbed3fd513d5bd6ddaf0e87a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Dec 2022 20:34:14 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.157. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.157. (linux-libre-5.10-pristine-source, deblob-scripts-5.10): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 37947ad842..5ae6366593 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -510,17 +510,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.156") +(define-public linux-libre-5.10-version "5.10.157") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf") - (base32 "1m9l554w6a72mq0kf7ggm44z247m2yz6zhafwqxh96qpjpcaabpj"))) + (base32 "0a96g4pjdgwvxn2wpz6rfc8nwdlkw138r9pp66kvfrrn08i313ii"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7"))) + (hash (base32 "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.3 From 0ffa501f2b3e83ae56e9c2bd31418439090e869a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 9 Dec 2022 08:16:07 -0500 Subject: Revert "gnu: make-linux-libre*: Remove input labels." This reverts commit dfc6957a5af7d179d4618eb19d4f555c519bc6f2. git-bisect found it broke guix pull on non-x86_64 systems like powerpc64le, for reasons to investigate. --- gnu/packages/linux.scm | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5ae6366593..16f7195578 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -777,12 +777,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;;; (define* (kernel-config arch #:key variant) - "Return a file-like object of the Linux-Libre build configuration file for -ARCH and optionally VARIANT, or #f if there is no such configuration." + "Return the absolute file name of the Linux-Libre build configuration file +for ARCH and optionally VARIANT, or #f if there is no such configuration." (let* ((name (string-append (if variant (string-append variant "-") "") (if (string=? "i386" arch) "i686" arch) ".conf")) (file (string-append "linux-libre/" name))) - (local-file (search-auxiliary-file file)))) + (search-auxiliary-file file))) (define %default-extra-linux-options `(;; Make the kernel config available at /proc/config.gz @@ -890,9 +890,8 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." (define* (make-linux-libre version gnu-revision hash-string supported-systems #:key (extra-version #f) - ;; A function that takes an arch and a variant, and - ;; return a file-like object. See kernel-config - ;; for an example. + ;; A function that takes an arch and a variant. + ;; See kernel-config for an example. (configuration-file #f) (defconfig "defconfig") (extra-options %default-extra-linux-options) @@ -976,20 +975,8 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." #$(and extra-version (string-append "-" extra-version))))) (replace 'configure - (lambda _ - (let ((config - #$(match (let ((arch (platform-linux-architecture - (lookup-platform-by-target-or-system - (or (%current-target-system) - (%current-system)))))) - (and configuration-file arch - (configuration-file - arch - #:variant (version-major+minor version)))) - (#f ;no config for this platform - #f) - ((? file-like? config) - config)))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((config (assoc-ref inputs "kconfig"))) ;; Use a custom kernel configuration file or a default ;; configuration file. (if config @@ -997,15 +984,15 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." (copy-file config ".config") (chmod ".config" #o666)) (invoke "make" #$defconfig)) - ;; Appending works even when the option wasn't in the file. - ;; The last one prevails if duplicated. + ;; Appending works even when the option wasn't in the + ;; file. The last one prevails if duplicated. (let ((port (open-file ".config" "a")) (extra-configuration #$(config->string extra-options))) (display extra-configuration port) (close-port port)) (invoke "make" "oldconfig")))) (replace 'install - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (let ((moddir (string-append #$output "/lib/modules")) (dtbdir (string-append #$output "/lib/dtbs"))) ;; Install kernel image, kernel configuration and link map. @@ -1020,11 +1007,11 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." ;; Install kernel modules (mkdir-p moddir) (invoke "make" - ;; Disable depmod because the Guix system's module - ;; directory is an union of potentially multiple - ;; packages. It is not possible to use depmod to - ;; usefully calculate a dependency graph while - ;; building only one of them. + ;; Disable depmod because the Guix system's + ;; module directory is an union of potentially + ;; multiple packages. It is not possible to use + ;; depmod to usefully calculate a dependency + ;; graph while building only one of them. "DEPMOD=true" (string-append "MODULE_DIR=" moddir) (string-append "INSTALL_PATH=" #$output) @@ -1037,8 +1024,8 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." (version (match versions ((x) x)))) ;; There are symlinks to the build and source directory. - ;; Both will point to target /tmp/guix-build* and thus not - ;; be useful in a profile. Delete the symlinks. + ;; Both will point to target /tmp/guix-build* and thus + ;; not be useful in a profile. Delete the symlinks. (false-if-file-not-found (delete-file (string-append moddir "/" version "/build"))) @@ -1046,22 +1033,35 @@ ARCH and optionally VARIANT, or #f if there is no such configuration." (delete-file (string-append moddir "/" version "/source")))))))))) (native-inputs - (list perl - bc - openssl - elfutils ;needed to enable CONFIG_STACK_VALIDATION - flex - bison - ;; These are needed to compile the GCC plugins. - gmp - mpfr - mpc)) + `(("perl" ,perl) + ("bc" ,bc) + ("openssl" ,openssl) + ("elfutils" ,elfutils) ;needed to enable CONFIG_STACK_VALIDATION + ("flex" ,flex) + ("bison" ,bison) + + ;; These are needed to compile the GCC plugins. + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc) + ,@(match (let ((arch (platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))))) + (and configuration-file arch + (configuration-file + arch + #:variant (version-major+minor version)))) + (#f ;no config for this platform + '()) + ((? string? config) + `(("kconfig" ,config)))))) (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. It has been modified to remove all non-free binary blobs.") (license license:gpl2) - (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan + (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan. ;;; -- cgit v1.3 From 67e8fd6b386e811b5673a49f0136bb2eca9b43ef Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:31:28 -0500 Subject: gnu: linux-libre: Update to 6.0.12. * gnu/packages/linux.scm (linux-libre-6.0-version): Update to 6.0.12. (linux-libre-6.0-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 16f7195578..d935099372 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -477,7 +477,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.0-version "6.0.11") +(define-public linux-libre-6.0-version "6.0.12") (define-public linux-libre-6.0-gnu-revision "gnu") (define deblob-scripts-6.0 (linux-libre-deblob-scripts @@ -487,7 +487,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "16g2bin3xay30zfss1vlb7pwcss5giaxaksp4v1gk05wn51wjrqr"))) (define-public linux-libre-6.0-pristine-source (let ((version linux-libre-6.0-version) - (hash (base32 "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib"))) + (hash (base32 "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.0))) -- cgit v1.3 From b52ffca2bbc51badd98dd85b988a344cde0776ae Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:31:52 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.82. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.82. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d935099372..c7830f97ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -495,7 +495,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.81") +(define-public linux-libre-5.15-version "5.15.82") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -505,7 +505,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1m73pgx8v047xb2gck2g7j7khniis8c9akn9vhzgsdfglrf8p6fj"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g"))) + (hash (base32 "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.3 From 773ba52f93e31df1f21fe87c8eb148483b6aec90 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:32:08 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.158. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.158. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c7830f97ff..85062bb2c3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -510,7 +510,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.157") +(define-public linux-libre-5.10-version "5.10.158") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -520,7 +520,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0a96g4pjdgwvxn2wpz6rfc8nwdlkw138r9pp66kvfrrn08i313ii"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w"))) + (hash (base32 "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.3 From 733396eb2b8b3d14007be215cf3d90e8fe49d6cd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:32:24 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.226. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.226. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85062bb2c3..d5dc91d9cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -525,7 +525,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.225") +(define-public linux-libre-5.4-version "5.4.226") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -535,7 +535,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1bgblfkcnrabnr9hpdl07qgps57h6bq4v5pjrxs798vq43db66va"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar"))) + (hash (base32 "0i4s1hl5q0ax55z7m5krzyw1zj9v03q8jcfksknb6qrg3lm5a7qc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.3 From 7b0fd5a0b4469dc4bac92fa764353c41ff978a8a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:32:38 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.268. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.268. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d5dc91d9cb..7509987dfb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -540,7 +540,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.267") +(define-public linux-libre-4.19-version "4.19.268") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -550,7 +550,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l"))) + (hash (base32 "0kr0di4gr6p57c8h6ybcli01kazq235npbh6qrpx0hpmqcdcx6r1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.3 From 19836fe4f17b81136584c866dff5f856221d7e48 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:32:51 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.301. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.301. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7509987dfb..b7f7c99672 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -555,7 +555,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.300") +(define-public linux-libre-4.14-version "4.14.301") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y"))) + (hash (base32 "16zrpfadsnznpl37crbq5g1hz1ch0zfp2a75yzlqy2fs0f7fxlmc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.3 From 3ae6f30767f962da74d18d824b521462e149b89a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Dec 2022 12:33:05 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.335. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.335. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b7f7c99672..c476940eed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -570,7 +570,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.334") +(define-public linux-libre-4.9-version "4.9.335") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -580,7 +580,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0sjh492mfic6llgwb957nj7gd7c0dvqnk97ngq8d50sjsyjznyk9"))) + (hash (base32 "0agb1avdqxbmb0z751f5c4d6s7k9zb6dq04z82gx0v4zzrhxhkzd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.3