Patchwork pkg-infra: add <pkg>-extract and <pkg>-patch targets to OVERRIDE support

login
register
mail settings
Submitter Arnout Vandecappelle
Date Dec. 6, 2012, 11:16 p.m.
Message ID <1354835760-9357-1-git-send-email-arnout@mind.be>
Download mbox | patch
Permalink /patch/204336/
State Accepted
Headers show

Comments

Arnout Vandecappelle - Dec. 6, 2012, 11:16 p.m.
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>

The legal-info target (and possibly others as well) depends on
<pkg>-extract to make sure the license file is available.  However,
when <PKG>_OVERRIDE_SRCDIR is active, the <pkg>-extract target
doesn't exist.

To solve this, we add <pkg>-extract which depends on <pkg>-rsync.
While we're at it, we do the same for <pkg>-patch.  That avoids the
same problem in the future if something starts depending on
<pkg>-patch.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
v2: As ThomasP suggested, don't remove <pkg>-rsync.
---
 package/pkg-generic.mk |    3 +++
 1 file changed, 3 insertions(+)
Peter Korsgaard - Dec. 7, 2012, 1:14 a.m.
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

Hi,

 Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
 Arnout> The legal-info target (and possibly others as well) depends on
 Arnout> <pkg>-extract to make sure the license file is available.  However,
 Arnout> when <PKG>_OVERRIDE_SRCDIR is active, the <pkg>-extract target
 Arnout> doesn't exist.

 Arnout> To solve this, we add <pkg>-extract which depends on <pkg>-rsync.
 Arnout> While we're at it, we do the same for <pkg>-patch.  That avoids the
 Arnout> same problem in the future if something starts depending on
 Arnout> <pkg>-patch.

 Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 Arnout> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Arnout> Acked-by: Luca Ceresoli <luca@lucaceresoli.net>

Committed, thanks.
Stephan Hoffmann - Dec. 7, 2012, 10:32 a.m.
Am 07.12.2012 02:14, schrieb Peter Korsgaard:
>>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> Hi,
>
>  Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
>  Arnout> The legal-info target (and possibly others as well) depends on
>  Arnout> <pkg>-extract to make sure the license file is available.  However,
>  Arnout> when <PKG>_OVERRIDE_SRCDIR is active, the <pkg>-extract target
>  Arnout> doesn't exist.
>
>  Arnout> To solve this, we add <pkg>-extract which depends on <pkg>-rsync.
>  Arnout> While we're at it, we do the same for <pkg>-patch.  That avoids the
>  Arnout> same problem in the future if something starts depending on
>  Arnout> <pkg>-patch.
>
>  Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>  Arnout> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>  Arnout> Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
>
> Committed, thanks.
>
Thanks, now legal info works together with OVERRIDE.

Stephan

Patch

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 6fcd359..13c1d83 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -390,6 +390,9 @@  $(1)-configure:		$(1)-depends \
 
 $(1)-depends:		$(1)-rsync $$($(2)_DEPENDENCIES)
 
+$(1)-patch:		$(1)-rsync
+$(1)-extract:		$(1)-rsync
+
 $(1)-rsync:		$$($(2)_TARGET_RSYNC)
 
 $(1)-source:		$$($(2)_TARGET_RSYNC_SOURCE)