From 96a8d3d0d81f00252345328432bc65c26c8ae0d2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 7 Jul 2009 03:59:49 +0000 Subject: [PATCH] contrib/package: move remote-update to own package --- contrib/package/remote-update/Makefile | 43 ++++++++++++++++++++++ .../remote-update/files}/usr/sbin/remote-update | 3 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 contrib/package/remote-update/Makefile rename {modules/freifunk/root => contrib/package/remote-update/files}/usr/sbin/remote-update (97%) diff --git a/contrib/package/remote-update/Makefile b/contrib/package/remote-update/Makefile new file mode 100644 index 000000000..c8adceeaa --- /dev/null +++ b/contrib/package/remote-update/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2009 Jo-Philipp Wich +# +# 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 b900ada31..bffc449d0 100755 --- 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 } -- 2.11.0