fix spontaneous rebuilds caused by make package/<name>/update with quilt
authorFelix Fietkau <nbd@openwrt.org>
Thu, 20 Sep 2007 16:17:50 +0000 (16:17 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 20 Sep 2007 16:17:50 +0000 (16:17 +0000)
SVN-Revision: 8879

include/host-build.mk
include/package.mk
include/quilt.mk

index 581c2cfd4e74fbe273913a73598e48230f42e41f..88129aad079cd83f39ecc4fc7a5ce7be8df185f0 100644 (file)
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 
-STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))
+STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
index 591816b7559d63ea8adb839b72699c8de2ca6d14..43d0663f6038fdad36b4d27a903abfb4ddfe441a 100644 (file)
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 
-STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared$(if $(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
+STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 
index a2cbdf9eeb49a5a472d43508eb53ce91f53b631f..a7aac91c06cd230975655ef0869e258c46415d0d 100644 (file)
@@ -26,7 +26,6 @@ endef
 
 QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
 ifneq ($(QUILT),)
-  STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
   STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
   override CONFIG_AUTOREBUILD=
   define Build/Patch/Default