diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-12-21 18:39:56 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-09 20:14:08 +0300 |
| commit | 41bc960acf8483c27c817ca525a2a46fc0382f97 (patch) | |
| tree | 852b788e6cb2c6b92d2f6071b858b58686805055 | |
| parent | 58708511636d307328afa609ddca152a56d6a9cd (diff) | |
build: add defaults for PKG_SOURCE, PKG_SOURCE_SUBDIR, PKG_VERSION
This makes it easier to unify versioning of git based package downloads.
PKG_SOURCE_DATE along with an 8-character abbreviation of the git hash
is used as PKG_VERSION, PKG_RELEASE should be used like normal packages.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/download.mk | 6 | ||||
| -rw-r--r-- | include/host-build.mk | 3 | ||||
| -rw-r--r-- | include/package.mk | 3 | ||||
| -rw-r--r-- | rules.mk | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/include/download.mk b/include/download.mk index 1d2d1bc06c..ca2b3c06f0 100644 --- a/include/download.mk +++ b/include/download.mk @@ -7,6 +7,12 @@ OPENWRT_GIT = http://git.openwrt.org +ifdef PKG_SOURCE_VERSION +PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION)) +PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz +endif + DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) # Try to guess the download method from the URL diff --git a/include/host-build.mk b/include/host-build.mk index 95e5185fe2..c8f3858abd 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -5,6 +5,8 @@ # See /LICENSE for more information. # +include $(INCLUDE_DIR)/download.mk + HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= @@ -35,7 +37,6 @@ HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed override MAKEFLAGS= -include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/autotools.mk diff --git a/include/package.mk b/include/package.mk index 9d03a9624b..fab4af1b24 100644 --- a/include/package.mk +++ b/include/package.mk @@ -9,6 +9,8 @@ __package_mk:=1 all: $(if $(DUMP),dumpinfo,compile) +include $(INCLUDE_DIR)/download.mk + PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_MD5SUM ?= unknown @@ -93,7 +95,6 @@ endif PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install -include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk @@ -49,6 +49,8 @@ __tr_template = $(__tr_head)$$(1)$(__tr_tail) $(eval toupper = $(call __tr_template,$(chars_lower),$(chars_upper))) $(eval tolower = $(call __tr_template,$(chars_upper),$(chars_lower))) +version_abbrev = $(if $(if $(CHECK),,$(DUMP)),$(1),$(shell printf '%.8s' $(1))) + _SINGLE=export MAKEFLAGS=$(space); CFLAGS:= ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH))))) |