From 251502e2cd0c47b426cfd4d4f183128ca528b91b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 23 Sep 2008 13:15:50 +0000 Subject: [PATCH] Kill luci-addons package --- .../luci-splash/root/etc/init.d/luci_splash | 8 ++++ contrib/package/luci-addons/Makefile | 48 ------------------- .../luci-addons/dist/etc/crontabs/root | 3 -- .../luci-addons/dist/usr/bin/run-parts | 18 ------- contrib/package/luci/Makefile | 2 +- .../admin-core/root}/etc/config/luci_ethers | 0 .../admin-core/root}/etc/config/luci_hosts | 0 .../admin-core/root}/etc/init.d/luci_ethers | 0 .../admin-core/root}/etc/init.d/luci_fixtime | 0 .../admin-core/root}/etc/init.d/luci_hosts | 0 .../admin-core/root}/sbin/luci-flash | 0 11 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 contrib/package/luci-addons/Makefile delete mode 100644 contrib/package/luci-addons/dist/etc/crontabs/root delete mode 100755 contrib/package/luci-addons/dist/usr/bin/run-parts rename {contrib/package/luci-addons/dist => modules/admin-core/root}/etc/config/luci_ethers (100%) rename {contrib/package/luci-addons/dist => modules/admin-core/root}/etc/config/luci_hosts (100%) rename {contrib/package/luci-addons/dist => modules/admin-core/root}/etc/init.d/luci_ethers (100%) mode change 100644 => 100755 rename {contrib/package/luci-addons/dist => modules/admin-core/root}/etc/init.d/luci_fixtime (100%) mode change 100644 => 100755 rename {contrib/package/luci-addons/dist => modules/admin-core/root}/etc/init.d/luci_hosts (100%) mode change 100644 => 100755 rename {contrib/package/luci-addons/dist => modules/admin-core/root}/sbin/luci-flash (100%) diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash index 4761692b3..85ea8ecaa 100755 --- a/applications/luci-splash/root/etc/init.d/luci_splash +++ b/applications/luci-splash/root/etc/init.d/luci_splash @@ -61,6 +61,11 @@ start() { iptables -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082 iptables -t nat -A luci_splash_leases -j DROP + ### Add crontab entry + grep luci-splash /var/spool/cron/crontabs/root >/dev/null 2>&1 || { + echo '*/5 * * * * /usr/sbin/luci-splash sync' >> /var/spool/cron/crontabs/root + } + ### Start the splash httpd start-stop-daemon -S -b -q -x /usr/bin/luci-splashd } @@ -75,5 +80,8 @@ stop() { iptables -t nat -X luci_splash_leases iptables -t nat -X luci_splash_portal iptables -t nat -X luci_splash + + ### Stop the splash httpd + start-stop-daemon -K -q -x /usr/bin/luci-splashd } diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile deleted file mode 100644 index 294e77def..000000000 --- a/contrib/package/luci-addons/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=luci-addons -PKG_VERSION:=0.3 -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - - -define Build/Compile -endef - - -define Package/luci-addons - SECTION:=utils - CATEGORY:=Utilities - TITLE:=LuCI System Addons for Kamikaze - URL:=http://luci.freifunk-halle.net -endef - -define Package/luci-addons/conffiles -/etc/config/luci_hosts -/etc/config/luci_ethers -endef - -define Package/luci-addons/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_DIR) $(1)/etc/crontabs - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/etc/config - - $(INSTALL_BIN) ./dist/usr/bin/run-parts $(1)/usr/bin - $(INSTALL_BIN) ./dist/sbin/luci-flash $(1)/sbin - $(INSTALL_BIN) ./dist/etc/init.d/luci_fixtime $(1)/etc/init.d - $(INSTALL_BIN) ./dist/etc/init.d/luci_ethers $(1)/etc/init.d - $(INSTALL_BIN) ./dist/etc/init.d/luci_hosts $(1)/etc/init.d - - $(INSTALL_CONF) ./dist/etc/config/luci_ethers $(1)/etc/config - $(INSTALL_CONF) ./dist/etc/config/luci_hosts $(1)/etc/config - - $(CP) ./dist/etc/crontabs/root $(1)/etc/crontabs/root -endef - -$(eval $(call BuildPackage,luci-addons)) diff --git a/contrib/package/luci-addons/dist/etc/crontabs/root b/contrib/package/luci-addons/dist/etc/crontabs/root deleted file mode 100644 index 1169c5c6d..000000000 --- a/contrib/package/luci-addons/dist/etc/crontabs/root +++ /dev/null @@ -1,3 +0,0 @@ -* * * * * /usr/bin/run-parts /etc/cron.minutely -17 * * * * /usr/bin/run-parts /etc/cron.hourly -25 6 * * * /usr/bin/run-parts /etc/cron.daily diff --git a/contrib/package/luci-addons/dist/usr/bin/run-parts b/contrib/package/luci-addons/dist/usr/bin/run-parts deleted file mode 100755 index 0f0cbbdf5..000000000 --- a/contrib/package/luci-addons/dist/usr/bin/run-parts +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set +e - -if [ $# -lt 1 ]; then - echo "Usage: run-parts " - exit 1 -fi - -if [ ! -d $1 ]; then - echo "Not a directory: $1" - exit 1 -fi - -for i in $1/*; do - [ -x $i ] && $i -done - -exit 0 \ No newline at end of file diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 2a67b33dd..1e87596e8 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -209,7 +209,7 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-addons +luci-uci +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi TITLE:=MVC Webframework endef diff --git a/contrib/package/luci-addons/dist/etc/config/luci_ethers b/modules/admin-core/root/etc/config/luci_ethers similarity index 100% rename from contrib/package/luci-addons/dist/etc/config/luci_ethers rename to modules/admin-core/root/etc/config/luci_ethers diff --git a/contrib/package/luci-addons/dist/etc/config/luci_hosts b/modules/admin-core/root/etc/config/luci_hosts similarity index 100% rename from contrib/package/luci-addons/dist/etc/config/luci_hosts rename to modules/admin-core/root/etc/config/luci_hosts diff --git a/contrib/package/luci-addons/dist/etc/init.d/luci_ethers b/modules/admin-core/root/etc/init.d/luci_ethers old mode 100644 new mode 100755 similarity index 100% rename from contrib/package/luci-addons/dist/etc/init.d/luci_ethers rename to modules/admin-core/root/etc/init.d/luci_ethers diff --git a/contrib/package/luci-addons/dist/etc/init.d/luci_fixtime b/modules/admin-core/root/etc/init.d/luci_fixtime old mode 100644 new mode 100755 similarity index 100% rename from contrib/package/luci-addons/dist/etc/init.d/luci_fixtime rename to modules/admin-core/root/etc/init.d/luci_fixtime diff --git a/contrib/package/luci-addons/dist/etc/init.d/luci_hosts b/modules/admin-core/root/etc/init.d/luci_hosts old mode 100644 new mode 100755 similarity index 100% rename from contrib/package/luci-addons/dist/etc/init.d/luci_hosts rename to modules/admin-core/root/etc/init.d/luci_hosts diff --git a/contrib/package/luci-addons/dist/sbin/luci-flash b/modules/admin-core/root/sbin/luci-flash similarity index 100% rename from contrib/package/luci-addons/dist/sbin/luci-flash rename to modules/admin-core/root/sbin/luci-flash -- 2.25.1