diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2014-12-03 15:17:05 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 16:26:20 +0100 |
commit | 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 (patch) | |
tree | 35e16f100466e4e00657199b38bb3d87d52bf73f /modules/base/root | |
parent | 9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4 (diff) |
Rework LuCI build system
* Rename subdirectories to their repective OpenWrt package names
* Make each LuCI module its own standalone package
* Deploy a shared luci.mk which is used by each module Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'modules/base/root')
-rw-r--r-- | modules/base/root/etc/config/luci | 24 | ||||
-rw-r--r-- | modules/base/root/etc/config/ucitrack | 57 | ||||
-rw-r--r-- | modules/base/root/lib/uci/upload/.gitignore | 0 | ||||
-rwxr-xr-x | modules/base/root/sbin/luci-reload | 45 | ||||
-rw-r--r-- | modules/base/root/www/index.html | 10 |
5 files changed, 0 insertions, 136 deletions
diff --git a/modules/base/root/etc/config/luci b/modules/base/root/etc/config/luci deleted file mode 100644 index c503a8f1e0..0000000000 --- a/modules/base/root/etc/config/luci +++ /dev/null @@ -1,24 +0,0 @@ -config core main - option lang auto - option mediaurlbase /luci-static/openwrt.org - option resourcebase /luci-static/resources - -config extern flash_keep - option uci "/etc/config/" - option dropbear "/etc/dropbear/" - option openvpn "/etc/openvpn/" - option passwd "/etc/passwd" - option opkg "/etc/opkg.conf" - option firewall "/etc/firewall.user" - option uploads "/lib/uci/upload/" - -config internal languages - -config internal sauth - option sessionpath "/tmp/luci-sessions" - option sessiontime 3600 - -config internal ccache - option enable 1 - -config internal themes diff --git a/modules/base/root/etc/config/ucitrack b/modules/base/root/etc/config/ucitrack deleted file mode 100644 index cd3cb8515c..0000000000 --- a/modules/base/root/etc/config/ucitrack +++ /dev/null @@ -1,57 +0,0 @@ -config network - option init network - list affects dhcp - list affects radvd - -config wireless - list affects network - -config firewall - option init firewall - list affects luci-splash - list affects qos - list affects miniupnpd - -config olsr - option init olsrd - -config dhcp - option init dnsmasq - list affects odhcpd - -config odhcpd - option init odhcpd - -config dropbear - option init dropbear - -config httpd - option init httpd - -config fstab - option init fstab - -config qos - option init qos - -config system - option init led - list affects luci_statistics - -config luci_splash - option init luci_splash - -config upnpd - option init miniupnpd - -config ntpclient - option init ntpclient - -config samba - option init samba - -config tinyproxy - option init tinyproxy - -config 6relayd - option init 6relayd diff --git a/modules/base/root/lib/uci/upload/.gitignore b/modules/base/root/lib/uci/upload/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 --- a/modules/base/root/lib/uci/upload/.gitignore +++ /dev/null diff --git a/modules/base/root/sbin/luci-reload b/modules/base/root/sbin/luci-reload deleted file mode 100755 index cc41da2bb7..0000000000 --- a/modules/base/root/sbin/luci-reload +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -. /lib/functions.sh - -apply_config() { - config_get init "$1" init - config_get exec "$1" exec - config_get test "$1" test - - echo "$2" > "/var/run/luci-reload-status" - - [ -n "$init" ] && reload_init "$2" "$init" "$test" - [ -n "$exec" ] && reload_exec "$2" "$exec" "$test" -} - -reload_exec() { - local service="$1" - local ok="$3" - set -- $2 - local cmd="$1"; shift - - [ -x "$cmd" ] && { - echo "Reloading $service... " - ( $cmd "$@" ) 2>/dev/null 1>&2 - [ -n "$ok" -a "$?" != "$ok" ] && echo '!!! Failed to reload' $service '!!!' - } -} - -reload_init() { - [ -x /etc/init.d/$2 ] && /etc/init.d/$2 enabled && { - echo "Reloading $1... " - /etc/init.d/$2 reload >/dev/null 2>&1 - [ -n "$3" -a "$?" != "$3" ] && echo '!!! Failed to reload' $1 '!!!' - } -} - -lock "/var/run/luci-reload" - -config_load ucitrack - -for i in $*; do - config_foreach apply_config $i $i -done - -rm -f "/var/run/luci-reload-status" -lock -u "/var/run/luci-reload" diff --git a/modules/base/root/www/index.html b/modules/base/root/www/index.html deleted file mode 100644 index 0a7238b556..0000000000 --- a/modules/base/root/www/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" /> -</head> -<body style="background-color: black"> -<a style="color: white; text-decoration: none" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a> -</body> -</html> |