X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/aa1fa7f74a6706801583cd097b114f01c5904b92..3fa8e269558880eeb4d68aaa4a6edb31c702e1de:/include/package.mk diff --git a/include/package.mk b/include/package.mk index 9bffcd156..22808654d 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,8 +16,8 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk -STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured +STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) +STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) STAMP_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed @@ -42,12 +42,23 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) define Build/Autoclean $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) - $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*") + $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*") $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),,-x "*/.dep_*" -x "*/ipkg*")) endef endif endif +ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_SOURCE_DIR),y) +# disable load stage +PKG_SOURCE_URL:= +# add hook to install a link to customer source path of dedicated package +Hooks/Prepare/Pre += prepare_custom_source_directory +# define empty default action +define Build/Prepare/Default + @: +endef +endif + define Download/default FILE:=$(PKG_SOURCE) URL:=$(PKG_SOURCE_URL) @@ -130,6 +141,8 @@ define Build/DefaultTargets prepare: $(STAMP_PREPARED) configure: $(STAMP_CONFIGURED) + dist: $(STAMP_CONFIGURED) + distcheck: $(STAMP_CONFIGURED) endef define BuildPackage @@ -178,6 +191,8 @@ Build/Prepare=$(call Build/Prepare/Default,) Build/Configure=$(call Build/Configure/Default,) Build/Compile=$(call Build/Compile/Default,) Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,)) +Build/Dist=$(call Build/Dist/Default,) +Build/DistCheck=$(call Build/DistCheck/Default,) $(PACKAGE_DIR): mkdir -p $@ @@ -202,3 +217,9 @@ clean: clean-staging FORCE $(Build/Clean) rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list rm -rf $(PKG_BUILD_DIR) + +dist: + $(Build/Dist) + +distcheck: + $(Build/DistCheck)