From 97595d11fb3a4e46aae18dce2147a66e205fa9e0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 14 Mar 2015 15:25:17 +0100 Subject: [PATCH] package infra: add patch-dependencies Some packages need to vampirise files from one or more other packages. This is the case, for example, of the Linux kernel and its /extensions/. Add a new type of dependencies, that are guaranteed to be extracted and patched before a package is patched. [Thomas: remove -show-build-depends and -show-patch-depends, since they don't seem to really be necessary and very useful.] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f77aab27d5..1d56f81778 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -428,6 +428,7 @@ endif # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) +$(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES)) $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO @@ -539,6 +540,8 @@ $$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH) $(1)-patch: $$($(2)_TARGET_PATCH) $$($(2)_TARGET_PATCH): $$($(2)_TARGET_EXTRACT) +# Order-only dependency +$$($(2)_TARGET_PATCH): | $$(patsubst %,%-patch,$$($(2)_FINAL_PATCH_DEPENDENCIES)) $(1)-extract: $$($(2)_TARGET_EXTRACT) $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) @@ -578,7 +581,7 @@ $(1)-show-version: @echo $$($(2)_VERSION) $(1)-show-depends: - @echo $$($(2)_FINAL_DEPENDENCIES) + @echo $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES)) $(1)-graph-depends: graph-depends-requirements @$$(INSTALL) -d $$(GRAPHS_DIR) -- 2.30.2