From c0028b85c9b79f4153fba565f87dd46529cdb111 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 11 Mar 2014 20:32:58 +0100 Subject: [PATCH] gluon-autoupdater: fix version comparison --- gluon/gluon-autoupdater/Makefile | 2 +- gluon/gluon-autoupdater/files/usr/sbin/autoupdater | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gluon/gluon-autoupdater/Makefile b/gluon/gluon-autoupdater/Makefile index 046a1bc..ee977d6 100644 --- a/gluon/gluon-autoupdater/Makefile +++ b/gluon/gluon-autoupdater/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk define Package/gluon-autoupdater SECTION:=gluon CATEGORY:=Gluon - DEPENDS:=+gluon-core +gluon-cron +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum + DEPENDS:=+gluon-core +gluon-cron +opkg +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum TITLE:=Automatically update firmware endef diff --git a/gluon/gluon-autoupdater/files/usr/sbin/autoupdater b/gluon/gluon-autoupdater/files/usr/sbin/autoupdater index 641e437..fc44d3c 100755 --- a/gluon/gluon-autoupdater/files/usr/sbin/autoupdater +++ b/gluon/gluon-autoupdater/files/usr/sbin/autoupdater @@ -28,9 +28,10 @@ GOOD_SIGNATURES=$(uci get autoupdater.${BRANCH}.good_signatures) VERSION_FILE=/lib/gluon/release +# returns 0 when $1 is a higher version number than $2 newer_than() { - local old="$(printf '%s\n%s\n' "$1" "$2" | sort -n | head -n 1)" - test "$1" != "$old" + # negate the return value as opkg returns 1 when the proposition is true + ! opkg compare-versions "$1" '>>' "$2" } fetch_manifest() {