diff options
| author | Alex Kost <alezost@gmail.com> | 2017-02-17 13:28:16 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2017-02-27 16:44:58 +0300 |
| commit | 7994250fdb7ce786a72278554d85fccb6d152e73 (patch) | |
| tree | 93e7d5a8215491089502846f3634266efe5130e1 /gnu/packages/linux.scm | |
| parent | 96eaa55ffb9877c319df09d158fca31034d8f0a2 (diff) | |
| download | patches-7994250fdb7ce786a72278554d85fccb6d152e73.tar patches-7994250fdb7ce786a72278554d85fccb6d152e73.tar.gz | |
gnu: linux: Move configuration files to "aux-files".
* gnu/packages/linux-libre-4.1-i686.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.1-i686.conf: ... this.
* gnu/packages/linux-libre-4.1-x86_64.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.1-x86_64.conf: ... this.
* gnu/packages/linux-libre-4.4-i686.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.4-i686.conf: ... this.
* gnu/packages/linux-libre-4.4-x86_64.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.4-x86_64.conf: ... this.
* gnu/packages/linux-libre-4.9-i686.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.9-i686.conf: ... this.
* gnu/packages/linux-libre-4.9-x86_64.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.9-x86_64.conf: ... this.
* gnu/packages/linux-libre-4.10-i686.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.10-i686.conf: ... this.
* gnu/packages/linux-libre-4.10-x86_64.conf: Rename to...
* gnu/packages/aux-files/linux-libre/4.10-x86_64.conf: ... this.
* gnu/packages/linux.scm (kernel-config): Use 'search-auxiliary-file' to
find configuration files.
* Makefile.am (KCONFIGS): Rename to...
(AUX_FILES): ... this. Adjust accordingly.
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc3e4d4079..1ed6843345 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2016 Alex Kost <alezost@gmail.com> +;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> @@ -194,11 +194,10 @@ (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." - (let* ((name (string-append "linux-libre-" - (if variant (string-append variant "-") "") + (let* ((name (string-append (if variant (string-append variant "-") "") (if (string=? "i386" arch) "i686" arch) ".conf")) - (file (string-append "gnu/packages/" name))) - (search-path %load-path file))) + (file (string-append "linux-libre/" name))) + (search-auxiliary-file file))) (define %default-extra-linux-options `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html |