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 | d96d98a88df57e3ac67915342d8a19ea379a067c (patch) | |
| tree | 897f83c0741be1ca562229a350d3e1bfff14ebe2 | |
| parent | bf8a64aa9bb193fbd7664f470a5038e4f67b655e (diff) | |
| download | upstream-d96d98a88df57e3ac67915342d8a19ea379a067c.tar.gz upstream-d96d98a88df57e3ac67915342d8a19ea379a067c.tar.bz2 upstream-d96d98a88df57e3ac67915342d8a19ea379a067c.zip | |
Small bugfix for dependency handling - mostly for base-files and symlinks
SVN-Revision: 7058
| -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),) |