From a4a3734a1d5a5de1c881de0e7067582d05617982 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 1 Jul 2009 02:09:47 +0000 Subject: [PATCH] luci-0.9: merge r4957-r4959 --- contrib/package/sysupgrade-atheros/Makefile | 6 +++--- contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh | 2 +- modules/freifunk/root/usr/sbin/remote-update | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/package/sysupgrade-atheros/Makefile b/contrib/package/sysupgrade-atheros/Makefile index a10145562..e4414b134 100644 --- a/contrib/package/sysupgrade-atheros/Makefile +++ b/contrib/package/sysupgrade-atheros/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sysupgrade-atheros -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) @@ -17,8 +17,8 @@ define Package/sysupgrade-atheros SECTION:=luci CATEGORY:=LuCI SUBMENU:=Freifunk - TITLE:=Experimental sysupgrade support for Atheros SoC - DEPENDS:=@TARGET_atheros + TITLE:=Experimental sysupgrade support for Atheros SoC and AR71xx target (UBNT RS) + DEPENDS:=@TARGET_atheros||@TARGET_ar71xx endef define Package/sysupgrade-atheros/description diff --git a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh index 2a8c31def..ac7e62e10 100644 --- a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh +++ b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh @@ -15,7 +15,7 @@ platform_check_image() { fi ;; *) - echo "Invalid image. Use Freifunk .img files on this platform" + echo "Invalid image. Use combined .img files on this platform" return 1 ;; esac diff --git a/modules/freifunk/root/usr/sbin/remote-update b/modules/freifunk/root/usr/sbin/remote-update index 67751d6cf..b900ada31 100755 --- a/modules/freifunk/root/usr/sbin/remote-update +++ b/modules/freifunk/root/usr/sbin/remote-update @@ -22,6 +22,11 @@ find_image() echo "openwrt-ubiquity-combined.img" fi ;; + ar71xx) + if grep -q '"kernel"' /proc/mtd; then + echo "openwrt-ar71xx-combined.img" + fi + ;; brcm-2.4) echo "openwrt-brcm-2.4-squashfs.trx" ;; -- 2.11.0