qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

[buildsystem] make base-files dependent on opkg host compile, fixes install errors when package/compile and package/install are invoked separately

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22405 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-07-27 22:26:13 +00:00
parent 8d60ad1361
commit b31d05c970
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/Makefile
View File

@ -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)))