nosquash: disable illume building, blacklist illume modules

3 files changed, 23 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 18ea7a2d6b..6eae48068a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -909,7 +909,7 @@ AC_E_OPTIONAL_MODULE([gadman], true)
 AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
 AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
 AC_E_OPTIONAL_MODULE([bluez4], true, [CHECK_MODULE_BLUEZ4])
-AC_E_OPTIONAL_MODULE([illume2], true)
+#AC_E_OPTIONAL_MODULE([illume2], true)
 AC_E_OPTIONAL_MODULE([syscon], true)
 AC_E_OPTIONAL_MODULE([everything], true)
 AC_E_OPTIONAL_MODULE([systray], true)
@@ -1019,16 +1019,6 @@ src/modules/gadman/module.desktop
 src/modules/mixer/module.desktop
 src/modules/connman/module.desktop
 src/modules/bluez4/module.desktop
-src/modules/illume2/doc/illume.dox
-src/modules/illume2/module.desktop
-src/modules/illume-home/module.desktop
-src/modules/illume-home-toggle/module.desktop
-src/modules/illume-softkey/module.desktop
-src/modules/illume-keyboard/module.desktop
-src/modules/illume-indicator/module.desktop
-src/modules/illume-kbd-toggle/module.desktop
-src/modules/illume-mode-toggle/module.desktop
-src/modules/illume-bluetooth/module.desktop
 src/modules/syscon/module.desktop
 src/modules/everything/module.desktop
 src/modules/everything/everything.pc
@@ -1055,6 +1045,17 @@ doc/e.dox
 $po_makefile_in
 ])
 
+#src/modules/illume2/doc/illume.dox
+#src/modules/illume2/module.desktop
+#src/modules/illume-home/module.desktop
+#src/modules/illume-home-toggle/module.desktop
+#src/modules/illume-softkey/module.desktop
+#src/modules/illume-keyboard/module.desktop
+#src/modules/illume-indicator/module.desktop
+#src/modules/illume-kbd-toggle/module.desktop
+#src/modules/illume-mode-toggle/module.desktop
+#src/modules/illume-bluetooth/module.desktop
+
 # report
 txt_strip() {
   echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index e8829bd7b8..58b87d0068 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -894,15 +894,6 @@ _e_module_whitelist_check(void)
       "gadman",
       "ibar",
       "ibox",
-      "illume2",
-      "illume-bluetooth",
-      "illume-home",
-      "illume-home-toggle",
-      "illume-indicator",
-      "illume-kbd-toggle",
-      "illume-keyboard",
-      "illume-mode-toggle",
-      "illume-softkey",
       "layout",
       "mixer",
       "msgbus",
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index e83048c0f7..a9a43862db 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -150,17 +150,17 @@ if USE_MODULE_MIXER
 include src/modules/Makefile_mixer.mk
 endif
 
-if USE_MODULE_ILLUME2
-include src/modules/Makefile_illume2.mk
-include src/modules/Makefile_illume-home.mk
-include src/modules/Makefile_illume-home-toggle.mk
-include src/modules/Makefile_illume-softkey.mk
-include src/modules/Makefile_illume-keyboard.mk
-include src/modules/Makefile_illume-indicator.mk
-include src/modules/Makefile_illume-kbd-toggle.mk
-include src/modules/Makefile_illume-mode-toggle.mk
-include src/modules/Makefile_illume-bluetooth.mk
-endif
+#if USE_MODULE_ILLUME2
+#include src/modules/Makefile_illume2.mk
+#include src/modules/Makefile_illume-home.mk
+#include src/modules/Makefile_illume-home-toggle.mk
+#include src/modules/Makefile_illume-softkey.mk
+#include src/modules/Makefile_illume-keyboard.mk
+#include src/modules/Makefile_illume-indicator.mk
+#include src/modules/Makefile_illume-kbd-toggle.mk
+#include src/modules/Makefile_illume-mode-toggle.mk
+#include src/modules/Makefile_illume-bluetooth.mk
+#endif
 
 if USE_MODULE_SYSCON
 include src/modules/Makefile_syscon.mk