Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.9: merge r5022 and r5023

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-07-07 04:02:33 +00:00
parent 83fe3be564
commit 4918c60ac2
3 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/package/luci/Makefile
View file

@ -335,7 +335,8 @@ define Package/luci-freifunk-community
+PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \
+PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \
+PACKAGE_luci-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-freifunk-community:kmod-tun \
+PACKAGE_luci-freifunk-community:ip +PACKAGE_luci-freifunk-community:freifunk-watchdog +luci-app-olsr
+PACKAGE_luci-freifunk-community:ip +PACKAGE_luci-freifunk-community:freifunk-watchdog +luci-app-olsr \
+PACKAGE_luci-freifunk-community:remote-update
TITLE:=Freifunk Community Meta-Package
endef

43
contrib/package/remote-update/Makefile Normal file
View file

@ -0,0 +1,43 @@
#
# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
#
# This is free software, licensed under the Apache 2.0 license.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=remote-update
PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
define Package/remote-update
SECTION:=luci
CATEGORY:=LuCI
SUBMENU:=Freifunk
TITLE:=Freifunk remote update utility.
DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm-2.4
endef
define Package/remote-update/description
The freifunk remote-update utility uses sysupgrade to reflash the currently
running firmware while keeping most of the existing configuratio.
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/remote-update/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,remote-update))

3
modules/freifunk/root/usr/sbin/remote-update → contrib/package/remote-update/files/usr/sbin/remote-update
View file

@ -174,6 +174,7 @@ local image_name="${image_url##*/}"
local arch=$(find_architecture)
local image=$(find_image "$arch")
local repo=$(uci get freifunk.upgrade.repository 2>/dev/null)
repo=${repo:-$(uci get system.upgrade.repository 2>/dev/null)}
[ -z "$arch" ] && {
echo "Can not determine the current architecture."
@ -181,7 +182,7 @@ local image_name="${image_url##*/}"
}
[ -z "$repo" ] && {
echo "No repository configured in 'freifunk.upgrade.repository'."
echo "No repository configured in 'system.upgrade.repository'."
echo "Use the '-u' flag to specify an image location."
exit 1
}