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.master
Alex Kost
parent
96eaa55ffb
commit
7994250fdb
24
Makefile.am
24
Makefile.am
|
|
@ -1,7 +1,7 @@
|
||||||
# GNU Guix --- Functional package management for GNU
|
# GNU Guix --- Functional package management for GNU
|
||||||
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
# Copyright © 2015 Alex Kost <alezost@gmail.com>
|
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
|
||||||
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||||
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||||
#
|
#
|
||||||
|
|
@ -196,16 +196,16 @@ endif BUILD_DAEMON_OFFLOAD
|
||||||
# Internal modules with test suite support.
|
# Internal modules with test suite support.
|
||||||
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
||||||
|
|
||||||
# Linux-Libre configurations.
|
# Auxiliary files for packages.
|
||||||
KCONFIGS = \
|
AUX_FILES = \
|
||||||
gnu/packages/linux-libre-4.10-i686.conf \
|
gnu/packages/aux-files/linux-libre/4.10-i686.conf \
|
||||||
gnu/packages/linux-libre-4.10-x86_64.conf \
|
gnu/packages/aux-files/linux-libre/4.10-x86_64.conf \
|
||||||
gnu/packages/linux-libre-4.9-i686.conf \
|
gnu/packages/aux-files/linux-libre/4.9-i686.conf \
|
||||||
gnu/packages/linux-libre-4.9-x86_64.conf \
|
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \
|
||||||
gnu/packages/linux-libre-4.4-i686.conf \
|
gnu/packages/aux-files/linux-libre/4.4-i686.conf \
|
||||||
gnu/packages/linux-libre-4.4-x86_64.conf \
|
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \
|
||||||
gnu/packages/linux-libre-4.1-i686.conf \
|
gnu/packages/aux-files/linux-libre/4.1-i686.conf \
|
||||||
gnu/packages/linux-libre-4.1-x86_64.conf
|
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf
|
||||||
|
|
||||||
# Templates, examples.
|
# Templates, examples.
|
||||||
EXAMPLES = \
|
EXAMPLES = \
|
||||||
|
|
@ -216,7 +216,7 @@ EXAMPLES = \
|
||||||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
||||||
|
|
||||||
nobase_dist_guilemodule_DATA = \
|
nobase_dist_guilemodule_DATA = \
|
||||||
$(MODULES) $(KCONFIGS) $(EXAMPLES) \
|
$(MODULES) $(AUX_FILES) $(EXAMPLES) \
|
||||||
$(MISC_DISTRO_FILES)
|
$(MISC_DISTRO_FILES)
|
||||||
nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
|
nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||||
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; 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 Raymond Nicholson <rain1@openmailbox.org>
|
||||||
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||||
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||||
|
|
@ -194,11 +194,10 @@
|
||||||
(define* (kernel-config arch #:key variant)
|
(define* (kernel-config arch #:key variant)
|
||||||
"Return the absolute file name of the Linux-Libre build configuration file
|
"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."
|
for ARCH and optionally VARIANT, or #f if there is no such configuration."
|
||||||
(let* ((name (string-append "linux-libre-"
|
(let* ((name (string-append (if variant (string-append variant "-") "")
|
||||||
(if variant (string-append variant "-") "")
|
|
||||||
(if (string=? "i386" arch) "i686" arch) ".conf"))
|
(if (string=? "i386" arch) "i686" arch) ".conf"))
|
||||||
(file (string-append "gnu/packages/" name)))
|
(file (string-append "linux-libre/" name)))
|
||||||
(search-path %load-path file)))
|
(search-auxiliary-file file)))
|
||||||
|
|
||||||
(define %default-extra-linux-options
|
(define %default-extra-linux-options
|
||||||
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
|
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
|
||||||
|
|
|
||||||
Reference in New Issue