diff options
| -rw-r--r-- | autopkg-branch.mk | 4 | ||||
| -rw-r--r-- | autopkg-tag.mk | 4 | ||||
| -rw-r--r-- | autopkg-tail.mk | 1 | ||||
| -rw-r--r-- | shellrc/Makefile | 2 | ||||
| -rw-r--r-- | updater-ng/Makefile | 6 |
5 files changed, 8 insertions, 9 deletions
diff --git a/autopkg-branch.mk b/autopkg-branch.mk index 9b587b3..977fed3 100644 --- a/autopkg-branch.mk +++ b/autopkg-branch.mk @@ -1,6 +1,6 @@ # Autopkg tracking given branch AUTOPKG_VARIANT:=branch -include $(TOPDIR)/feeds/personal/autopkg-head.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 -include $(TOPDIR)/feeds/personal/autopkg-tail.mk +include $(TOPDIR)/package/autopkg-tail.mk diff --git a/autopkg-tag.mk b/autopkg-tag.mk index 1524e2c..11adc22 100644 --- a/autopkg-tag.mk +++ b/autopkg-tag.mk @@ -1,8 +1,8 @@ # Autopkg tracking latest version tag AUTOPKG_VARIANT:=tag -include $(TOPDIR)/feeds/personal/autopkg-head.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)) -include $(TOPDIR)/feeds/personal/autopkg-tail.mk +include $(TOPDIR)/package/autopkg-tail.mk diff --git a/autopkg-tail.mk b/autopkg-tail.mk index 3b6d104..f4872fd 100644 --- a/autopkg-tail.mk +++ b/autopkg-tail.mk @@ -10,4 +10,3 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME) undefine TMP_REPO_PATH undefine GIT_ARGS -undefine AUTOPKG_TAIL diff --git a/shellrc/Makefile b/shellrc/Makefile index 55f7dcb..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> -include $(TOPDIR)/feeds/personal/autopkg-tag.mk +include $(TOPDIR)/package/autopkg-tag.mk include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) diff --git a/updater-ng/Makefile b/updater-ng/Makefile index 17b8020..7382529 100644 --- a/updater-ng/Makefile +++ b/updater-ng/Makefile @@ -14,11 +14,11 @@ PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host PKG_BUILD_DEPENDS:=busybox -include $(TOPDIR)/feeds/personal/autopkg-branch.mk +include $(TOPDIR)/package/autopkg-branch.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include $(TOPDIR)/feeds/packages/lang/python/python-package.mk -include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk +$(call include_mk, python-package.mk) +$(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=The next generation updater |