Commit 671b0e16 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

pkg-generic: take into account patch dependencies in source, external-deps and legal-info 



The $(1)-all-{source,external-deps,legal-info} targets currently only
take care of the dependencies in <pkg>_DEPENDENCIES, but not
<pkg>_PATCH_DEPENDENCIES. This patch fixes that by introducing a
<pkg>_FINAL_ALL_DEPENDENCIES. It also reworks the $(1)-show-depends
target to make use of <pkg>_FINALL_ALL_DEPENDENCIES.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 697e6247

package/pkg-generic.mk

+8 −4
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ endif 
# Eliminate duplicates in dependencies

$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))

$(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES))

$(2)_FINAL_ALL_DEPENDENCIES = $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES))



$(2)_INSTALL_STAGING		?= NO

$(2)_INSTALL_IMAGES		?= NO
@@ -583,7 +584,7 @@ $(1)-show-version: 
			@echo $$($(2)_VERSION)



$(1)-show-depends:

			@echo $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES))

			@echo $$($(2)_FINAL_ALL_DEPENDENCIES)



$(1)-graph-depends: graph-depends-requirements

			@$$(INSTALL) -d $$(GRAPHS_DIR)
@@ -592,11 +593,14 @@ $(1)-graph-depends: graph-depends-requirements 
			|tee $$(GRAPHS_DIR)/$$(@).dot \

			|dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) -o $$(GRAPHS_DIR)/$$(@).$$(BR_GRAPH_OUT)



$(1)-all-source:       $$(foreach p,$$($(2)_FINAL_DEPENDENCIES),$$(p)-all-source) $(1)-source

$(1)-all-source:	$(1)-source

$(1)-all-source:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source)



$(1)-all-external-deps:        $$(foreach p,$$($(2)_FINAL_DEPENDENCIES),$$(p)-all-external-deps) $(1)-external-deps

$(1)-all-external-deps:	$(1)-external-deps

$(1)-all-external-deps:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-external-deps)



$(1)-all-legal-info:   $$(foreach p,$$($(2)_FINAL_DEPENDENCIES),$$(p)-all-legal-info) $(1)-legal-info

$(1)-all-legal-info:	$(1)-legal-info

$(1)-all-legal-info:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-legal-info)



$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)