me
/
guix
Archived
1
0
Fork 0
Code

build: Always ship the (gnu installer …) modules. 

Fixes <https://bugs.gnu.org/35138>.
Reported by Jonathan Brielmaier <jonathan.brielmaier@web.de>.

* gnu/local.mk (INSTALLER_MODULES): New variable.
(GNU_SYSTEM_MODULES, MODULES_NOT_COMPILED): Append $(INSTALLER_MODULES)
conditionally.
master
Ludovic Courtès 2019-04-04 13:23:08 +02:00
parent 660e00507e
commit a7ad4505b7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/local.mk
View File

@ -584,9 +584,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/virtualization.scm \ %D%/tests/virtualization.scm \
%D%/tests/web.scm %D%/tests/web.scm
if ENABLE_INSTALLER INSTALLER_MODULES = \
GNU_SYSTEM_MODULES += \
%D%/installer.scm \ %D%/installer.scm \
%D%/installer/connman.scm \ %D%/installer/connman.scm \
%D%/installer/final.scm \ %D%/installer/final.scm \
@ -618,13 +616,19 @@ GNU_SYSTEM_MODULES += \
%D%/installer/newt/welcome.scm \ %D%/installer/newt/welcome.scm \
%D%/installer/newt/wifi.scm %D%/installer/newt/wifi.scm
# Always ship the installer modules but compile them only when
# ENABLE_INSTALLER is true.
if ENABLE_INSTALLER
GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
elif !ENABLE_INSTALLER
MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
endif
installerdir = $(guilemoduledir)/%D%/installer installerdir = $(guilemoduledir)/%D%/installer
dist_installer_DATA = \ dist_installer_DATA = \
%D%/installer/aux-files/logo.txt \ %D%/installer/aux-files/logo.txt \
%D%/installer/aux-files/SUPPORTED %D%/installer/aux-files/SUPPORTED
endif ENABLE_INSTALLER
# Modules that do not need to be compiled. # Modules that do not need to be compiled.
MODULES_NOT_COMPILED += \ MODULES_NOT_COMPILED += \
%D%/build/shepherd.scm \ %D%/build/shepherd.scm \