luci-0.9: merge r4957-r4959

This commit is contained in:
Jo-Philipp Wich 2009-07-01 02:09:47 +00:00
parent d6cc0cf925
commit a4a3734a1d
3 changed files with 9 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -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"
;;