diff options
| author | Karel Kočí <cynerd@email.cz> | 2018-08-26 13:48:24 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2018-08-26 13:48:24 +0200 |
| commit | f0078ea2da06440e53f799ce49afcda686defa34 (patch) | |
| tree | 2389110ae1a2b9ab955146cf3c8a8a43d38d1336 | |
| parent | 2852b61da57f46039d13ce78cdb85d31eee4732b (diff) | |
| download | openwrt-personal-pkgs-f0078ea2da06440e53f799ce49afcda686defa34.tar.gz openwrt-personal-pkgs-f0078ea2da06440e53f799ce49afcda686defa34.tar.bz2 openwrt-personal-pkgs-f0078ea2da06440e53f799ce49afcda686defa34.zip | |
Move explicit fetch to correct autopkg variant
| -rw-r--r-- | autopkg-branch.mk | 3 | ||||
| -rw-r--r-- | autopkg-tag.mk | 3 |
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)) |