From d83bde419809e1836983c8fead7185dfb7689b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Aug 2018 12:37:18 +0200 Subject: autopkg: split common --- personal-pkgs-repo/files/autopkg-branch.mk | 4 ++-- personal-pkgs-repo/files/autopkg-common.mk | 36 ------------------------------ personal-pkgs-repo/files/autopkg-head.mk | 21 +++++++++++++++++ personal-pkgs-repo/files/autopkg-tag.mk | 4 ++-- personal-pkgs-repo/files/autopkg-tail.mk | 13 +++++++++++ 5 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 personal-pkgs-repo/files/autopkg-common.mk create mode 100644 personal-pkgs-repo/files/autopkg-head.mk create mode 100644 personal-pkgs-repo/files/autopkg-tail.mk (limited to 'personal-pkgs-repo') diff --git a/personal-pkgs-repo/files/autopkg-branch.mk b/personal-pkgs-repo/files/autopkg-branch.mk index 871cffb..c8791cc 100644 --- a/personal-pkgs-repo/files/autopkg-branch.mk +++ b/personal-pkgs-repo/files/autopkg-branch.mk @@ -1,6 +1,6 @@ # Autopkg tracking given branch AUTOPKG_VARIANT:=branch -$(call include_mk, autopkg-common.mk) +$(call include_mk, autopkg-head.mk) ifndef PKG_SOURCE_BRANCH $(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include) @@ -21,4 +21,4 @@ PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count "$(PKG_VERSION)..$(PKG_SOU PKG_VERSION:=$(PKG_VERSION:v%=%).9999 endif -$(eval $(call AUTOPKG_TAIL)) +$(call include_mk, autopkg-tail.mk) diff --git a/personal-pkgs-repo/files/autopkg-common.mk b/personal-pkgs-repo/files/autopkg-common.mk deleted file mode 100644 index c539e1a..0000000 --- a/personal-pkgs-repo/files/autopkg-common.mk +++ /dev/null @@ -1,36 +0,0 @@ -ifndef AUTOPKG_VARIANT - $(error "Don't include autopkg-common.mk directly!") -endif - -ifndef PKG_NAME -$(error You have to define PKG_NAME before pkgauto.mk include) -endif -ifndef PKG_SOURCE_URL -$(error You have to define PKG_SOURCE_URL before pkgauto.mk include) -endif - -TMP_REPO_PATH=$(DL_DIR)/autopkg/$(PKG_NAME) -GIT_ARGS=--git-dir='$(TMP_REPO_PATH)' --bare - -# Clone/update git history to bare repository -$(shell \ - if [ ! -d "$(TMP_REPO_PATH)" ]; then \ - git clone --mirror "$(PKG_SOURCE_URL)" "$(TMP_REPO_PATH)"; \ - else \ - git $(GIT_ARGS) remote update origin; \ - fi) - - -define AUTOPKG_TAIL - -PKG_SOURCE_PROTO:=git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME) - -undefine TMP_REPO_PATH -undefine GIT_ARGS -undefine AUTOPKG_TAIL - -endef diff --git a/personal-pkgs-repo/files/autopkg-head.mk b/personal-pkgs-repo/files/autopkg-head.mk new file mode 100644 index 0000000..115e1ae --- /dev/null +++ b/personal-pkgs-repo/files/autopkg-head.mk @@ -0,0 +1,21 @@ +ifndef AUTOPKG_VARIANT + $(error "Don't include autopkg-head.mk directly!") +endif + +ifndef PKG_NAME +$(error You have to define PKG_NAME before pkgauto.mk include) +endif +ifndef PKG_SOURCE_URL +$(error You have to define PKG_SOURCE_URL before pkgauto.mk include) +endif + +TMP_REPO_PATH=$(DL_DIR)/autopkg/$(PKG_NAME) +GIT_ARGS=--git-dir='$(TMP_REPO_PATH)' --bare + +# Clone/update git history to bare repository +$(shell \ + if [ ! -d "$(TMP_REPO_PATH)" ]; then \ + git clone --mirror "$(PKG_SOURCE_URL)" "$(TMP_REPO_PATH)"; \ + else \ + git $(GIT_ARGS) remote update origin; \ + fi) diff --git a/personal-pkgs-repo/files/autopkg-tag.mk b/personal-pkgs-repo/files/autopkg-tag.mk index 6fe08d4..077c7ad 100644 --- a/personal-pkgs-repo/files/autopkg-tag.mk +++ b/personal-pkgs-repo/files/autopkg-tag.mk @@ -1,8 +1,8 @@ # Autopkg tracking latest version tag AUTOPKG_VARIANT:=tag -$(call include_mk, autopkg-common.mk) +$(call include_mk, autopkg-head.mk) PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) tag | grep '^v' | sort | tail -1) PKG_VERSION:=$(subst v%,%,$(PKG_SOURCE_VERSION)) -$(eval $(call AUTOPKG_TAIL)) +$(call include_mk, autopkg-tail.mk) diff --git a/personal-pkgs-repo/files/autopkg-tail.mk b/personal-pkgs-repo/files/autopkg-tail.mk new file mode 100644 index 0000000..3b6d104 --- /dev/null +++ b/personal-pkgs-repo/files/autopkg-tail.mk @@ -0,0 +1,13 @@ +ifndef AUTOPKG_VARIANT + $(error "Don't include autopkg-tail.mk directly!") +endif + +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME) + +undefine TMP_REPO_PATH +undefine GIT_ARGS +undefine AUTOPKG_TAIL -- cgit v1.2.3