diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-04-26 18:04:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-04-26 18:04:16 +0000 |
| commit | 2dcaf582db6426bfaf995f9427cdefce26a3e634 (patch) | |
| tree | 31ef8fcba317d3a164170e1106aa21d773d70777 | |
| parent | 3efafd390f1b7518e38cb91cca0b3d991ce7e00e (diff) | |
| download | upstream-2dcaf582db6426bfaf995f9427cdefce26a3e634.tar.gz upstream-2dcaf582db6426bfaf995f9427cdefce26a3e634.tar.bz2 upstream-2dcaf582db6426bfaf995f9427cdefce26a3e634.zip | |
Small bugfix for dependency handling - mostly for base-files and symlinks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7058 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/host-build.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 4 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 13bd162520..591a36bd38 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -80,7 +80,7 @@ endif ifneq ($(CONFIG_AUTOREBUILD),) define HostBuild/Autoclean $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) - $(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) + $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*") endef endif diff --git a/include/package.mk b/include/package.mk index c31b955885..fe6a7617c8 100644 --- a/include/package.mk +++ b/include/package.mk @@ -26,8 +26,8 @@ export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) ifneq ($(CONFIG_AUTOREBUILD),) define Build/Autoclean $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) - $(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) - $(call rdep,$(PKG_BUILD_DIR) $(PKG_FILE_DEPEND),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*") + $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) + $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*") endef endif diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e267b7f78b..8d265f07ee 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -13,7 +13,7 @@ PKG_NAME:=base-files PKG_RELEASE:=8 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) -PKG_FILE_DEPEND:=$(PLATFORM_DIR) $(GENERIC_PLATFORM_DIR)/base-files +PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) ifeq ($(REV),) |