From: Mathieu Othacehe <m.othacehe@gmail.com>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: mhw@netris.org, ludo@gnu.org, 37868@debbugs.gnu.org
Subject: [bug#37868] [PATCH v8] system: Add kernel-module-packages to operating-system.
Date: Fri, 20 Mar 2020 16:13:20 +0100 [thread overview]
Message-ID: <87fte3jbzj.fsf@gmail.com> (raw)
In-Reply-To: <20200320111938.4472f145@scratchpost.org>
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
Hey,
Here's a patch that fixes linux-module-build-system cross-compilation. I
tested it on acpi-call-linux-module, ddcci-driver-linux, vhba-module and
rtl8812au-aircrack-ng-linux-module, seems to work fine!
Now, I'll try to rebase it on top of your patch and see if it works for
a cross-compiled system.
Thanks,
Mathieu
[-- Attachment #2: 0001-build-system-linux-module-Fix-cross-compilation.patch --]
[-- Type: text/x-diff, Size: 12073 bytes --]
From 0331acf8494cc8404a23c0bdd516ef7c5bf854ad Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Fri, 20 Mar 2020 16:01:02 +0100
Subject: [PATCH] build-system: linux-module: Fix cross-compilation.
* guix/build-system/linux-module.scm (default-kmod, default-gcc): Remove as
unused,
(system->arch): new procedure,
(make-linux-module-builder)[native-inputs]: move linux ...
[inputs]: ... to here,
(lower): allow cross-compilation, move "linux" and "linux-module-builder" to
host-inputs, add target-inputs, call linux-module-build-cross if target is
set, linux-module-build otherwise,
(linux-module-build): add a target argument, pass target and arch to
build side linux-module-build call,
(linux-module-build-cross): new procedure.
* guix/build/linux-module-build-system.scm (configure): Add arch argument and
use it to set ARCH environment variable,
(linux-module-build): fill comment.
---
guix/build-system/linux-module.scm | 162 +++++++++++++++++------
guix/build/linux-module-build-system.scm | 17 +--
2 files changed, 132 insertions(+), 47 deletions(-)
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm
index 1e1a07d0a2..ca104f7c75 100644
--- a/guix/build-system/linux-module.scm
+++ b/guix/build-system/linux-module.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,27 +46,16 @@
(let ((module (resolve-interface '(gnu packages linux))))
(module-ref module 'linux-libre)))
-(define (default-kmod)
- "Return the default kmod package."
-
- ;; Do not use `@' to avoid introducing circular dependencies.
+(define (system->arch system)
(let ((module (resolve-interface '(gnu packages linux))))
- (module-ref module 'kmod)))
-
-(define (default-gcc)
- "Return the default gcc package."
-
- ;; Do not use `@' to avoid introducing circular dependencies.
- (let ((module (resolve-interface '(gnu packages gcc))))
- (module-ref module 'gcc-7)))
+ ((module-ref module 'system->linux-architecture) system)))
(define (make-linux-module-builder linux)
(package
(inherit linux)
(name (string-append (package-name linux) "-module-builder"))
- (native-inputs
- `(("linux" ,linux)
- ,@(package-native-inputs linux)))
+ (inputs
+ `(("linux" ,linux)))
(arguments
(substitute-keyword-arguments (package-arguments linux)
((#:phases phases)
@@ -97,33 +87,43 @@
#:rest arguments)
"Return a bag for NAME."
(define private-keywords
- '(#:source #:target #:gcc #:kmod #:linux #:inputs #:native-inputs))
-
- (and (not target) ;XXX: no cross-compilation
- (bag
- (name name)
- (system system)
- (host-inputs `(,@(if source
- `(("source" ,source))
- '())
- ,@inputs
- ,@(standard-packages)))
- (build-inputs `(("linux" ,linux) ; for "Module.symvers".
- ("linux-module-builder"
- ,(make-linux-module-builder linux))
- ,@native-inputs
- ;; TODO: Remove "gmp", "mpfr", "mpc" since they are
- ;; only needed to compile the gcc plugins. Maybe
- ;; remove "flex", "bison", "elfutils", "perl",
- ;; "openssl". That leaves very little ("bc", "gcc",
- ;; "kmod").
- ,@(package-native-inputs linux)))
- (outputs outputs)
- (build linux-module-build)
- (arguments (strip-keyword-arguments private-keywords arguments)))))
+ `(#:source #:target #:gcc #:kmod #:linux #:inputs #:native-inputs
+ ,@(if target '() '(#:target))))
+
+ (bag
+ (name name)
+ (system system) (target target)
+ (build-inputs `(,@(if source
+ `(("source" ,source))
+ '())
+ ,@native-inputs
+ ;; TODO: Remove "gmp", "mpfr", "mpc" since they are
+ ;; only needed to compile the gcc plugins. Maybe
+ ;; remove "flex", "bison", "elfutils", "perl",
+ ;; "openssl". That leaves very little ("bc", "gcc",
+ ;; "kmod").
+ ,@(package-native-inputs linux)
+ ,@(if target
+ ;; Use the standard cross inputs of
+ ;; 'gnu-build-system'.
+ (standard-cross-packages target 'host)
+ '())
+ ;; Keep the standard inputs of 'gnu-build-system'.
+ ,@(standard-packages)))
+ (host-inputs `(,@inputs
+ ("linux" ,linux)
+ ("linux-module-builder"
+ ,(make-linux-module-builder linux))))
+ (target-inputs (if target
+ (standard-cross-packages target 'target)
+ '()))
+ (outputs outputs)
+ (build (if target linux-module-build-cross linux-module-build))
+ (arguments (strip-keyword-arguments private-keywords arguments))))
(define* (linux-module-build store name inputs
#:key
+ target
(search-paths '())
(tests? #t)
(phases '(@ (guix build linux-module-build-system)
@@ -152,6 +152,8 @@
search-paths)
#:phases ,phases
#:system ,system
+ #:target ,target
+ #:arch ,(system->arch (or target system))
#:tests? ,tests?
#:outputs %outputs
#:inputs %build-inputs)))
@@ -173,6 +175,88 @@
#:guile-for-build guile-for-build
#:substitutable? substitutable?))
+(define* (linux-module-build-cross
+ store name
+ #:key
+ target native-drvs target-drvs
+ (guile #f)
+ (outputs '("out"))
+ (search-paths '())
+ (native-search-paths '())
+ (tests? #f)
+ (phases '(@ (guix build linux-module-build-system)
+ %standard-phases))
+ (system (%current-system))
+ (substitutable? #t)
+ (imported-modules
+ %linux-module-build-system-modules)
+ (modules '((guix build linux-module-build-system)
+ (guix build utils))))
+ (define builder
+ `(begin
+ (use-modules ,@modules)
+ (let ()
+ (define %build-host-inputs
+ ',(map (match-lambda
+ ((name (? derivation? drv) sub ...)
+ `(,name . ,(apply derivation->output-path drv sub)))
+ ((name path)
+ `(,name . ,path)))
+ native-drvs))
+
+ (define %build-target-inputs
+ ',(map (match-lambda
+ ((name (? derivation? drv) sub ...)
+ `(,name . ,(apply derivation->output-path drv sub)))
+ ((name (? package? pkg) sub ...)
+ (let ((drv (package-cross-derivation store pkg
+ target system)))
+ `(,name . ,(apply derivation->output-path drv sub))))
+ ((name path)
+ `(,name . ,path)))
+ target-drvs))
+
+ (linux-module-build #:name ,name
+ #:source ,(match (assoc-ref native-drvs "source")
+ (((? derivation? source))
+ (derivation->output-path source))
+ ((source)
+ source)
+ (source
+ source))
+ #:system ,system
+ #:target ,target
+ #:arch ,(system->arch (or target system))
+ #:outputs %outputs
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths
+ ',(map search-path-specification->sexp
+ search-paths)
+ #:native-search-paths
+ ',(map
+ search-path-specification->sexp
+ native-search-paths)
+ #:phases ,phases
+ #:tests? ,tests?))))
+
+ (define guile-for-build
+ (match guile
+ ((? package?)
+ (package-derivation store guile system #:graft? #f))
+ (#f ; the default
+ (let* ((distro (resolve-interface '(gnu packages commencement)))
+ (guile (module-ref distro 'guile-final)))
+ (package-derivation store guile system #:graft? #f)))))
+
+ (build-expression->derivation store name builder
+ #:system system
+ #:inputs (append native-drvs target-drvs)
+ #:outputs outputs
+ #:modules imported-modules
+ #:guile-for-build guile-for-build
+ #:substitutable? substitutable?))
+
(define linux-module-build-system
(build-system
(name 'linux-module)
diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm
index 8145d5a724..73d6b101f6 100644
--- a/guix/build/linux-module-build-system.scm
+++ b/guix/build/linux-module-build-system.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,14 +34,13 @@
;; Code:
;; Copied from make-linux-libre's "configure" phase.
-(define* (configure #:key inputs target #:allow-other-keys)
+(define* (configure #:key inputs target arch #:allow-other-keys)
(setenv "KCONFIG_NOTIMESTAMP" "1")
(setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
- ;(let ((arch ,(system->linux-architecture
- ; (or (%current-target-system)
- ; (%current-system)))))
- ; (setenv "ARCH" arch)
- ; (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")))
+
+ (setenv "ARCH" arch)
+ (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))
+
(when target
(setenv "CROSS_COMPILE" (string-append target "-"))
(format #t "`CROSS_COMPILE' set to `~a'~%"
@@ -85,8 +85,9 @@
(replace 'install install)))
(define* (linux-module-build #:key inputs (phases %standard-phases)
- #:allow-other-keys #:rest args)
- "Build the given package, applying all of PHASES in order, with a Linux kernel in attendance."
+ #:allow-other-keys #:rest args)
+ "Build the given package, applying all of PHASES in order, with a Linux
+kernel in attendance."
(apply gnu:gnu-build
#:inputs inputs #:phases phases
args))
--
2.25.1
next prev parent reply other threads:[~2020-03-20 15:14 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 15:22 [bug#37868] [PATCH] guix: Allow multiple packages to provide Linux modules in the system profile Danny Milosavljevic
2019-11-12 16:20 ` Danny Milosavljevic
2019-11-12 17:47 ` Giovanni Biscuolo
2019-11-12 18:11 ` Giovanni Biscuolo
2019-11-13 13:30 ` Ludovic Courtès
2019-11-14 16:21 ` Danny Milosavljevic
2020-02-17 17:10 ` Danny Milosavljevic
2020-02-18 8:31 ` Ludovic Courtès
2019-11-14 17:48 ` Mark H Weaver
2020-02-18 9:42 ` [bug#37868] [PATCH v2 0/2] system: Add kernel-module-packages to operating-system and use it Danny Milosavljevic
2020-02-18 9:42 ` [bug#37868] [PATCH v2 1/2] build-system/linux-module: Disable depmod Danny Milosavljevic
2020-02-23 16:22 ` Ludovic Courtès
2020-02-25 10:11 ` Danny Milosavljevic
2020-02-18 9:42 ` [bug#37868] [PATCH v2 2/2] system: Add kernel-module-packages to operating-system Danny Milosavljevic
2020-02-18 12:31 ` Mathieu Othacehe
2020-02-23 16:36 ` Ludovic Courtès
2020-02-24 16:18 ` Danny Milosavljevic
2020-02-25 10:21 ` [bug#37868] [PATCH v3] " Danny Milosavljevic
2020-02-25 10:55 ` [bug#37868] [PATCH v4] " Danny Milosavljevic
2020-02-25 11:32 ` Danny Milosavljevic
2020-02-25 13:34 ` Danny Milosavljevic
2020-02-26 19:59 ` [bug#37868] [PATCH v5] " Danny Milosavljevic
2020-02-27 11:15 ` Danny Milosavljevic
2020-02-27 12:25 ` [bug#37868] [PATCH v6] " Danny Milosavljevic
2020-02-27 13:51 ` [bug#37868] [PATCH v7] " Danny Milosavljevic
2020-02-27 15:50 ` [bug#37868] [PATCH v8] " Danny Milosavljevic
2020-03-14 18:40 ` Danny Milosavljevic
2020-03-15 10:28 ` Mathieu Othacehe
2020-03-15 10:33 ` Mathieu Othacehe
2020-03-15 18:17 ` Danny Milosavljevic
2020-03-16 9:55 ` Mathieu Othacehe
2020-03-16 20:10 ` Danny Milosavljevic
2020-03-17 9:29 ` Ludovic Courtès
2020-03-18 14:50 ` Mathieu Othacehe
2020-03-18 16:06 ` Danny Milosavljevic
2020-03-18 17:00 ` Danny Milosavljevic
2020-03-18 17:35 ` Ludovic Courtès
2020-03-20 10:19 ` Danny Milosavljevic
2020-03-20 10:32 ` Mathieu Othacehe
2020-03-20 15:13 ` Mathieu Othacehe [this message]
2020-03-20 17:52 ` Mathieu Othacehe
2020-03-21 10:06 ` Danny Milosavljevic
2020-03-22 13:36 ` Danny Milosavljevic
2020-03-22 21:11 ` Ludovic Courtès
2020-03-15 21:02 ` Ludovic Courtès
2020-03-15 21:00 ` [bug#37868] [PATCH v6] " Ludovic Courtès
2020-03-15 22:09 ` Danny Milosavljevic
2020-03-16 8:55 ` Ludovic Courtès
2020-03-16 20:04 ` Danny Milosavljevic
2020-03-16 20:31 ` Danny Milosavljevic
2020-03-17 9:20 ` Ludovic Courtès
2020-03-16 20:17 ` [bug#37868] [PATCH v9] system: Add kernel-loadable-modules " Danny Milosavljevic
2020-03-19 14:22 ` [bug#37868] [PATCH v10] " Danny Milosavljevic
2020-03-22 12:01 ` bug#37868: " Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fte3jbzj.fsf@gmail.com \
--to=m.othacehe@gmail.com \
--cc=37868@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
--cc=ludo@gnu.org \
--cc=mhw@netris.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.