contrib/package: move remote-update to own package

diff --git a/contrib/package/remote-update/Makefile b/contrib/package/remote-update/Makefile
new file mode 100644 (file)
index 0000000..c8adcee
--- /dev/null
+++ b/contrib/package/remote-update/Makefile
@@ -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))

diff --git a/modules/freifunk/root/usr/sbin/remote-update b/contrib/package/remote-update/files/usr/sbin/remote-update
similarity index 97%
rename from modules/freifunk/root/usr/sbin/remote-update
rename to contrib/package/remote-update/files/usr/sbin/remote-update
index b900ada31c79063a25764f6c4ab84582ec18e38b..bffc449d0838177614251eb3d9dd494729611270 100755 (executable)
--- a/modules/freifunk/root/usr/sbin/remote-update
+++ b/contrib/package/remote-update/files/usr/sbin/remote-update
@@ -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
        }