From 12a1c6647873bb42d9d0b925fb5abc709d7b6d95 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 8 Mar 2010 23:47:39 +0000 Subject: [PATCH] luci-0.9: merge r5769 --- .../{luci-hd_idle => luci-hd-idle}/Makefile | 0 .../{luci-hd_idle => luci-hd-idle}/ipkg/postinst | 0 .../luasrc/controller/hd_idle.lua | 0 .../luasrc/model/cbi/hd_idle.lua | 0 .../root/etc/uci-defaults/luci-hd_idle | 0 .../Makefile | 0 .../ipkg/postinst | 0 .../luasrc/controller/mmc_over_gpio.lua | 0 .../luasrc/model/cbi/mmc_over_gpio.lua | 0 .../root/etc/uci-defaults/luci-mmc_over_gpio | 0 contrib/package/luci/Makefile | 28 +++++++++++----------- 11 files changed, 14 insertions(+), 14 deletions(-) rename applications/{luci-hd_idle => luci-hd-idle}/Makefile (100%) rename applications/{luci-hd_idle => luci-hd-idle}/ipkg/postinst (100%) rename applications/{luci-hd_idle => luci-hd-idle}/luasrc/controller/hd_idle.lua (100%) rename applications/{luci-hd_idle => luci-hd-idle}/luasrc/model/cbi/hd_idle.lua (100%) rename applications/{luci-hd_idle => luci-hd-idle}/root/etc/uci-defaults/luci-hd_idle (100%) rename applications/{luci-mmc_over_gpio => luci-mmc-over-gpio}/Makefile (100%) rename applications/{luci-mmc_over_gpio => luci-mmc-over-gpio}/ipkg/postinst (100%) rename applications/{luci-mmc_over_gpio => luci-mmc-over-gpio}/luasrc/controller/mmc_over_gpio.lua (100%) rename applications/{luci-mmc_over_gpio => luci-mmc-over-gpio}/luasrc/model/cbi/mmc_over_gpio.lua (100%) rename applications/{luci-mmc_over_gpio => luci-mmc-over-gpio}/root/etc/uci-defaults/luci-mmc_over_gpio (100%) diff --git a/applications/luci-hd_idle/Makefile b/applications/luci-hd-idle/Makefile similarity index 100% rename from applications/luci-hd_idle/Makefile rename to applications/luci-hd-idle/Makefile diff --git a/applications/luci-hd_idle/ipkg/postinst b/applications/luci-hd-idle/ipkg/postinst similarity index 100% rename from applications/luci-hd_idle/ipkg/postinst rename to applications/luci-hd-idle/ipkg/postinst diff --git a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua b/applications/luci-hd-idle/luasrc/controller/hd_idle.lua similarity index 100% rename from applications/luci-hd_idle/luasrc/controller/hd_idle.lua rename to applications/luci-hd-idle/luasrc/controller/hd_idle.lua diff --git a/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua b/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua similarity index 100% rename from applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua rename to applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua diff --git a/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle b/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle similarity index 100% rename from applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle rename to applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle diff --git a/applications/luci-mmc_over_gpio/Makefile b/applications/luci-mmc-over-gpio/Makefile similarity index 100% rename from applications/luci-mmc_over_gpio/Makefile rename to applications/luci-mmc-over-gpio/Makefile diff --git a/applications/luci-mmc_over_gpio/ipkg/postinst b/applications/luci-mmc-over-gpio/ipkg/postinst similarity index 100% rename from applications/luci-mmc_over_gpio/ipkg/postinst rename to applications/luci-mmc-over-gpio/ipkg/postinst diff --git a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua similarity index 100% rename from applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua rename to applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua diff --git a/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua b/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua similarity index 100% rename from applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua rename to applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua diff --git a/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio b/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio similarity index 100% rename from applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio rename to applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 9d135223e..78654df6c 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -560,14 +560,14 @@ define Package/luci-app-samba/install endef -define Package/luci-app-mmc_over_gpio +define Package/luci-app-mmc-over-gpio $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc_over_gpio:kmod-mmc-over-gpio + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio TITLE:=mmc_over_gpio endef -define Package/luci-app-mmc_over_gpio/install - $(call Package/luci/install/template,$(1),applications/luci-mmc_over_gpio) +define Package/luci-app-mmc-over-gpio/install + $(call Package/luci/install/template,$(1),applications/luci-mmc-over-gpio) endef @@ -592,14 +592,14 @@ define Package/luci-app-ushare/install $(call Package/luci/install/template,$(1),applications/luci-ushare) endef -define Package/luci-app-hd_idle +define Package/luci-app-hd-idle $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd_idle:hd-idle + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd-idle:hd-idle TITLE:=hd-idle endef -define Package/luci-app-hd_idle/install - $(call Package/luci/install/template,$(1),applications/luci-hd_idle) +define Package/luci-app-hd-idle/install + $(call Package/luci/install/template,$(1),applications/luci-hd-idle) endef define Package/luci-app-tinyproxy @@ -988,8 +988,8 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-samba),) PKG_SELECTED_MODULES+=applications/luci-samba endif -ifneq ($(CONFIG_PACKAGE_luci-app-mmc_over_gpio),) - PKG_SELECTED_MODULES+=applications/luci-mmc_over_gpio +ifneq ($(CONFIG_PACKAGE_luci-app-mmc-over-gpio),) + PKG_SELECTED_MODULES+=applications/luci-mmc-over-gpio endif ifneq ($(CONFIG_PACKAGE_luci-app-p910nd),) PKG_SELECTED_MODULES+=applications/luci-p910nd @@ -997,8 +997,8 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-ushare),) PKG_SELECTED_MODULES+=applications/luci-ushare endif -ifneq ($(CONFIG_PACKAGE_luci-app-hd_idle),) - PKG_SELECTED_MODULES+=applications/luci-hd_idle +ifneq ($(CONFIG_PACKAGE_luci-app-hd-idle),) + PKG_SELECTED_MODULES+=applications/luci-hd-idle endif ifneq ($(CONFIG_PACKAGE_luci-app-tinyproxy),) PKG_SELECTED_MODULES+=applications/luci-tinyproxy @@ -1129,10 +1129,10 @@ $(eval $(call BuildPackage,luci-app-upnp)) $(eval $(call BuildPackage,luci-app-ntpc)) $(eval $(call BuildPackage,luci-app-ddns)) $(eval $(call BuildPackage,luci-app-samba)) -$(eval $(call BuildPackage,luci-app-mmc_over_gpio)) +$(eval $(call BuildPackage,luci-app-mmc-over-gpio)) $(eval $(call BuildPackage,luci-app-p910nd)) $(eval $(call BuildPackage,luci-app-ushare)) -$(eval $(call BuildPackage,luci-app-hd_idle)) +$(eval $(call BuildPackage,luci-app-hd-idle)) $(eval $(call BuildPackage,luci-app-tinyproxy)) $(eval $(call BuildPackage,luci-app-initmgr)) $(eval $(call BuildPackage,luci-app-livestats)) -- 2.11.0