Skip to contentSkip to conversation

make legal-info: fails with OVERRIDE_SRCDIR

PATCH New Stephan Hoffmann 3 participants 7 messages Dec 3, 2012 – Dec 7, 2012

lore
Share & tools
lore

Stephan Hoffmann

author
#0 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

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 <[email protected]>
---
 package/pkg-generic.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/pkg-generic.mk +1 -1
index 9c4fffa..d6bcb67 100644
@@ -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
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

Quoted 9 lines · Stephan Hoffmann

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<[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

(visual inspection only)

Regards,
Arnout

Quoted 17 lines
---
  package/pkg-generic.mk |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
package/pkg-generic.mk +1 -1
index 9c4fffa..d6bcb67 100644
@@ -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
Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

In reply to Stephan Hoffmann
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

Am 05.12.2012 20:30, schrieb Peter Korsgaard:

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann <[email protected]> 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

Signature · 9 lines
reLinux     -    Stephan Hoffmann
Am Schmidtgrund 124    50765 K?ln
Tel. +49.221.95595-19    Fax: -64
www.reLinux.de     sho at reLinux.de


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121206/040baca5/attachment.html>
#4 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann <[email protected]> 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

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

Quoted 8 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann<[email protected]> writes:

Hi,

Stephan> Committed, thanks.

Stephan> Hi,

Quoted 8 lines
  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

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#6 lore raw

PATCH 1/1 make legal-info: fails with OVERRIDE_SRCDIR

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> 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.

Quoted 4 lines
Quoted 4 lines

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.

Signature · 1 line
Bye, Peter Korsgaard