aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-07-27 22:26:13 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-07-27 22:26:13 +0000
commitceeb9a8013e4416953d7ced30893ff87375a85b9 (patch)
tree68f6056a69b16b68fd342d7a132df1a6e3faaa69
parent39e013d003cf8736fddb43bf8836428f06592ae9 (diff)
downloadupstream-ceeb9a8013e4416953d7ced30893ff87375a85b9.tar.gz
upstream-ceeb9a8013e4416953d7ced30893ff87375a85b9.tar.bz2
upstream-ceeb9a8013e4416953d7ced30893ff87375a85b9.zip
make base-files dependent on opkg host compile, fixes install errors when package/compile and package/install are invoked separately
SVN-Revision: 22405
-rw-r--r--package/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/Makefile b/package/Makefile
index 530405cd06..3c7b0b49bc 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,6 +12,7 @@ $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
ifeq ($(SDK),1)
$(curdir)/builddirs-install:=.
else
+ $(curdir)/base-files/compile += $(curdir)/opkg/host/compile
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
$(curdir)/builddirs-install:=. $(sort $(package-y))
@@ -20,9 +21,6 @@ ifneq ($(IGNORE_ERRORS),)
$(curdir)/builddirs-ignore-compile:= $(if $(filter m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m))
endif
-$(curdir)/opkghost: $(TMP_DIR)/.build
- @-$(MAKE) package/opkg/host/install
-
$(curdir)/install:=$(curdir)/install-cleanup
$(curdir)/cleanup: $(TMP_DIR)/.build
@@ -93,8 +91,7 @@ $(curdir)/flags-install:= -j1
$(eval $(call stampfile,$(curdir),package,prereq,.config))
$(eval $(call stampfile,$(curdir),package,cleanup))
$(eval $(call stampfile,$(curdir),package,compile))
-$(eval $(call stampfile,$(curdir),package,opkghost))
-$(eval $(call stampfile,$(curdir),package,install,$(STAGING_DIR)/stamp/.package_opkghost))
+$(eval $(call stampfile,$(curdir),package,install))
$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
$(eval $(call subdir,$(curdir)))