X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=a3ef3029d80b79af6d8a8481f3b4374effcf0d27;hb=9467ce42da7fbcec1a4b5b8e08e2dcea3c67aa96;hp=95b5f76dc3895e88c8115876c4c97359193cc9c6;hpb=5aa03e16a732e81a989a9605706dc8c6bb95d03f;p=openwrt%2Fstaging%2Fyousong.git diff --git a/include/package.mk b/include/package.mk index 95b5f76dc3..a3ef3029d8 100644 --- a/include/package.mk +++ b/include/package.mk @@ -37,7 +37,6 @@ endif include $(INCLUDE_DIR)/hardening.mk include $(INCLUDE_DIR)/prereq.mk -include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk @@ -156,6 +155,7 @@ define Build/CoreTargets $(STAMP_PREPARED): $(STAMP_PREPARED_DEPENDS) @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) + touch $$@_check $(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep)) $(Build/Prepare) $(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep)) @@ -172,6 +172,8 @@ define Build/CoreTargets $(call Build/Exports,$(STAMP_BUILT)) $(STAMP_BUILT): $(STAMP_CONFIGURED) $(STAMP_BUILT_DEPENDS) + rm -f $$@ + touch $$@_check $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep)) $(Build/Compile) $(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep)) @@ -216,6 +218,7 @@ define Build/CoreTargets ifneq ($(CONFIG_AUTOREMOVE),) compile: + -touch $(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null $(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' | \ $(XARGS) rm -rf endif @@ -300,12 +303,16 @@ compile: prepare-package-install .install: .compile install: compile -clean: FORCE +force-clean-build: FORCE + rm -rf $(PKG_BUILD_DIR) + +clean-build: $(if $(wildcard $(PKG_BUILD_DIR)/.autoremove),force-clean-build) + +clean: force-clean-build $(CleanStaging) $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) $(Build/Clean) rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST) - rm -rf $(PKG_BUILD_DIR) dist: $(Build/Dist)