build: introduce luci-base

Merges libs/core, libs/ipkg, libs/web, libs/sys, libs/sgi-cgi, libs/sgi-uhttpd,
modules/admin-core, themes/base and protcols/core into modules/base and renames
luci-lib-core to luci-base.

diff --git a/Makefile b/Makefile
index b99e8f710d76aefd7dc4f0279f0ead4f49da7f8d..70a7e92a40df5c00db63ae4c9bf1f3ff4a234971 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-       make -C libs/web CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
+       make -C modules/base CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
        for i in $(MODULES); do \
                make -C$$i SDK="$(shell test -f .running-sdk && echo 1)" compile || { \
                        echo "*** Compilation of $$i failed!"; \
@@ -33,7 +33,7 @@ i18nbuild:
 clean:
        rm -f .running-sdk
        rm -rf docs
-       make -C libs/web host-clean
+       make -C modules/base host-clean
        for i in $(MODULES); do make -C$$i clean; done
 
 

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index c223054a23e7d07dc9d05fe0ca2560e389eecd80..6a51a6adf79ac31ff46f2a78b72cbb1630178a12 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -49,7 +49,7 @@ define Package/luci-mod-freifunk-community
   TITLE:=Freifunk Community Meta-Package
   DEPENDS+=$(call add_deps,mod-freifunk-community, \
     iptables-mod-nat-extra iptables-mod-ipopt \
-       luci-lib-web luci-app-splash luci-i18n-german \
+       luci-app-splash luci-i18n-german \
        olsrd olsrd-mod-dyn-gw-plain \
        olsrd-mod-jsoninfo olsrd-mod-nameservice \
        olsrd-mod-watchdog kmod-tun \
@@ -224,8 +224,7 @@ define theme
     SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
        MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
-       DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
-       $(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
+       DEPENDS:=+luci-base $(4)
   endef
 
   define Package/luci-theme-$(1)/install

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 8bb35319bf247630ad02a489c8846ecc44797cc5..b875f0d70651f42f4d96c14876556a06286b7452 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -32,7 +32,7 @@ endef
 
 
 ### Core package ###
-define Package/luci-lib-core
+define Package/luci-base
   SECTION:=luci
   CATEGORY:=LuCI
   TITLE:=LuCI - Lua Configuration Interface
@@ -43,8 +43,8 @@ define Package/luci-lib-core
   TITLE:=LuCI core libraries
 endef
 
-define Package/luci-lib-core/install
-       $(call Package/luci/install/template,$(1),libs/core)
+define Package/luci-base/install
+       $(call Package/luci/install/template,$(1),modules/base)
        $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
                "OpenWrt Firmware" \
                "$(OPENWRTVERSION)" \
@@ -52,43 +52,47 @@ define Package/luci-lib-core/install
                "$(PKG_VERSION)"
 endef
 
-define Package/luci-lib-core/config
+define Package/luci-base/config
        choice
                prompt "Build Target"
-               default PACKAGE_luci-lib-core_source
+               default PACKAGE_luci-base_source
 
-       config PACKAGE_luci-lib-core_compile
+       config PACKAGE_luci-base_compile
                bool "Precompiled"
 
-       config PACKAGE_luci-lib-core_stripped
+       config PACKAGE_luci-base_stripped
                bool "Stripped"
 
-       config PACKAGE_luci-lib-core_srcdiet
+       config PACKAGE_luci-base_srcdiet
                bool "Compressed Source"
 
-       config PACKAGE_luci-lib-core_source
+       config PACKAGE_luci-base_source
                bool "Full Source"
 
        endchoice
 endef
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),)
+define Package/luci-base/conffiles
+/etc/config/luci
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-base_compile),)
   LUA_TARGET:=compile
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),)
+ifneq ($(CONFIG_PACKAGE_luci-base_stripped),)
   LUA_TARGET:=strip
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),)
+ifneq ($(CONFIG_PACKAGE_luci-base_srcdiet),)
   LUA_TARGET:=diet
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core),)
-  LUCI_SELECTED_MODULES+=libs/core
+ifneq ($(CONFIG_PACKAGE_luci-base),)
+  LUCI_SELECTED_MODULES+=modules/base
 endif
 
-LUCI_BUILD_PACKAGES += luci-lib-core
+LUCI_BUILD_PACKAGES += luci-base
 
 
 ### Libraries ###
@@ -101,7 +105,7 @@ define library
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
     SUBMENU:=8. Libraries
     TITLE:=$(if $(2),$(2),LuCI $(1) library)
-    $(if $(3),DEPENDS:=+luci-lib-core $(3))
+    $(if $(3),DEPENDS:=+luci-base $(3))
   endef
 
   define Package/luci-lib-$(1)/install
@@ -116,10 +120,6 @@ define library
   LUCI_BUILD_PACKAGES += luci-lib-$(1)
 endef
 
-define Package/luci-lib-web/conffiles
-/etc/config/luci
-endef
-
 define Package/luci-lib-nixio/config
        choice
                prompt "TLS Provider"
