From cfc8cc13368118f3c785594553147b5cc01975e5 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 30 Jan 2013 21:20:58 +0100 Subject: [PATCH] Adjustments for the Gluon project --- .../gluon-config-mode}/Makefile | 19 +++++++++---------- .../files/etc/config/config_mode | 0 .../files/etc/hotplug.d/button/50-config-mode | 0 .../files/etc/init.d/config_mode | 0 .../lua/luci/controller/freifunk/index.lua | 0 .../lua/luci/controller/freifunk/wizard.lua | 0 .../model/cbi/freifunk-wizard/hostname.lua | 0 .../model/cbi/freifunk-wizard/meshvpn.lua | 0 .../model/cbi/freifunk-wizard/password.lua | 0 .../lua/luci/tools/freifunk-wizard/nav.lua | 0 .../luci/view/freifunk-wizard/completed.htm | 0 .../lua/luci/view/freifunk-wizard/footer.htm | 0 .../lua/luci/view/freifunk-wizard/header.htm | 0 .../luci/view/freifunk-wizard/meshvpn-key.htm | 0 .../lib/lua/luci/view/freifunk-wizard/nav.htm | 0 .../lua/luci/view/freifunk-wizard/welcome.htm | 0 .../luci/view/freifunk-wizard/wizardform.htm | 0 17 files changed, 9 insertions(+), 10 deletions(-) rename {luci/config-mode => gluon/gluon-config-mode}/Makefile (57%) rename {luci/config-mode => gluon/gluon-config-mode}/files/etc/config/config_mode (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/etc/hotplug.d/button/50-config-mode (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/etc/init.d/config_mode (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/controller/freifunk/index.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/controller/freifunk/wizard.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/hostname.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/meshvpn.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/password.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/tools/freifunk-wizard/nav.lua (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/completed.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/footer.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/header.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/meshvpn-key.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/nav.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/welcome.htm (100%) rename {luci/config-mode => gluon/gluon-config-mode}/files/usr/lib/lua/luci/view/freifunk-wizard/wizardform.htm (100%) diff --git a/luci/config-mode/Makefile b/gluon/gluon-config-mode/Makefile similarity index 57% rename from luci/config-mode/Makefile rename to gluon/gluon-config-mode/Makefile index 811cdf2..2cdac31 100644 --- a/luci/config-mode/Makefile +++ b/gluon/gluon-config-mode/Makefile @@ -3,23 +3,22 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=config-mode +PKG_NAME:=gluon-config-mode PKG_RELEASE:=0.0.1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk -define Package/config-mode - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=9. Freifunk - TITLE:=Luci based config-mode for userfriendly setup of new meshnodes +define Package/gluon-config-mode + SECTION:=gluon + CATEGORY:=Gluon + TITLE:=Luci based config mode for user friendly setup of new meshnodes DEPENDS:=+luci-mod-admin-core endef -define Package/config-mode/description - Luci based config-mode +define Package/gluon-config-mode/description + Luci based config mode endef define Build/Prepare @@ -32,8 +31,8 @@ endef define Build/Compile endef -define Package/config-mode/install +define Package/gluon-config-mode/install $(CP) ./files/* $(1)/ endef -$(eval $(call BuildPackage,config-mode)) +$(eval $(call BuildPackage,gluon-config-mode)) diff --git a/luci/config-mode/files/etc/config/config_mode b/gluon/gluon-config-mode/files/etc/config/config_mode similarity index 100% rename from luci/config-mode/files/etc/config/config_mode rename to gluon/gluon-config-mode/files/etc/config/config_mode diff --git a/luci/config-mode/files/etc/hotplug.d/button/50-config-mode b/gluon/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode similarity index 100% rename from luci/config-mode/files/etc/hotplug.d/button/50-config-mode rename to gluon/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode diff --git a/luci/config-mode/files/etc/init.d/config_mode b/gluon/gluon-config-mode/files/etc/init.d/config_mode similarity index 100% rename from luci/config-mode/files/etc/init.d/config_mode rename to gluon/gluon-config-mode/files/etc/init.d/config_mode diff --git a/luci/config-mode/files/usr/lib/lua/luci/controller/freifunk/index.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/freifunk/index.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/controller/freifunk/index.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/freifunk/index.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/controller/freifunk/wizard.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/freifunk/wizard.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/controller/freifunk/wizard.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/freifunk/wizard.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/hostname.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/hostname.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/hostname.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/hostname.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/meshvpn.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/meshvpn.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/meshvpn.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/meshvpn.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/password.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/password.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/password.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/freifunk-wizard/password.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/tools/freifunk-wizard/nav.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/tools/freifunk-wizard/nav.lua similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/tools/freifunk-wizard/nav.lua rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/tools/freifunk-wizard/nav.lua diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/completed.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/completed.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/completed.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/completed.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/footer.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/footer.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/footer.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/footer.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/header.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/header.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/header.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/header.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/meshvpn-key.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/meshvpn-key.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/meshvpn-key.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/meshvpn-key.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/nav.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/nav.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/nav.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/nav.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/welcome.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/welcome.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/welcome.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/welcome.htm diff --git a/luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/wizardform.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/wizardform.htm similarity index 100% rename from luci/config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/wizardform.htm rename to gluon/gluon-config-mode/files/usr/lib/lua/luci/view/freifunk-wizard/wizardform.htm