Patchwork make legal-info: fails with OVERRIDE_SRCDIR

login
register
mail settings
Submitter Stephan Hoffmann
Date Dec. 3, 2012, 10:05 a.m.
Message ID <1354529151-17426-1-git-send-email-sho@relinux.de>
Download mbox | patch
Permalink /patch/203305/
State Accepted
Commit 7f77121fdde5a0c16d9b6968c71e982d3e953d25
Headers show

Comments

Stephan Hoffmann - Dec. 3, 2012, 10:05 a.m.
There is a check for OVERRIDE_SRCDIR in pkg-generic.mk that is
supposed to produce a warning when OVERRIDE_SRCDIR is active.
This does not work and instead the whole make terminates with
an error message.

This patch changes the check for active OVERRIDE_SRCDIR so that
it works as expected.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
---
 package/pkg-generic.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Arnout Vandecappelle - Dec. 4, 2012, 10:21 p.m.
On 03/12/12 11:05, Stephan Hoffmann wrote:
> There is a check for OVERRIDE_SRCDIR in pkg-generic.mk that is
> supposed to produce a warning when OVERRIDE_SRCDIR is active.
> This does not work and instead the whole make terminates with
> an error message.
>
> This patch changes the check for active OVERRIDE_SRCDIR so that
> it works as expected.
>
> Signed-off-by: Stephan Hoffmann<sho@relinux.de>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  (visual inspection only)


  Regards,
  Arnout

> ---
>   package/pkg-generic.mk |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 9c4fffa..d6bcb67 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -479,7 +479,7 @@ ifneq ($(call qstrip,$$($(2)_SOURCE)),)
>   ifeq ($$($(2)_SITE_METHOD),local)
>   # Packages without a tarball: don't save and warn
>   	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
> -else ifeq ($$($(2)_SITE_METHOD),override)
> +else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
>   	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
>   else
>   # Other packages
Peter Korsgaard - Dec. 5, 2012, 7:30 p.m.
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:

 Stephan> There is a check for OVERRIDE_SRCDIR in pkg-generic.mk that is
 Stephan> supposed to produce a warning when OVERRIDE_SRCDIR is active.
 Stephan> This does not work and instead the whole make terminates with
 Stephan> an error message.

 Stephan> This patch changes the check for active OVERRIDE_SRCDIR so that
 Stephan> it works as expected.

Committed, thanks.
Stephan Hoffmann - Dec. 6, 2012, 10:26 a.m.
Am 05.12.2012 20:30, schrieb Peter Korsgaard:
>>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:
>  Stephan> There is a check for OVERRIDE_SRCDIR in pkg-generic.mk that is
>  Stephan> supposed to produce a warning when OVERRIDE_SRCDIR is active.
>  Stephan> This does not work and instead the whole make terminates with
>  Stephan> an error message.
>
>  Stephan> This patch changes the check for active OVERRIDE_SRCDIR so that
>  Stephan> it works as expected.
>
> Committed, thanks.
>
Hi,

sorry, but I forgot that Arnout's patch
http://lists.busybox.net/pipermail/buildroot/2012-October/059910.html is
not yet applied. My patch does not work without this.

Kind regards

Stephan
Peter Korsgaard - Dec. 6, 2012, 5:07 p.m.
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:

Hi,

 Stephan>     Committed, thanks.

 Stephan> Hi,

 Stephan> sorry, but I forgot that Arnout's patch
 Stephan> http://lists.busybox.net/pipermail/
 Stephan> buildroot/2012-October/059910.html is not yet applied. My
 Stephan> patch does not work without this.

Ahh, ok. Arnout, you mentioned you would rework and resend the patch:

http://lists.busybox.net/pipermail/buildroot/2012-October/059941.html
Arnout Vandecappelle - Dec. 6, 2012, 11:15 p.m.
On 06/12/12 18:07, Peter Korsgaard wrote:
>>>>>> "Stephan" == Stephan Hoffmann<sho@relinux.de>  writes:
>
> Hi,
>
>   Stephan>      Committed, thanks.
>
>   Stephan>  Hi,
>
>   Stephan>  sorry, but I forgot that Arnout's patch
>   Stephan>  http://lists.busybox.net/pipermail/
>   Stephan>  buildroot/2012-October/059910.html is not yet applied. My
>   Stephan>  patch does not work without this.
>
> Ahh, ok. Arnout, you mentioned you would rework and resend the patch:
>
> http://lists.busybox.net/pipermail/buildroot/2012-October/059941.html

  Which I did:
http://lists.busybox.net/pipermail/buildroot/2012-October/059954.html

  I'll resend with the ACKs.

  Regards,
  Arnout
Peter Korsgaard - Dec. 7, 2012, 1:12 a.m.
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Stephan> sorry, but I forgot that Arnout's patch
 Stephan> http://lists.busybox.net/pipermail/
 Stephan> buildroot/2012-October/059910.html is not yet applied. My
 Stephan> patch does not work without this.
 >> 
 >> Ahh, ok. Arnout, you mentioned you would rework and resend the patch:
 >> 
 >> http://lists.busybox.net/pipermail/buildroot/2012-October/059941.html

 Arnout>  Which I did:
 Arnout> http://lists.busybox.net/pipermail/buildroot/2012-October/059954.html

Ahh, sorry - And thanks.

Patch

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 9c4fffa..d6bcb67 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -479,7 +479,7 @@  ifneq ($(call qstrip,$$($(2)_SOURCE)),)
 ifeq ($$($(2)_SITE_METHOD),local)
 # Packages without a tarball: don't save and warn
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
-else ifeq ($$($(2)_SITE_METHOD),override)
+else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
 else
 # Other packages