@@ -158,14 +158,11 @@ ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),)
 endif
 
 
-$(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio))
-$(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library))
+$(eval $(call library,httpclient,HTTP(S) client library,+luci-base +luci-lib-nixio))
 $(eval $(call library,json,LuCI JSON library))
 $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl))
 $(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio))
-$(eval $(call library,sys,LuCI Linux/POSIX system library))
-$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi))
-$(eval $(call library,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-lib-core))
+$(eval $(call library,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-base))
 
 
 ### Protocols ###
@@ -192,7 +189,6 @@ define protocol
   LUCI_BUILD_PACKAGES += luci-proto-$(1)
 endef
 
-$(eval $(call protocol,core,Support for static/dhcp/none))
 $(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
 $(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd/DS-Lite))
 $(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
@@ -225,14 +221,9 @@ define module
 endef
 
 
-define Package/luci-mod-admin-core/extra-install
-       touch $(1)/etc/init.d/luci_fixtime || true
-endef
-
-$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english))
-$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN))
-$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg))
-$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-mod-admin-core))
+$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-base @BROKEN))
+$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-base))
+$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-base))
 $(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json))
 
 
@@ -270,34 +261,6 @@ $(eval $(call application,qos,Quality of Service configuration module,\
 $(eval $(call application,commands,LuCI Shell Command Module))
 
 
-### Server Gateway Interfaces ###
-define sgi
-  define Package/luci-sgi-$(1)
-    SECTION:=luci
-    CATEGORY:=LuCI
-    TITLE:=LuCI - Lua Configuration Interface
-    URL:=http://luci.subsignal.org/
-    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=7. Server Interfaces
-    TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface)
-       DEPENDS:=$(3)
-  endef
-
-  define Package/luci-sgi-$(1)/install
-       $(call Package/luci/install/template,$$(1),libs/sgi-$(1))
-  endef
-
-  ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),)
-    LUCI_SELECTED_MODULES+=libs/sgi-$(1)
-  endif
-
-  LUCI_BUILD_PACKAGES += luci-sgi-$(1)
-endef
-
-$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver))
-$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua))
-
-
 ### Themes ###
 define theme
   define Package/luci-theme-$(1)
@@ -308,8 +271,8 @@ define theme
     SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
        MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
