05/05: build-system: linux-module: Normalise the ‘M’ source-directory.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit a939011b58c65f4192a10cde9e925e85702bacf4
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Sep 30 03:58:42 2021 +0200

    build-system: linux-module: Normalise the ‘M’ source-directory.
    
    "make modules_install" with an "M=" file name ending in "/." breaks at
    least rtl8812au-aircrack-ng-linux-module.  In general, passing a more
    human-generated-looking value seems prudent as these are more likely to
    be tested upstream.
    
    * guix/build/linux-module-build-system.scm (build, install): Call
    CANONICALIZE-PATH on SOURCE-DIRECTORY instead of STRING-APPEND.
    
    Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.
    as apteryx on #guix
---
 guix/build/linux-module-build-system.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/build/linux-module-build-system.scm 
b/guix/build/linux-module-build-system.scm
index 729ab61..1541b63 100644
--- a/guix/build/linux-module-build-system.scm
+++ b/guix/build/linux-module-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -53,7 +54,7 @@
   (apply invoke "make" "-C"
          (string-append (assoc-ref inputs "linux-module-builder")
                         "/lib/modules/build")
-         (string-append "M=" (getcwd) "/" source-directory)
+         (string-append "M=" (canonicalize-path source-directory))
          (or make-flags '())))
 
 ;; This block was copied from make-linux-libre--only took the "modules_install"
@@ -68,7 +69,7 @@
     (apply invoke "make" "-C"
             (string-append (assoc-ref inputs "linux-module-builder")
                            "/lib/modules/build")
-            (string-append "M=" (getcwd) "/" source-directory)
+            (string-append "M=" (canonicalize-path source-directory))
             ;; 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