From 7994250fdb7ce786a72278554d85fccb6d152e73 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 17 Feb 2017 13:28:16 +0300 Subject: [PATCH] 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. --- Makefile.am | 24 +++++++++---------- .../linux-libre/4.1-i686.conf} | 0 .../linux-libre/4.1-x86_64.conf} | 0 .../linux-libre/4.10-i686.conf} | 0 .../linux-libre/4.10-x86_64.conf} | 0 .../linux-libre/4.4-i686.conf} | 0 .../linux-libre/4.4-x86_64.conf} | 0 .../linux-libre/4.9-i686.conf} | 0 .../linux-libre/4.9-x86_64.conf} | 0 gnu/packages/linux.scm | 9 ++++--- 10 files changed, 16 insertions(+), 17 deletions(-) rename gnu/packages/{linux-libre-4.1-i686.conf => aux-files/linux-libre/4.1-i686.conf} (100%) rename gnu/packages/{linux-libre-4.1-x86_64.conf => aux-files/linux-libre/4.1-x86_64.conf} (100%) rename gnu/packages/{linux-libre-4.10-i686.conf => aux-files/linux-libre/4.10-i686.conf} (100%) rename gnu/packages/{linux-libre-4.10-x86_64.conf => aux-files/linux-libre/4.10-x86_64.conf} (100%) rename gnu/packages/{linux-libre-4.4-i686.conf => aux-files/linux-libre/4.4-i686.conf} (100%) rename gnu/packages/{linux-libre-4.4-x86_64.conf => aux-files/linux-libre/4.4-x86_64.conf} (100%) rename gnu/packages/{linux-libre-4.9-i686.conf => aux-files/linux-libre/4.9-i686.conf} (100%) rename gnu/packages/{linux-libre-4.9-x86_64.conf => aux-files/linux-libre/4.9-x86_64.conf} (100%) diff --git a/Makefile.am b/Makefile.am index 0de2e0987c..2e048f99ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès # Copyright © 2013 Andreas Enge -# Copyright © 2015 Alex Kost +# Copyright © 2015, 2017 Alex Kost # Copyright © 2016 Mathieu Lirzin # Copyright © 2016, 2017 Mark H Weaver # @@ -196,16 +196,16 @@ endif BUILD_DAEMON_OFFLOAD # Internal modules with test suite support. dist_noinst_DATA = guix/tests.scm guix/tests/http.scm -# Linux-Libre configurations. -KCONFIGS = \ - gnu/packages/linux-libre-4.10-i686.conf \ - gnu/packages/linux-libre-4.10-x86_64.conf \ - gnu/packages/linux-libre-4.9-i686.conf \ - gnu/packages/linux-libre-4.9-x86_64.conf \ - gnu/packages/linux-libre-4.4-i686.conf \ - gnu/packages/linux-libre-4.4-x86_64.conf \ - gnu/packages/linux-libre-4.1-i686.conf \ - gnu/packages/linux-libre-4.1-x86_64.conf +# Auxiliary files for packages. +AUX_FILES = \ + gnu/packages/aux-files/linux-libre/4.10-i686.conf \ + gnu/packages/aux-files/linux-libre/4.10-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.9-i686.conf \ + gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.4-i686.conf \ + gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.1-i686.conf \ + gnu/packages/aux-files/linux-libre/4.1-x86_64.conf # Templates, examples. EXAMPLES = \ @@ -216,7 +216,7 @@ EXAMPLES = \ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) nobase_dist_guilemodule_DATA = \ - $(MODULES) $(KCONFIGS) $(EXAMPLES) \ + $(MODULES) $(AUX_FILES) $(EXAMPLES) \ $(MISC_DISTRO_FILES) nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm diff --git a/gnu/packages/linux-libre-4.1-i686.conf b/gnu/packages/aux-files/linux-libre/4.1-i686.conf similarity index 100% rename from gnu/packages/linux-libre-4.1-i686.conf rename to gnu/packages/aux-files/linux-libre/4.1-i686.conf diff --git a/gnu/packages/linux-libre-4.1-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.1-x86_64.conf similarity index 100% rename from gnu/packages/linux-libre-4.1-x86_64.conf rename to gnu/packages/aux-files/linux-libre/4.1-x86_64.conf diff --git a/gnu/packages/linux-libre-4.10-i686.conf b/gnu/packages/aux-files/linux-libre/4.10-i686.conf similarity index 100% rename from gnu/packages/linux-libre-4.10-i686.conf rename to gnu/packages/aux-files/linux-libre/4.10-i686.conf diff --git a/gnu/packages/linux-libre-4.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.10-x86_64.conf similarity index 100% rename from gnu/packages/linux-libre-4.10-x86_64.conf rename to gnu/packages/aux-files/linux-libre/4.10-x86_64.conf diff --git a/gnu/packages/linux-libre-4.4-i686.conf b/gnu/packages/aux-files/linux-libre/4.4-i686.conf similarity index 100% rename from gnu/packages/linux-libre-4.4-i686.conf rename to gnu/packages/aux-files/linux-libre/4.4-i686.conf diff --git a/gnu/packages/linux-libre-4.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf similarity index 100% rename from gnu/packages/linux-libre-4.4-x86_64.conf rename to gnu/packages/aux-files/linux-libre/4.4-x86_64.conf diff --git a/gnu/packages/linux-libre-4.9-i686.conf b/gnu/packages/aux-files/linux-libre/4.9-i686.conf similarity index 100% rename from gnu/packages/linux-libre-4.9-i686.conf rename to gnu/packages/aux-files/linux-libre/4.9-i686.conf diff --git a/gnu/packages/linux-libre-4.9-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf similarity index 100% rename from gnu/packages/linux-libre-4.9-x86_64.conf rename to gnu/packages/aux-files/linux-libre/4.9-x86_64.conf 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 ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice -;;; Copyright © 2016 Alex Kost +;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2016 Nicolas Goaziou @@ -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