alex
/
gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gluon-setup-mode: move HTTP server support to gluon-config-mode-core, add gluon-lock-password

This commit is contained in:
Matthias Schiffer 2018-02-25 23:05:54 +01:00
parent 9648489a01
commit 3925344292
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/gluon-config-mode-core/Makefile
View File

@ -17,7 +17,7 @@ define Package/gluon-config-mode-core
SECTION:=gluon
CATEGORY:=Gluon
TITLE:=Configuration wizard for user friendly setup of new mesh nodes
DEPENDS:=+gluon-setup-mode +gluon-web-theme +gluon-lock-password +pretty-hostname
DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-web-theme +uhttpd
endef
define Build/Prepare
@ -35,6 +35,12 @@ endef
define Package/gluon-config-mode-core/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
$(call GluonInstallI18N,gluon-config-mode-core,$(1))
endef

0
package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50uhttpd → package/gluon-config-mode-core/files/lib/gluon/setup-mode/rc.d/S50uhttpd
View File

2
package/gluon-setup-mode/Makefile
View File

@ -15,7 +15,7 @@ define Package/gluon-setup-mode
SECTION:=gluon
CATEGORY:=Gluon
TITLE:=Setup mode
DEPENDS:=+gluon-core +gluon-web-model +ubus +uhttpd +dnsmasq
DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq
endef
define Package/gluon-setup-mode/description