mirror of https://github.com/hak5/openwrt.git
build: make <subdir>/install opt-in, use it for target/ only
Fixes buildbot errors on running make target/install or toolchain/install Signed-off-by: Felix Fietkau <nbd@nbd.name>openwrt-18.06
parent
da0b9110fc
commit
d826af2cbb
|
@ -61,7 +61,7 @@ define subdir
|
|||
$(call warn,$(1),d,D $(1))
|
||||
$(foreach bd,$($(1)/builddirs),
|
||||
$(call warn,$(1),d,BD $(1)/$(bd))
|
||||
$(foreach target,$(SUBTARGETS),
|
||||
$(foreach target,$(SUBTARGETS) $($(1)/subtargets),
|
||||
$(foreach btype,$(buildtypes-$(bd)),
|
||||
$(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(btype)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(btype)/$(target)) $(call $(1)//$(btype)/$(target),$(1)/$(bd)/$(btype))))
|
||||
$(call log_make,$(1)/$(bd),$(target),$(btype),$(filter-out __default,$(variant))) \
|
||||
|
@ -81,7 +81,7 @@ define subdir
|
|||
)
|
||||
)
|
||||
)
|
||||
$(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target)))
|
||||
$(foreach target,$(SUBTARGETS) $($(1)/subtargets),$(call subtarget,$(1),$(target)))
|
||||
endef
|
||||
|
||||
ifndef DUMP_TARGET_DB
|
||||
|
|
|
@ -12,7 +12,6 @@ include $(INCLUDE_DIR)/rootfs.mk
|
|||
-include $(TMP_DIR)/.packagedeps
|
||||
$(curdir)/autoremove:=1
|
||||
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
|
||||
$(curdir)/builddirs-install:=.
|
||||
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
|
||||
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
||||
ifdef CHECK_ALL
|
||||
|
|
2
rules.mk
2
rules.mk
|
@ -101,7 +101,7 @@ ifdef CONFIG_MIPS64_ABI
|
|||
endif
|
||||
endif
|
||||
|
||||
DEFAULT_SUBDIR_TARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure check check-depends
|
||||
DEFAULT_SUBDIR_TARGETS:=clean download prepare compile update refresh prereq dist distcheck configure check check-depends
|
||||
|
||||
define DefaultTargets
|
||||
$(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1),
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#
|
||||
curdir:=target
|
||||
|
||||
$(curdir)/subtargets:=install
|
||||
$(curdir)/builddirs:=linux sdk imagebuilder toolchain
|
||||
$(curdir)/builddirs-default:=linux
|
||||
$(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder) $(if $(CONFIG_MAKE_TOOLCHAIN),toolchain)
|
||||
|
|
Loading…
Reference in New Issue