-       DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
-       $(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
+       DEPENDS:=+luci-base $(4)
+       $(if $(5),DEFAULT:=PACKAGE_luci-base)
   endef
 
   define Package/luci-theme-$(1)/install
@@ -323,7 +286,6 @@ define theme
   LUCI_BUILD_PACKAGES += luci-theme-$(1)
 endef
 
-$(eval $(call theme,base,Common base for all themes))
 $(eval $(call theme,openwrt,OpenWrt.org))
 $(eval $(call theme,bootstrap,Bootstrap Theme (default),,,1))
 
@@ -397,7 +359,7 @@ $(eval $(call collection,,\
        Standard OpenWrt set including full admin with ppp support and the \
        default OpenWrt theme,\
        +uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
-       +luci-app-firewall +luci-proto-core +luci-proto-ppp +libiwinfo-lua))
+       +luci-app-firewall +luci-proto-ppp +libiwinfo-lua))
 
 $(eval $(call collection,ssl,\
        Standard OpenWrt set with HTTPS support,\

diff --git a/libs/core/Makefile b/libs/core/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/libs/core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk

diff --git a/libs/ipkg/Makefile b/libs/ipkg/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/libs/ipkg/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk

diff --git a/libs/sgi-cgi/Makefile b/libs/sgi-cgi/Makefile
deleted file mode 100644 (file)
index 81a96f6..0000000
--- a/libs/sgi-cgi/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file

diff --git a/libs/sgi-uhttpd/Makefile b/libs/sgi-uhttpd/Makefile
deleted file mode 100644 (file)
index 81a96f6..0000000
--- a/libs/sgi-uhttpd/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file

diff --git a/libs/sys/Makefile b/libs/sys/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/libs/sys/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk

diff --git a/modules/admin-core/Makefile b/modules/admin-core/Makefile
deleted file mode 100644 (file)
index 81a96f6..0000000
--- a/modules/admin-core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file

diff --git a/modules/admin-core/ipkg/postinst b/modules/admin-core/ipkg/postinst
deleted file mode 100755 (executable)
index a756b5b..0000000
--- a/modules/admin-core/ipkg/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/luci_fixtime enabled || /etc/init.d/luci_fixtime enable
-       /etc/init.d/luci_dhcp_migrate enabled || /etc/init.d/luci_dhcp_migrate enable
-       exit 0
-}

diff --git a/modules/admin-core/root/etc/init.d/luci_dhcp_migrate b/modules/admin-core/root/etc/init.d/luci_dhcp_migrate
deleted file mode 100755 (executable)
index 7fb4435..0000000
--- a/modules/admin-core/root/etc/init.d/luci_dhcp_migrate
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=59
-
-boot() {
-       if [ -f /etc/config/luci_ethers ]; then
-               logger -t luci_dhcp_migrate "Migrating luci_ethers configuration ..."
-
-               lua -lluci.model.uci -e '
-                       x=luci.model.uci.cursor()
-                       x:foreach("luci_ethers", "static_lease",
-                       function(s)
-                               x:section("dhcp", "host", nil, {mac=s.macaddr, ip=s.ipaddr})
-                       end)
-                       x:save("dhcp")
-                       x:commit("dhcp")
-               '
-
-               rm -f /etc/config/luci_ethers
-       fi
-
-       if [ -f /etc/config/luci_hosts ]; then
-               logger -t luci_dhcp_migrate "Migrating luci_hosts configuration ..."
-
-               lua -lluci.model.uci -e '
-                       x=luci.model.uci.cursor()
-                       x:foreach("luci_hosts", "host",
-                       function(s)
-                               x:section("dhcp", "domain", nil, {name=s.hostname, ip=s.ipaddr})
-                       end)
-                       x:save("dhcp")
-                       x:commit("dhcp")
-               '
-
-               rm -f /etc/config/luci_hosts
-       fi
-}
-
-start() { :; }
-stop() { :; }
-

diff --git a/modules/admin-core/root/etc/init.d/luci_fixtime b/modules/admin-core/root/etc/init.d/luci_fixtime
deleted file mode 100755 (executable)
index 154a786..0000000
--- a/modules/admin-core/root/etc/init.d/luci_fixtime
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=05
-STOP=95
-
-start() {
-       cat <<' EOF' | lua -l luci.fs -l luci.util -
-               if (os.time() < 1000000000) then
-                       os.execute('date -s ' .. os.date('%Y%m%d%H%M', luci.fs.mtime("/etc/init.d/luci_fixtime")))
-               end
-       EOF
-}
-
-stop() {
-       [[ -w /etc/init.d/luci_fixtime ]] && cat /dev/null >> /etc/init.d/luci_fixtime && touch /etc/init.d/luci_fixtime
-}

diff --git a/libs/web/Makefile b/modules/base/Makefile
similarity index 100%
rename from libs/web/Makefile
rename to modules/base/Makefile

diff --git a/libs/sgi-cgi/htdocs/cgi-bin/luci b/modules/base/htdocs/cgi-bin/luci
similarity index 100%
rename from libs/sgi-cgi/htdocs/cgi-bin/luci
rename to modules/base/htdocs/cgi-bin/luci

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/modules/base/htdocs/luci-static/resources/cbi.js
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi.js
rename to modules/base/htdocs/luci-static/resources/cbi.js

diff --git a/libs/web/htdocs/luci-static/resources/cbi/add.gif b/modules/base/htdocs/luci-static/resources/cbi/add.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/add.gif
rename to modules/base/htdocs/luci-static/resources/cbi/add.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/apply.gif b/modules/base/htdocs/luci-static/resources/cbi/apply.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/apply.gif
rename to modules/base/htdocs/luci-static/resources/cbi/apply.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/arrow.gif b/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/arrow.gif
rename to modules/base/htdocs/luci-static/resources/cbi/arrow.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/down.gif b/modules/base/htdocs/luci-static/resources/cbi/down.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/down.gif
rename to modules/base/htdocs/luci-static/resources/cbi/down.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/download.gif b/modules/base/htdocs/luci-static/resources/cbi/download.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/download.gif
rename to modules/base/htdocs/luci-static/resources/cbi/download.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/edit.gif b/modules/base/htdocs/luci-static/resources/cbi/edit.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/edit.gif
rename to modules/base/htdocs/luci-static/resources/cbi/edit.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif b/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif
rename to modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/file.gif b/modules/base/htdocs/luci-static/resources/cbi/file.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/file.gif
rename to modules/base/htdocs/luci-static/resources/cbi/file.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/find.gif b/modules/base/htdocs/luci-static/resources/cbi/find.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/find.gif
rename to modules/base/htdocs/luci-static/resources/cbi/find.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/folder.gif b/modules/base/htdocs/luci-static/resources/cbi/folder.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/folder.gif
rename to modules/base/htdocs/luci-static/resources/cbi/folder.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/help.gif b/modules/base/htdocs/luci-static/resources/cbi/help.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/help.gif
rename to modules/base/htdocs/luci-static/resources/cbi/help.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/key.gif b/modules/base/htdocs/luci-static/resources/cbi/key.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/key.gif
rename to modules/base/htdocs/luci-static/resources/cbi/key.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/link.gif b/modules/base/htdocs/luci-static/resources/cbi/link.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/link.gif
rename to modules/base/htdocs/luci-static/resources/cbi/link.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/reload.gif b/modules/base/htdocs/luci-static/resources/cbi/reload.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/reload.gif
rename to modules/base/htdocs/luci-static/resources/cbi/reload.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/remove.gif b/modules/base/htdocs/luci-static/resources/cbi/remove.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/remove.gif
rename to modules/base/htdocs/luci-static/resources/cbi/remove.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/reset.gif b/modules/base/htdocs/luci-static/resources/cbi/reset.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/reset.gif
rename to modules/base/htdocs/luci-static/resources/cbi/reset.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/save.gif b/modules/base/htdocs/luci-static/resources/cbi/save.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/save.gif
rename to modules/base/htdocs/luci-static/resources/cbi/save.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/up.gif b/modules/base/htdocs/luci-static/resources/cbi/up.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/up.gif
rename to modules/base/htdocs/luci-static/resources/cbi/up.gif

diff --git a/libs/web/htdocs/luci-static/resources/cbi/user.gif b/modules/base/htdocs/luci-static/resources/cbi/user.gif
similarity index 100%
rename from libs/web/htdocs/luci-static/resources/cbi/user.gif
rename to modules/base/htdocs/luci-static/resources/cbi/user.gif

diff --git a/themes/base/htdocs/luci-static/resources/icons/bridge.png b/modules/base/htdocs/luci-static/resources/icons/bridge.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/bridge.png
rename to modules/base/htdocs/luci-static/resources/icons/bridge.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/bridge_disabled.png b/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/bridge_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/encryption.png b/modules/base/htdocs/luci-static/resources/icons/encryption.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/encryption.png
rename to modules/base/htdocs/luci-static/resources/icons/encryption.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/encryption_disabled.png b/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/encryption_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/ethernet.png b/modules/base/htdocs/luci-static/resources/icons/ethernet.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/ethernet.png
rename to modules/base/htdocs/luci-static/resources/icons/ethernet.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/ethernet_disabled.png b/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/loading.gif b/modules/base/htdocs/luci-static/resources/icons/loading.gif
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/loading.gif
rename to modules/base/htdocs/luci-static/resources/icons/loading.gif

diff --git a/themes/base/htdocs/luci-static/resources/icons/port_down.png b/modules/base/htdocs/luci-static/resources/icons/port_down.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/port_down.png
rename to modules/base/htdocs/luci-static/resources/icons/port_down.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/port_up.png b/modules/base/htdocs/luci-static/resources/icons/port_up.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/port_up.png
rename to modules/base/htdocs/luci-static/resources/icons/port_up.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-0-25.png b/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-0-25.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-0-25.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-0.png b/modules/base/htdocs/luci-static/resources/icons/signal-0.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-0.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-0.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-25-50.png b/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-25-50.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-25-50.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-50-75.png b/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-50-75.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-50-75.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-75-100.png b/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-75-100.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-75-100.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-none.png b/modules/base/htdocs/luci-static/resources/icons/signal-none.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/signal-none.png
rename to modules/base/htdocs/luci-static/resources/icons/signal-none.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/switch.png b/modules/base/htdocs/luci-static/resources/icons/switch.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/switch.png
rename to modules/base/htdocs/luci-static/resources/icons/switch.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/switch_disabled.png b/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/switch_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/switch_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/tunnel.png b/modules/base/htdocs/luci-static/resources/icons/tunnel.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/tunnel.png
rename to modules/base/htdocs/luci-static/resources/icons/tunnel.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/tunnel_disabled.png b/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/vlan.png b/modules/base/htdocs/luci-static/resources/icons/vlan.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/vlan.png
rename to modules/base/htdocs/luci-static/resources/icons/vlan.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/vlan_disabled.png b/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/vlan_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi.png b/modules/base/htdocs/luci-static/resources/icons/wifi.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/wifi.png
rename to modules/base/htdocs/luci-static/resources/icons/wifi.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_big.png b/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/wifi_big.png
rename to modules/base/htdocs/luci-static/resources/icons/wifi_big.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png b/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_disabled.png b/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/icons/wifi_disabled.png
rename to modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png

diff --git a/themes/base/htdocs/luci-static/resources/xhr.js b/modules/base/htdocs/luci-static/resources/xhr.js
similarity index 100%
rename from themes/base/htdocs/luci-static/resources/xhr.js
rename to modules/base/htdocs/luci-static/resources/xhr.js

diff --git a/libs/core/luasrc/ccache.lua b/modules/base/luasrc/ccache.lua
similarity index 100%
rename from libs/core/luasrc/ccache.lua
rename to modules/base/luasrc/ccache.lua

diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/base/luasrc/controller/admin/servicectl.lua
similarity index 100%
rename from modules/admin-core/luasrc/controller/admin/servicectl.lua
rename to modules/base/luasrc/controller/admin/servicectl.lua

diff --git a/libs/core/luasrc/debug.lua b/modules/base/luasrc/debug.lua
similarity index 100%
rename from libs/core/luasrc/debug.lua
rename to modules/base/luasrc/debug.lua

diff --git a/libs/core/luasrc/fs.lua b/modules/base/luasrc/fs.lua
similarity index 100%
rename from libs/core/luasrc/fs.lua
rename to modules/base/luasrc/fs.lua

diff --git a/libs/core/luasrc/init.lua b/modules/base/luasrc/init.lua
similarity index 100%
rename from libs/core/luasrc/init.lua
rename to modules/base/luasrc/init.lua

diff --git a/libs/core/luasrc/ip.lua b/modules/base/luasrc/ip.lua
similarity index 100%
rename from libs/core/luasrc/ip.lua
rename to modules/base/luasrc/ip.lua

diff --git a/libs/core/luasrc/ltn12.lua b/modules/base/luasrc/ltn12.lua
similarity index 100%
rename from libs/core/luasrc/ltn12.lua
rename to modules/base/luasrc/ltn12.lua

diff --git a/libs/web/luasrc/cacheloader.lua b/modules/base/luasrc/luasrc/cacheloader.lua
similarity index 100%
rename from libs/web/luasrc/cacheloader.lua
rename to modules/base/luasrc/luasrc/cacheloader.lua

diff --git a/libs/web/luasrc/cbi.lua b/modules/base/luasrc/luasrc/cbi.lua
similarity index 100%
rename from libs/web/luasrc/cbi.lua
rename to modules/base/luasrc/luasrc/cbi.lua

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/modules/base/luasrc/luasrc/cbi/datatypes.lua
similarity index 100%
rename from libs/web/luasrc/cbi/datatypes.lua
rename to modules/base/luasrc/luasrc/cbi/datatypes.lua

diff --git a/libs/web/luasrc/config.lua b/modules/base/luasrc/luasrc/config.lua
similarity index 100%
rename from libs/web/luasrc/config.lua
rename to modules/base/luasrc/luasrc/config.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/modules/base/luasrc/luasrc/dispatcher.lua
similarity index 100%
rename from libs/web/luasrc/dispatcher.lua
rename to modules/base/luasrc/luasrc/dispatcher.lua

diff --git a/libs/web/luasrc/http.lua b/modules/base/luasrc/luasrc/http.lua
similarity index 100%
rename from libs/web/luasrc/http.lua
rename to modules/base/luasrc/luasrc/http.lua

diff --git a/libs/web/luasrc/http/protocol.lua b/modules/base/luasrc/luasrc/http/protocol.lua
similarity index 100%
rename from libs/web/luasrc/http/protocol.lua
rename to modules/base/luasrc/luasrc/http/protocol.lua

diff --git a/libs/web/luasrc/http/protocol/conditionals.lua b/modules/base/luasrc/luasrc/http/protocol/conditionals.lua
similarity index 100%
rename from libs/web/luasrc/http/protocol/conditionals.lua
rename to modules/base/luasrc/luasrc/http/protocol/conditionals.lua

diff --git a/libs/web/luasrc/http/protocol/date.lua b/modules/base/luasrc/luasrc/http/protocol/date.lua
similarity index 100%
rename from libs/web/luasrc/http/protocol/date.lua
rename to modules/base/luasrc/luasrc/http/protocol/date.lua

diff --git a/libs/web/luasrc/http/protocol/mime.lua b/modules/base/luasrc/luasrc/http/protocol/mime.lua
similarity index 100%
rename from libs/web/luasrc/http/protocol/mime.lua
rename to modules/base/luasrc/luasrc/http/protocol/mime.lua

diff --git a/libs/web/luasrc/i18n.lua b/modules/base/luasrc/luasrc/i18n.lua
similarity index 100%
rename from libs/web/luasrc/i18n.lua
rename to modules/base/luasrc/luasrc/i18n.lua

diff --git a/libs/web/luasrc/sauth.lua b/modules/base/luasrc/luasrc/sauth.lua
similarity index 100%
rename from libs/web/luasrc/sauth.lua
rename to modules/base/luasrc/luasrc/sauth.lua

diff --git a/libs/web/luasrc/template.lua b/modules/base/luasrc/luasrc/template.lua
similarity index 100%
rename from libs/web/luasrc/template.lua
rename to modules/base/luasrc/luasrc/template.lua

diff --git a/libs/web/luasrc/view/cbi/apply_xhr.htm b/modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/apply_xhr.htm
rename to modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm

diff --git a/libs/web/luasrc/view/cbi/browser.htm b/modules/base/luasrc/luasrc/view/cbi/browser.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/browser.htm
rename to modules/base/luasrc/luasrc/view/cbi/browser.htm

diff --git a/libs/web/luasrc/view/cbi/button.htm b/modules/base/luasrc/luasrc/view/cbi/button.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/button.htm
rename to modules/base/luasrc/luasrc/view/cbi/button.htm

diff --git a/libs/web/luasrc/view/cbi/cell_valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/cell_valuefooter.htm
rename to modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm

diff --git a/libs/web/luasrc/view/cbi/cell_valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/cell_valueheader.htm
rename to modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm

diff --git a/libs/web/luasrc/view/cbi/compound.htm b/modules/base/luasrc/luasrc/view/cbi/compound.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/compound.htm
rename to modules/base/luasrc/luasrc/view/cbi/compound.htm

diff --git a/libs/web/luasrc/view/cbi/delegator.htm b/modules/base/luasrc/luasrc/view/cbi/delegator.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/delegator.htm
rename to modules/base/luasrc/luasrc/view/cbi/delegator.htm

diff --git a/libs/web/luasrc/view/cbi/dvalue.htm b/modules/base/luasrc/luasrc/view/cbi/dvalue.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/dvalue.htm
rename to modules/base/luasrc/luasrc/view/cbi/dvalue.htm

diff --git a/libs/web/luasrc/view/cbi/dynlist.htm b/modules/base/luasrc/luasrc/view/cbi/dynlist.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/dynlist.htm
rename to modules/base/luasrc/luasrc/view/cbi/dynlist.htm

diff --git a/libs/web/luasrc/view/cbi/filebrowser.htm b/modules/base/luasrc/luasrc/view/cbi/filebrowser.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/filebrowser.htm
rename to modules/base/luasrc/luasrc/view/cbi/filebrowser.htm

diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
rename to modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm

diff --git a/libs/web/luasrc/view/cbi/firewall_zonelist.htm b/modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/firewall_zonelist.htm
rename to modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm

diff --git a/libs/web/luasrc/view/cbi/footer.htm b/modules/base/luasrc/luasrc/view/cbi/footer.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/footer.htm
rename to modules/base/luasrc/luasrc/view/cbi/footer.htm

diff --git a/libs/web/luasrc/view/cbi/full_valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/full_valuefooter.htm
rename to modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm

diff --git a/libs/web/luasrc/view/cbi/full_valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/full_valueheader.htm
rename to modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm

diff --git a/libs/web/luasrc/view/cbi/fvalue.htm b/modules/base/luasrc/luasrc/view/cbi/fvalue.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/fvalue.htm
rename to modules/base/luasrc/luasrc/view/cbi/fvalue.htm

diff --git a/libs/web/luasrc/view/cbi/header.htm b/modules/base/luasrc/luasrc/view/cbi/header.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/header.htm
rename to modules/base/luasrc/luasrc/view/cbi/header.htm

diff --git a/libs/web/luasrc/view/cbi/lvalue.htm b/modules/base/luasrc/luasrc/view/cbi/lvalue.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/lvalue.htm
rename to modules/base/luasrc/luasrc/view/cbi/lvalue.htm

diff --git a/libs/web/luasrc/view/cbi/map.htm b/modules/base/luasrc/luasrc/view/cbi/map.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/map.htm
rename to modules/base/luasrc/luasrc/view/cbi/map.htm

diff --git a/libs/web/luasrc/view/cbi/mvalue.htm b/modules/base/luasrc/luasrc/view/cbi/mvalue.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/mvalue.htm
rename to modules/base/luasrc/luasrc/view/cbi/mvalue.htm

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/network_ifacelist.htm
rename to modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm

diff --git a/libs/web/luasrc/view/cbi/network_netinfo.htm b/modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/network_netinfo.htm
rename to modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm

diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/modules/base/luasrc/luasrc/view/cbi/network_netlist.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/network_netlist.htm
rename to modules/base/luasrc/luasrc/view/cbi/network_netlist.htm

diff --git a/libs/web/luasrc/view/cbi/nsection.htm b/modules/base/luasrc/luasrc/view/cbi/nsection.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/nsection.htm
rename to modules/base/luasrc/luasrc/view/cbi/nsection.htm

diff --git a/libs/web/luasrc/view/cbi/nullsection.htm b/modules/base/luasrc/luasrc/view/cbi/nullsection.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/nullsection.htm
rename to modules/base/luasrc/luasrc/view/cbi/nullsection.htm

diff --git a/libs/web/luasrc/view/cbi/simpleform.htm b/modules/base/luasrc/luasrc/view/cbi/simpleform.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/simpleform.htm
rename to modules/base/luasrc/luasrc/view/cbi/simpleform.htm

diff --git a/libs/web/luasrc/view/cbi/tabcontainer.htm b/modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/tabcontainer.htm
rename to modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm

diff --git a/libs/web/luasrc/view/cbi/tabmenu.htm b/modules/base/luasrc/luasrc/view/cbi/tabmenu.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/tabmenu.htm
rename to modules/base/luasrc/luasrc/view/cbi/tabmenu.htm

diff --git a/libs/web/luasrc/view/cbi/tblsection.htm b/modules/base/luasrc/luasrc/view/cbi/tblsection.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/tblsection.htm
rename to modules/base/luasrc/luasrc/view/cbi/tblsection.htm

diff --git a/libs/web/luasrc/view/cbi/tsection.htm b/modules/base/luasrc/luasrc/view/cbi/tsection.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/tsection.htm
rename to modules/base/luasrc/luasrc/view/cbi/tsection.htm

diff --git a/libs/web/luasrc/view/cbi/tvalue.htm b/modules/base/luasrc/luasrc/view/cbi/tvalue.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/tvalue.htm
rename to modules/base/luasrc/luasrc/view/cbi/tvalue.htm

diff --git a/libs/web/luasrc/view/cbi/ucisection.htm b/modules/base/luasrc/luasrc/view/cbi/ucisection.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/ucisection.htm
rename to modules/base/luasrc/luasrc/view/cbi/ucisection.htm

diff --git a/libs/web/luasrc/view/cbi/upload.htm b/modules/base/luasrc/luasrc/view/cbi/upload.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/upload.htm
rename to modules/base/luasrc/luasrc/view/cbi/upload.htm

diff --git a/libs/web/luasrc/view/cbi/value.htm b/modules/base/luasrc/luasrc/view/cbi/value.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/value.htm
rename to modules/base/luasrc/luasrc/view/cbi/value.htm

diff --git a/libs/web/luasrc/view/cbi/valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/valuefooter.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/valuefooter.htm
rename to modules/base/luasrc/luasrc/view/cbi/valuefooter.htm

diff --git a/libs/web/luasrc/view/cbi/valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/valueheader.htm
similarity index 100%
rename from libs/web/luasrc/view/cbi/valueheader.htm
rename to modules/base/luasrc/luasrc/view/cbi/valueheader.htm

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua b/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
similarity index 100%
rename from protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
rename to modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_none.lua b/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
similarity index 100%
rename from protocols/core/luasrc/model/cbi/admin_network/proto_none.lua
rename to modules/base/luasrc/model/cbi/admin_network/proto_none.lua

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua b/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
similarity index 100%
rename from protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
rename to modules/base/luasrc/model/cbi/admin_network/proto_static.lua

diff --git a/libs/core/luasrc/model/firewall.lua b/modules/base/luasrc/model/firewall.lua
similarity index 100%
rename from libs/core/luasrc/model/firewall.lua
rename to modules/base/luasrc/model/firewall.lua

diff --git a/libs/ipkg/luasrc/model/ipkg.lua b/modules/base/luasrc/model/ipkg.lua
similarity index 100%
rename from libs/ipkg/luasrc/model/ipkg.lua
rename to modules/base/luasrc/model/ipkg.lua

diff --git a/libs/core/luasrc/model/network.lua b/modules/base/luasrc/model/network.lua
similarity index 100%
rename from libs/core/luasrc/model/network.lua
rename to modules/base/luasrc/model/network.lua

diff --git a/libs/core/luasrc/model/uci.lua b/modules/base/luasrc/model/uci.lua
similarity index 100%
rename from libs/core/luasrc/model/uci.lua
rename to modules/base/luasrc/model/uci.lua

diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/modules/base/luasrc/sgi/cgi.lua
similarity index 100%
rename from libs/sgi-cgi/luasrc/sgi/cgi.lua
rename to modules/base/luasrc/sgi/cgi.lua

diff --git a/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua b/modules/base/luasrc/sgi/uhttpd.lua
similarity index 100%
rename from libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua
rename to modules/base/luasrc/sgi/uhttpd.lua

diff --git a/libs/core/luasrc/store.lua b/modules/base/luasrc/store.lua
similarity index 100%
rename from libs/core/luasrc/store.lua
rename to modules/base/luasrc/store.lua

diff --git a/libs/sys/luasrc/sys.lua b/modules/base/luasrc/sys.lua
similarity index 100%
rename from libs/sys/luasrc/sys.lua
rename to modules/base/luasrc/sys.lua

diff --git a/libs/sys/luasrc/sys/iptparser.lua b/modules/base/luasrc/sys/iptparser.lua
similarity index 100%
rename from libs/sys/luasrc/sys/iptparser.lua
rename to modules/base/luasrc/sys/iptparser.lua

diff --git a/libs/sys/luasrc/sys/zoneinfo.lua b/modules/base/luasrc/sys/zoneinfo.lua
similarity index 100%
rename from libs/sys/luasrc/sys/zoneinfo.lua
rename to modules/base/luasrc/sys/zoneinfo.lua

diff --git a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
similarity index 100%
rename from libs/sys/luasrc/sys/zoneinfo/tzdata.lua
rename to modules/base/luasrc/sys/zoneinfo/tzdata.lua

diff --git a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
similarity index 100%
rename from libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
rename to modules/base/luasrc/sys/zoneinfo/tzoffset.lua

diff --git a/protocols/core/luasrc/tools/proto.lua b/modules/base/luasrc/tools/proto.lua
similarity index 100%
rename from protocols/core/luasrc/tools/proto.lua
rename to modules/base/luasrc/tools/proto.lua

diff --git a/modules/admin-core/luasrc/tools/status.lua b/modules/base/luasrc/tools/status.lua
similarity index 100%
rename from modules/admin-core/luasrc/tools/status.lua
rename to modules/base/luasrc/tools/status.lua

diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/base/luasrc/tools/webadmin.lua
similarity index 100%
rename from modules/admin-core/luasrc/tools/webadmin.lua
rename to modules/base/luasrc/tools/webadmin.lua

diff --git a/libs/core/luasrc/util.lua b/modules/base/luasrc/util.lua
similarity index 100%
rename from libs/core/luasrc/util.lua
rename to modules/base/luasrc/util.lua

diff --git a/libs/core/luasrc/version.lua b/modules/base/luasrc/version.lua
similarity index 100%
rename from libs/core/luasrc/version.lua
rename to modules/base/luasrc/version.lua

diff --git a/modules/admin-core/luasrc/view/error404.htm b/modules/base/luasrc/view/error404.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/error404.htm
rename to modules/base/luasrc/view/error404.htm

diff --git a/modules/admin-core/luasrc/view/error500.htm b/modules/base/luasrc/view/error500.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/error500.htm
rename to modules/base/luasrc/view/error500.htm

diff --git a/modules/admin-core/luasrc/view/footer.htm b/modules/base/luasrc/view/footer.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/footer.htm
rename to modules/base/luasrc/view/footer.htm

diff --git a/modules/admin-core/luasrc/view/header.htm b/modules/base/luasrc/view/header.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/header.htm
rename to modules/base/luasrc/view/header.htm

diff --git a/modules/admin-core/luasrc/view/indexer.htm b/modules/base/luasrc/view/indexer.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/indexer.htm
rename to modules/base/luasrc/view/indexer.htm

diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/base/luasrc/view/sysauth.htm
similarity index 100%
rename from modules/admin-core/luasrc/view/sysauth.htm
rename to modules/base/luasrc/view/sysauth.htm

diff --git a/libs/core/root/etc/config/ucitrack b/modules/base/root/etc/config/ucitrack
similarity index 100%
rename from libs/core/root/etc/config/ucitrack
rename to modules/base/root/etc/config/ucitrack

diff --git a/libs/web/root/etc/config/luci b/modules/base/root/root/etc/config/luci
similarity index 100%
rename from libs/web/root/etc/config/luci
rename to modules/base/root/root/etc/config/luci

diff --git a/libs/web/root/lib/uci/upload/.gitignore b/modules/base/root/root/lib/uci/upload/.gitignore
similarity index 100%
rename from libs/web/root/lib/uci/upload/.gitignore
rename to modules/base/root/root/lib/uci/upload/.gitignore

diff --git a/libs/core/root/sbin/luci-reload b/modules/base/root/sbin/luci-reload
similarity index 100%
rename from libs/core/root/sbin/luci-reload
rename to modules/base/root/sbin/luci-reload

diff --git a/modules/admin-core/root/www/index.html b/modules/base/root/www/index.html
similarity index 100%
rename from modules/admin-core/root/www/index.html
rename to modules/base/root/www/index.html

diff --git a/libs/web/src/po2lmo.c b/modules/base/src/po2lmo.c
similarity index 100%
rename from libs/web/src/po2lmo.c
rename to modules/base/src/po2lmo.c

diff --git a/libs/web/src/template_lmo.c b/modules/base/src/template_lmo.c
similarity index 100%
rename from libs/web/src/template_lmo.c
rename to modules/base/src/template_lmo.c

diff --git a/libs/web/src/template_lmo.h b/modules/base/src/template_lmo.h
similarity index 100%
rename from libs/web/src/template_lmo.h
rename to modules/base/src/template_lmo.h

diff --git a/libs/web/src/template_lualib.c b/modules/base/src/template_lualib.c
similarity index 100%
rename from libs/web/src/template_lualib.c
rename to modules/base/src/template_lualib.c

diff --git a/libs/web/src/template_lualib.h b/modules/base/src/template_lualib.h
similarity index 100%
rename from libs/web/src/template_lualib.h
rename to modules/base/src/template_lualib.h

diff --git a/libs/web/src/template_parser.c b/modules/base/src/template_parser.c
similarity index 100%
rename from libs/web/src/template_parser.c
rename to modules/base/src/template_parser.c

diff --git a/libs/web/src/template_parser.h b/modules/base/src/template_parser.h
similarity index 100%
rename from libs/web/src/template_parser.h
rename to modules/base/src/template_parser.h

diff --git a/libs/web/src/template_utils.c b/modules/base/src/template_utils.c
similarity index 100%
rename from libs/web/src/template_utils.c
rename to modules/base/src/template_utils.c

diff --git a/libs/web/src/template_utils.h b/modules/base/src/template_utils.h
similarity index 100%
rename from libs/web/src/template_utils.h
rename to modules/base/src/template_utils.h

diff --git a/libs/web/standalone.mk b/modules/base/standalone.mk
similarity index 100%
rename from libs/web/standalone.mk
rename to modules/base/standalone.mk

diff --git a/protocols/core/Makefile b/protocols/core/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/protocols/core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk

diff --git a/themes/base/Makefile b/themes/base/Makefile
deleted file mode 100644 (file)
index 81a96f6..0000000
--- a/themes/base/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file