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>

diff --git a/include/subdir.mk b/include/subdir.mk
index 6bbf23a492289876382a76679c47759c80bc8fe4..6db4eaa7813a11147f7888eecea33a580e0cba1c 100644 (file)
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -61,7 +61,7 @@ define subdir
   $(call warn,$(1),d,D $(1))
   $(foreach bd,$($(1)/builddirs),
     $(call warn,$(1),d,BD $(1)/$(bd))
   $(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))) \
       $(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
 endef
 
 ifndef DUMP_TARGET_DB

diff --git a/package/Makefile b/package/Makefile
index 6929c479a29144573073154c1d93e90d97198aa4..fd0e88ff3816ccc248a831297025d929b088abf8 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,6 @@ include $(INCLUDE_DIR)/rootfs.mk
 -include $(TMP_DIR)/.packagedeps
 $(curdir)/autoremove:=1
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
 -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
 $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
 $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
 ifdef CHECK_ALL

diff --git a/rules.mk b/rules.mk
index 83d71671c42ba9f5f092cf184997832c5044a80a..5d30baba8563311b403a3a7f3c85c626ba3a07ac 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -101,7 +101,7 @@ ifdef CONFIG_MIPS64_ABI
   endif
 endif
 
   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),
 
 define DefaultTargets
 $(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1),

diff --git a/target/Makefile b/target/Makefile
index db87c78aaef62b541d30c1ce9a43eaa78b42c30a..7ad26c71778743279319ee1ff0b562c69b16dabe 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -6,6 +6,7 @@
 #
 curdir:=target
 
 #
 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)
 $(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)