From 96b213c3866829ae74a2a286e93efbf48a9b3583 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Wed, 26 Feb 2014 10:21:14 +0100 Subject: [PATCH] We DON'T want the gluon version file to collide with the package version stamp dir --- package/gluon-alfred/files/lib/gluon/alfred/announce.sh | 2 +- package/gluon-core/Makefile | 2 +- package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/gluon-alfred/files/lib/gluon/alfred/announce.sh b/package/gluon-alfred/files/lib/gluon/alfred/announce.sh index 39cd35322..0fa185a5f 100755 --- a/package/gluon-alfred/files/lib/gluon/alfred/announce.sh +++ b/package/gluon-alfred/files/lib/gluon/alfred/announce.sh @@ -36,7 +36,7 @@ fi json_add_object "software" json_add_object "firmware" - json_add_string "base" "gluon-$(cat /lib/gluon/version)" + json_add_string "base" "gluon-$(cat /lib/gluon/gluon-version)" json_add_string "release" "$(cat /lib/gluon/release)" json_close_object # firmware diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 74f3bb43a..7bee0846a 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -34,7 +34,7 @@ define Package/gluon-core/install $(GLUON_GENERATE) ./generate/* $(1)/ $(INSTALL_DIR) $(1)/lib/gluon - echo "$(GLUON_VERSION)" > $(1)/lib/gluon/version + echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release endef diff --git a/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade b/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade index f075e53bc..d8ae36704 100755 --- a/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade +++ b/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade @@ -12,6 +12,9 @@ else fi +# Temporary fix for broken upgrades (happened between 20140225 and 20140226, remove next week) +if [ -f "$VERSION_DIR" ]; then rm "$VERSION_DIR"; fi + mkdir -p "$VERSION_DIR" -- GitLab