mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-20 09:04:42 +02:00
[buildsystem] make base-files dependent on opkg host compile, fixes install errors when package/compile and package/install are invoked separately
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22405 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
8d60ad1361
commit
b31d05c970
@ -12,6 +12,7 @@ $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
|
|||||||
ifeq ($(SDK),1)
|
ifeq ($(SDK),1)
|
||||||
$(curdir)/builddirs-install:=.
|
$(curdir)/builddirs-install:=.
|
||||||
else
|
else
|
||||||
|
$(curdir)/base-files/compile += $(curdir)/opkg/host/compile
|
||||||
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
|
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
|
||||||
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
||||||
$(curdir)/builddirs-install:=. $(sort $(package-y))
|
$(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))
|
$(curdir)/builddirs-ignore-compile:= $(if $(filter m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(curdir)/opkghost: $(TMP_DIR)/.build
|
|
||||||
@-$(MAKE) package/opkg/host/install
|
|
||||||
|
|
||||||
$(curdir)/install:=$(curdir)/install-cleanup
|
$(curdir)/install:=$(curdir)/install-cleanup
|
||||||
|
|
||||||
$(curdir)/cleanup: $(TMP_DIR)/.build
|
$(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,prereq,.config))
|
||||||
$(eval $(call stampfile,$(curdir),package,cleanup))
|
$(eval $(call stampfile,$(curdir),package,cleanup))
|
||||||
$(eval $(call stampfile,$(curdir),package,compile))
|
$(eval $(call stampfile,$(curdir),package,compile))
|
||||||
$(eval $(call stampfile,$(curdir),package,opkghost))
|
$(eval $(call stampfile,$(curdir),package,install))
|
||||||
$(eval $(call stampfile,$(curdir),package,install,$(STAGING_DIR)/stamp/.package_opkghost))
|
|
||||||
$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
|
$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
|
||||||
|
|
||||||
$(eval $(call subdir,$(curdir)))
|
$(eval $(call subdir,$(curdir)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user