rule dependency

[blast] / modules / nodm.mk

diff --git a/modules/nodm.mk b/modules/nodm.mk
index f871f432995572eb64a01a71bcf9251052fd3c4b..584759243276ce846cc4469850919ee22028090b 100644 (file)
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -1,16 +1,18 @@
 ifdef raspi
-  PACKAGES += nodm xserver-xorg-video-fbturbo xserver-xorg-input-evdev
+  PACKAGES += nodm xserver-xorg-input-evdev libgl1-mesa-dri
 else
-  PACKAGES += nodm xserver-xorg-video-all xserver-xorg-input-all
+  PACKAGES += nodm xserver-xorg-video-all xserver-xorg-input-all libgl1-mesa-dri
 endif
 
 define DEBCONF +=
+
 nodm   nodm/enabled    boolean true
 endef
 
 ifdef nodm_user
   _config: _nodm_user _nodm_cfg
 define DEBCONF +=
+
 nodm   nodm/user       string  ${nodm_user}
 endef
 endif
@@ -23,6 +25,7 @@ ifdef webui
     PACKAGES += chromium
   endif
 define DEBCONF +=
+
 nodm   nodm/xsession   string  /usr/bin/chromium --app=${webui}
 endef
 endif
@@ -30,10 +33,14 @@ endif
 .PHONY: _nodm_user _nodm_cfg
 
 _nodm_cfg: ${CFGROOT}
-       #printf '%s\n' "$${DEBCONF}" |chroot "$${CFGROOT}" debconf-set-selections
        rm "$${CFGROOT}/etc/default/nodm"
        chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm
 
+ifdef users
+  _nodm_user: _users
+endif
+
 _nodm_user: ${CFGROOT}
        chroot "${CFGROOT}" adduser "${nodm_user}" video
        chroot "${CFGROOT}" adduser "${nodm_user}" input
+