From dd7d618bd8ab59b86ef64ecc64e8becf026cb5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 26 Aug 2018 13:48:24 +0200
Subject: Move explicit fetch to correct autopkg variant

---
 autopkg-branch.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'autopkg-branch.mk')

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)")
 
-- 
cgit v1.2.3


From 7b230877a32027b4aef12685ca282db107301145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 30 Aug 2018 11:12:19 +0200
Subject: autopkg: try to fix pull

---
 autopkg-branch.mk | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'autopkg-branch.mk')

diff --git a/autopkg-branch.mk b/autopkg-branch.mk
index 25e25e9..871cffb 100644
--- a/autopkg-branch.mk
+++ b/autopkg-branch.mk
@@ -6,9 +6,6 @@ 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)")
 
-- 
cgit v1.2.3


From d7b7793976ee2d1fac1763c224edcc7405168c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 30 Aug 2018 11:18:06 +0200
Subject: Move autopkg to package so it is accessible

---
 autopkg-branch.mk | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 autopkg-branch.mk

(limited to 'autopkg-branch.mk')

diff --git a/autopkg-branch.mk b/autopkg-branch.mk
deleted file mode 100644
index 871cffb..0000000
--- a/autopkg-branch.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Autopkg tracking given branch
-AUTOPKG_VARIANT:=branch
-$(call include_mk, autopkg-common.mk)
-
-ifndef PKG_SOURCE_BRANCH
-$(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include)
-endif
-
-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)")
-
-ifeq ($(PKG_VERSION),)
-# Count commits since initial commit.
-PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count "$(PKG_SOURCE_VERSION)")
-# No previous version found (no tag) so we use 9999 instead
-PKG_VERSION:=9999
-else
-# Count commits since last version tag
-PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count "$(PKG_VERSION)..$(PKG_SOURCE_VERSION)")
-# .9999 is appended to not collide with possible existing package versions in repository
-PKG_VERSION:=$(PKG_VERSION:v%=%).9999
-endif
-
-$(eval $(call AUTOPKG_TAIL))
-- 
cgit v1.2.3


From 7a4e7809358548e24a5debb375e6e6a368247f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 30 Aug 2018 12:42:30 +0200
Subject: autopkg: move it back

---
 autopkg-branch.mk | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 autopkg-branch.mk

(limited to 'autopkg-branch.mk')

diff --git a/autopkg-branch.mk b/autopkg-branch.mk
new file mode 100644
index 0000000..9b587b3
--- /dev/null
+++ b/autopkg-branch.mk
@@ -0,0 +1,24 @@
+# Autopkg tracking given branch
+AUTOPKG_VARIANT:=branch
+include $(TOPDIR)/feeds/personal/autopkg-head.mk
+
+ifndef PKG_SOURCE_BRANCH
+$(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include)
+endif
+
+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)")
+
+ifeq ($(PKG_VERSION),)
+# Count commits since initial commit.
+PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count "$(PKG_SOURCE_VERSION)")
+# No previous version found (no tag) so we use 9999 instead
+PKG_VERSION:=9999
+else
+# Count commits since last version tag
+PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count "$(PKG_VERSION)..$(PKG_SOURCE_VERSION)")
+# .9999 is appended to not collide with possible existing package versions in repository
+PKG_VERSION:=$(PKG_VERSION:v%=%).9999
+endif
+
+include $(TOPDIR)/feeds/personal/autopkg-tail.mk
-- 
cgit v1.2.3