Patchwork [01/16] libnl2: Fix a race on route/pktloc_syntax.h

login
register
mail settings
Submitter Matthew McClintock
Date Sept. 29, 2011, 4:20 a.m.
Message ID <1317270070-14250-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/12379/
State New, archived
Headers show

Comments

Matthew McClintock - Sept. 29, 2011, 4:20 a.m.
From: Tom Rini <tom_rini@mentor.com>

At issue is that route/pktloc.c (not generated) depends on
route/pktloc_syntax.h (generated).

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../libnl/fix-pktloc_syntax_h-race.patch           |   23 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
 2 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
Richard Purdie - Sept. 29, 2011, 3:47 p.m.
On Wed, 2011-09-28 at 23:20 -0500, Matthew McClintock wrote:
> From: Tom Rini <tom_rini@mentor.com>
> 
> At issue is that route/pktloc.c (not generated) depends on
> route/pktloc_syntax.h (generated).
> 
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> ---
>  .../libnl/fix-pktloc_syntax_h-race.patch           |   23 ++++++++++++++++++++
>  meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
>  2 files changed, 25 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> 
> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> new file mode 100644
> index 0000000..d396f96
> --- /dev/null
> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> @@ -0,0 +1,23 @@
> +---

Missing patch header...

Cheers,

Richard
McClintock Matthew-B29882 - Sept. 29, 2011, 6:28 p.m.
On Thu, Sep 29, 2011 at 10:47 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-09-28 at 23:20 -0500, Matthew McClintock wrote:
>> From: Tom Rini <tom_rini@mentor.com>
>>
>> At issue is that route/pktloc.c (not generated) depends on
>> route/pktloc_syntax.h (generated).
>>
>> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>> ---
>>  .../libnl/fix-pktloc_syntax_h-race.patch           |   23 ++++++++++++++++++++
>>  meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
>>  2 files changed, 25 insertions(+), 1 deletions(-)
>>  create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>>
>> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>> new file mode 100644
>> index 0000000..d396f96
>> --- /dev/null
>> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>> @@ -0,0 +1,23 @@
>> +---
>
> Missing patch header...

How would I mark this when this is an old version of libnl and it
appears not to be a problem the latest version of libnl?

-M
Richard Purdie - Sept. 29, 2011, 6:38 p.m.
On Thu, 2011-09-29 at 18:28 +0000, McClintock Matthew-B29882 wrote:
> On Thu, Sep 29, 2011 at 10:47 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Wed, 2011-09-28 at 23:20 -0500, Matthew McClintock wrote:
> >> From: Tom Rini <tom_rini@mentor.com>
> >>
> >> At issue is that route/pktloc.c (not generated) depends on
> >> route/pktloc_syntax.h (generated).
> >>
> >> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> >> ---
> >>  .../libnl/fix-pktloc_syntax_h-race.patch           |   23 ++++++++++++++++++++
> >>  meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
> >>  2 files changed, 25 insertions(+), 1 deletions(-)
> >>  create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> >>
> >> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> >> new file mode 100644
> >> index 0000000..d396f96
> >> --- /dev/null
> >> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> >> @@ -0,0 +1,23 @@
> >> +---
> >
> > Missing patch header...
> 
> How would I mark this when this is an old version of libnl and it
> appears not to be a problem the latest version of libnl?

I don't have the patch status field entries handy but you can certainly
document that the issue isn't present in version X so its likely been
fixed upstream already. I guess "Inappropriate" would cover that if
nothing else does.

Cheers,

Richard
Saul Wold - Sept. 30, 2011, 5:01 p.m.
On 09/29/2011 11:38 AM, Richard Purdie wrote:
> On Thu, 2011-09-29 at 18:28 +0000, McClintock Matthew-B29882 wrote:
>> On Thu, Sep 29, 2011 at 10:47 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org>  wrote:
>>> On Wed, 2011-09-28 at 23:20 -0500, Matthew McClintock wrote:
>>>> From: Tom Rini<tom_rini@mentor.com>
>>>>
>>>> At issue is that route/pktloc.c (not generated) depends on
>>>> route/pktloc_syntax.h (generated).
>>>>
>>>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>>>> ---
>>>>   .../libnl/fix-pktloc_syntax_h-race.patch           |   23 ++++++++++++++++++++
>>>>   meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
>>>>   2 files changed, 25 insertions(+), 1 deletions(-)
>>>>   create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>>>>
>>>> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>>>> new file mode 100644
>>>> index 0000000..d396f96
>>>> --- /dev/null
>>>> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>>>> @@ -0,0 +1,23 @@
>>>> +---
>>>
>>> Missing patch header...
>>
>> How would I mark this when this is an old version of libnl and it
>> appears not to be a problem the latest version of libnl?
>
> I don't have the patch status field entries handy but you can certainly
> document that the issue isn't present in version X so its likely been
> fixed upstream already. I guess "Inappropriate" would cover that if
> nothing else does.
>
Just for reference:

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

This contains the Upstream-Status: entries.

Thanks
	Sau!

> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
new file mode 100644
index 0000000..d396f96
--- /dev/null
+++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
@@ -0,0 +1,23 @@ 
+---
+ lib/Makefile.am |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: libnl-2.0/lib/Makefile.am
+===================================================================
+--- libnl-2.0.orig/lib/Makefile.am
++++ libnl-2.0/lib/Makefile.am
+@@ -27,11 +27,14 @@ CLEANFILES = \
+ 	route/pktloc_grammar.c route/pktloc_grammar.h \
+ 	route/pktloc_syntax.c route/pktloc_syntax.h
+ 
++BUILT_SOURCES = route/pktloc_syntax.h
++
+ # Hack to avoid using ylwrap. It does not function correctly in combination
+ # with --header-file=
+ route/pktloc_grammar.c: route/pktloc_grammar.l
+ 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
+ 
++route/pktloc_syntax.h: route/pktloc_syntax.c
+ route/pktloc_syntax.c: route/pktloc_syntax.y
+ 	$(YACC) -d $(YFLAGS) -o $@ $^
+ 
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 0dfcaf6..5339846 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -6,10 +6,11 @@  LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
 
 DEPENDS = "flex-native bison-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
           file://fix-makefile.patch \
+	  file://fix-pktloc_syntax_h-race.patch \
          "
 
 SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"