mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2024-11-25 01:48:08 +01:00
nongnu: make-linux-xanmod: Adjust style.
* nongnu/packages/linux.scm (%default-extra-linux-options,config->string): Move into make-linux-xanmod. (make-linux-xanmod): Adjust comments. Move the base kernel produced by customize-linux out of let form. [native-inputs]: Use prepend instead of append. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Hilton Chain
Jonathan Brielmaier
parent
1eaa24df40
commit
0b4f1c3aff
1 changed files with 59 additions and 53 deletions
|
|
@ -46,12 +46,6 @@
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:export (corrupt-linux))
|
#:export (corrupt-linux))
|
||||||
|
|
||||||
(define %default-extra-linux-options
|
|
||||||
(@@ (gnu packages linux) %default-extra-linux-options))
|
|
||||||
|
|
||||||
(define config->string
|
|
||||||
(@@ (gnu packages linux) config->string))
|
|
||||||
|
|
||||||
(define (linux-url version)
|
(define (linux-url version)
|
||||||
"Return a URL for Linux VERSION."
|
"Return a URL for Linux VERSION."
|
||||||
(string-append "mirror://kernel.org"
|
(string-append "mirror://kernel.org"
|
||||||
|
|
@ -189,56 +183,68 @@ on hardware which requires nonfree software to function."))))
|
||||||
#:key
|
#:key
|
||||||
(name "linux-xanmod")
|
(name "linux-xanmod")
|
||||||
(xanmod-defconfig "config_x86-64-v1"))
|
(xanmod-defconfig "config_x86-64-v1"))
|
||||||
(let ((defconfig xanmod-defconfig) ;to be used in phases.
|
|
||||||
(base (customize-linux #:name name
|
|
||||||
#:source source
|
|
||||||
#:defconfig xanmod-defconfig
|
|
||||||
;; EXTRAVERSION is used instead.
|
|
||||||
#:configs (config->string
|
|
||||||
'(("CONFIG_LOCALVERSION" . "")))
|
|
||||||
#:extra-version xanmod-revision)))
|
|
||||||
(package
|
|
||||||
(inherit base)
|
|
||||||
(version version)
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments base)
|
|
||||||
((#:phases phases)
|
|
||||||
#~(modify-phases #$phases
|
|
||||||
(add-before 'configure 'add-xanmod-defconfig
|
|
||||||
(lambda _
|
|
||||||
(rename-file
|
|
||||||
(string-append "CONFIGS/xanmod/gcc/" #$defconfig)
|
|
||||||
".config")
|
|
||||||
|
|
||||||
;; Adapted from `make-linux-libre*'.
|
(define %default-extra-linux-options
|
||||||
(chmod ".config" #o666)
|
(@@ (gnu packages linux) %default-extra-linux-options))
|
||||||
(let ((port (open-file ".config" "a"))
|
|
||||||
(extra-configuration
|
|
||||||
#$(config->string
|
|
||||||
;; FIXME: There might be other support missing.
|
|
||||||
(append '(("CONFIG_BLK_DEV_NVME" . #t)
|
|
||||||
("CONFIG_CRYPTO_XTS" . m)
|
|
||||||
("CONFIG_VIRTIO_CONSOLE" . m))
|
|
||||||
%default-extra-linux-options))))
|
|
||||||
(display extra-configuration port)
|
|
||||||
(close-port port))
|
|
||||||
(invoke "make" "oldconfig")
|
|
||||||
|
|
||||||
(rename-file
|
(define config->string
|
||||||
".config"
|
(@@ (gnu packages linux) config->string))
|
||||||
(string-append "arch/x86/configs/" #$defconfig))))))))
|
|
||||||
(native-inputs
|
(define base-kernel
|
||||||
(modify-inputs (package-native-inputs base)
|
(customize-linux
|
||||||
;; cpio is needed for CONFIG_IKHEADERS.
|
#:name name
|
||||||
(append cpio zstd)))
|
#:source source
|
||||||
(home-page "https://xanmod.org/")
|
#:defconfig xanmod-defconfig
|
||||||
(supported-systems '("x86_64-linux"))
|
;; EXTRAVERSION is used instead.
|
||||||
(synopsis
|
#:configs (config->string
|
||||||
"Linux kernel distribution with custom settings and new features")
|
'(("CONFIG_LOCALVERSION" . "")))
|
||||||
(description
|
#:extra-version xanmod-revision))
|
||||||
"This package provides XanMod kernel, a general-purpose Linux kernel
|
|
||||||
|
(package
|
||||||
|
(inherit base-kernel)
|
||||||
|
(version version)
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments base-kernel)
|
||||||
|
((#:phases phases)
|
||||||
|
#~(modify-phases #$phases
|
||||||
|
;; Since `customize-linux' replaces the configure phase, we add
|
||||||
|
;; XanMod defconfig beforehand to ensure compatibility of the
|
||||||
|
;; resulting package with `customize-linux'.
|
||||||
|
(add-before 'configure 'add-xanmod-defconfig
|
||||||
|
(lambda _
|
||||||
|
(rename-file
|
||||||
|
(string-append "CONFIGS/xanmod/gcc/" #$xanmod-defconfig)
|
||||||
|
".config")
|
||||||
|
|
||||||
|
;; Adapted from `make-linux-libre*'.
|
||||||
|
(chmod ".config" #o666)
|
||||||
|
(let ((port (open-file ".config" "a"))
|
||||||
|
(extra-configuration
|
||||||
|
#$(config->string
|
||||||
|
(append %default-extra-linux-options
|
||||||
|
;; NOTE: These are configs expected by Guix
|
||||||
|
;; but missing from XanMod defconfig.
|
||||||
|
'(("CONFIG_BLK_DEV_NVME" . #t)
|
||||||
|
("CONFIG_CRYPTO_XTS" . m)
|
||||||
|
("CONFIG_VIRTIO_CONSOLE" . m))))))
|
||||||
|
(display extra-configuration port)
|
||||||
|
(close-port port))
|
||||||
|
(invoke "make" "oldconfig")
|
||||||
|
|
||||||
|
(rename-file
|
||||||
|
".config"
|
||||||
|
(string-append "arch/x86/configs/" #$xanmod-defconfig))))))))
|
||||||
|
(native-inputs
|
||||||
|
(modify-inputs (package-native-inputs base-kernel)
|
||||||
|
;; cpio is needed for CONFIG_IKHEADERS.
|
||||||
|
(prepend cpio zstd)))
|
||||||
|
(home-page "https://xanmod.org/")
|
||||||
|
(supported-systems '("x86_64-linux"))
|
||||||
|
(synopsis "Linux kernel distribution with custom settings and new features")
|
||||||
|
(description
|
||||||
|
"This package provides XanMod kernel, a general-purpose Linux kernel
|
||||||
distribution with custom settings and new features. It's built to provide a
|
distribution with custom settings and new features. It's built to provide a
|
||||||
stable, responsive and smooth desktop experience."))))
|
stable, responsive and smooth desktop experience.")))
|
||||||
|
|
||||||
;; Linux-XanMod sources
|
;; Linux-XanMod sources
|
||||||
(define-public linux-xanmod-version "6.5.10")
|
(define-public linux-xanmod-version "6.5.10")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue