aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2017-10-23 12:30:44 +0200
committerKarel Kočí <karel.koci@nic.cz>2017-10-23 12:30:44 +0200
commit05378c44b6a49be9ef4432b7e9dd3ccc7aa5dca2 (patch)
treec00c56591fafb8e230eba804726562b9b9e61568
parentb874ff7bc64ed266ada493fb4cf97133a12bf4af (diff)
downloadturris-myrepo-05378c44b6a49be9ef4432b7e9dd3ccc7aa5dca2.tar.gz
turris-myrepo-05378c44b6a49be9ef4432b7e9dd3ccc7aa5dca2.tar.bz2
turris-myrepo-05378c44b6a49be9ef4432b7e9dd3ccc7aa5dca2.zip
Update updater-ng package
-rw-r--r--updater-ng-auto/Makefile3
-rwxr-xr-xutils/updater-ng-auto.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/updater-ng-auto/Makefile b/updater-ng-auto/Makefile
index fdbd5b1..945717a 100644
--- a/updater-ng-auto/Makefile
+++ b/updater-ng-auto/Makefile
@@ -43,6 +43,9 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/updater
$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/* $(1)/etc/updater
+ $(INSTALL_DIR) $(1)/etc/updater/conf.d
+ touch $(1)/etc/updater/conf.d/.keep
+
$(INSTALL_DIR) $(1)/etc/updater/hook_preupdate
$(INSTALL_DIR) $(1)/etc/updater/hook_postupdate
$(INSTALL_DIR) $(1)/etc/updater/hook_reboot_required
diff --git a/utils/updater-ng-auto.sh b/utils/updater-ng-auto.sh
index 449b045..ac3c6c7 100755
--- a/utils/updater-ng-auto.sh
+++ b/utils/updater-ng-auto.sh
@@ -19,7 +19,7 @@ else
fi
# Get info
HASH="$(git $GIT_ARGS rev-parse HEAD)"
-VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags)"
+VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags).99999"
RELEASE="$(($(git $GIT_ARGS rev-list --count $VERSION..HEAD) + 1))"
# Now replace stuff in Makefile