summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-08-26 13:48:24 +0200
committerKarel Kočí <cynerd@email.cz>2018-08-26 13:48:56 +0200
commitdd7d618bd8ab59b86ef64ecc64e8becf026cb5c8 (patch)
tree5ba53eb692af3953e1b1689bb0f001d02f7a5899
parent3a2aa9ec45d7bfadbb36bcb02365c1669ede7e85 (diff)
downloadopenwrt-personal-pkgs-dd7d618bd8ab59b86ef64ecc64e8becf026cb5c8.tar.gz
openwrt-personal-pkgs-dd7d618bd8ab59b86ef64ecc64e8becf026cb5c8.tar.bz2
openwrt-personal-pkgs-dd7d618bd8ab59b86ef64ecc64e8becf026cb5c8.zip
Move explicit fetch to correct autopkg variant
-rw-r--r--autopkg-branch.mk3
-rw-r--r--autopkg-tag.mk3
2 files changed, 3 insertions, 3 deletions
diff --git a/autopkg-branch.mk b/autopkg-branch.mk
index 871cffb..25e25e9 100644
--- a/autopkg-branch.mk
+++ b/autopkg-branch.mk
@@ -6,6 +6,9 @@ ifndef PKG_SOURCE_BRANCH
$(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include)
endif
+# Explicitly fetch branch
+$(shell git $(GIT_ARGS) fetch --prune --prune-tags --force "$(PKG_SOURCE_URL)" "$(PKG_SOURCE_BRANCH):$(PKG_SOURCE_BRANCH)")
+
PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) rev-parse "$(PKG_SOURCE_BRANCH)")
PKG_VERSION:=$(shell git $(GIT_ARGS) describe --abbrev=0 --tags "$(PKG_SOURCE_BRANCH)")
diff --git a/autopkg-tag.mk b/autopkg-tag.mk
index 9e97ed7..6fe08d4 100644
--- a/autopkg-tag.mk
+++ b/autopkg-tag.mk
@@ -2,9 +2,6 @@
AUTOPKG_VARIANT:=tag
$(call include_mk, autopkg-common.mk)
-# Explicitly fetch branch
-$(shell git $(GIT_ARGS) fetch --prune --prune-tags --force "$(PKG_SOURCE_URL)" "$(PKG_SOURCE_BRANCH):$(PKG_SOURCE_BRANCH)")
-
PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort | tail -1)
PKG_VERSION:=$(subst v%,%,$(PKG_SOURCE_VERSION))