Merge branch 'master' into turris3x

6 files changed, 26 insertions, 25 deletions

diff --git a/autopkg-branch.mk b/autopkg-branch.mk
index 871cffb..977fed3 100644
--- a/autopkg-branch.mk
+++ b/autopkg-branch.mk
@@ -1,6 +1,6 @@
 # Autopkg tracking given branch
 AUTOPKG_VARIANT:=branch
-$(call include_mk, autopkg-common.mk)
+include $(TOPDIR)/package/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))
+include $(TOPDIR)/package/autopkg-tail.mk
diff --git a/autopkg-common.mk b/autopkg-head.mk
index c539e1a..a61c964 100644
--- a/autopkg-common.mk
+++ b/autopkg-head.mk
@@ -1,5 +1,5 @@
 ifndef AUTOPKG_VARIANT
-	$(error "Don't include autopkg-common.mk directly!")
+	$(error "Don't include autopkg-head.mk directly!")
 endif
 
 ifndef PKG_NAME
@@ -13,24 +13,9 @@ TMP_REPO_PATH=$(DL_DIR)/autopkg/$(PKG_NAME)
 GIT_ARGS=--git-dir='$(TMP_REPO_PATH)' --bare
 
 # Clone/update git history to bare repository
-$(shell \
+$(info $(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
+	fi))
diff --git a/autopkg-tag.mk b/autopkg-tag.mk
index 6fe08d4..11adc22 100644
--- a/autopkg-tag.mk
+++ b/autopkg-tag.mk
@@ -1,8 +1,8 @@
 # Autopkg tracking latest version tag
 AUTOPKG_VARIANT:=tag
-$(call include_mk, autopkg-common.mk)
+include $(TOPDIR)/package/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))
+include $(TOPDIR)/package/autopkg-tail.mk
diff --git a/autopkg-tail.mk b/autopkg-tail.mk
new file mode 100644
index 0000000..f4872fd
--- /dev/null
+++ b/autopkg-tail.mk
@@ -0,0 +1,12 @@
+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
diff --git a/shellrc/Makefile b/shellrc/Makefile
index 628dd9f..034e047 100644
--- a/shellrc/Makefile
+++ b/shellrc/Makefile
@@ -12,7 +12,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL:=https://git.cynerd.cz/shellrc
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
-$(call include_mk, autopkg-tag.mk)
+include $(TOPDIR)/package/autopkg-tag.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -51,8 +51,12 @@ define Package/$(PKG_NAME)-zsh/install
 endef
 
 define Package/$(PKG_NAME)-ash/install
+	true
 	# TODO
 	#$(PKG_BUILD_DIR)/install --prefix "$(1)" --ash --no-base
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)-bash))
+$(eval $(call BuildPackage,$(PKG_NAME)-zsh))
+$(eval $(call BuildPackage,$(PKG_NAME)-ash))
diff --git a/updater-ng/Makefile b/updater-ng/Makefile
index 782de90..7382529 100644
--- a/updater-ng/Makefile
+++ b/updater-ng/Makefile
@@ -12,9 +12,9 @@ PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git
 PKG_SOURCE_BRANCH:=master
 PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
 HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host
-PKG_BUILD_DEPENDS+=busybox-static
+PKG_BUILD_DEPENDS:=busybox
 
-$(call include_mk, autopkg-branch.mk)
+include $(TOPDIR)/package/autopkg-branch.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 $(call include_mk, python-package.mk)