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

login
register
mail settings
Submitter Matthew McClintock
Date Sept. 29, 2011, 7:11 p.m.
Message ID <1317323496-1818-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/12425/
State New, archived
Headers show

Comments

Matthew McClintock - Sept. 29, 2011, 7:11 p.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>
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 .../libnl/fix-pktloc_syntax_h-race.patch           |   29 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
McClintock Matthew-B29882 - Sept. 30, 2011, 4:09 a.m.
On Thu, Sep 29, 2011 at 2:11 PM, Matthew McClintock <msm@freescale.com> 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>
> Signed-off-by: Matthew McClintock <msm@freescale.com>

Please ignore this patch as it does not seem to fix the issue.

-M
Martin Jansa - Sept. 30, 2011, 7:13 a.m.
On Fri, Sep 30, 2011 at 04:09:37AM +0000, McClintock Matthew-B29882 wrote:
> On Thu, Sep 29, 2011 at 2:11 PM, Matthew McClintock <msm@freescale.com> 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>
> > Signed-off-by: Matthew McClintock <msm@freescale.com>
> 
> Please ignore this patch as it does not seem to fix the issue.

Why not use latest version of this patch?
http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/libnl/libnl/fix-pktloc-dep-race.patch
or meta-oe
http://git.openembedded.org/cgit.cgi/meta-openembedded/tree/meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch

seems like you're missing pktloc_grammar.h here..

and when you're at it, please also add packaging changes from meta-oe,
so we can remove libnl from meta-oe and keep only libnl1 there.

Regards,
McClintock Matthew-B29882 - Sept. 30, 2011, 4:58 p.m.
On Fri, Sep 30, 2011 at 2:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Sep 30, 2011 at 04:09:37AM +0000, McClintock Matthew-B29882 wrote:
>> On Thu, Sep 29, 2011 at 2:11 PM, Matthew McClintock <msm@freescale.com> 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>
>> > Signed-off-by: Matthew McClintock <msm@freescale.com>
>>
>> Please ignore this patch as it does not seem to fix the issue.
>
> Why not use latest version of this patch?
> http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/libnl/libnl/fix-pktloc-dep-race.patch
> or meta-oe
> http://git.openembedded.org/cgit.cgi/meta-openembedded/tree/meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch
>
> seems like you're missing pktloc_grammar.h here..
>
> and when you're at it, please also add packaging changes from meta-oe,
> so we can remove libnl from meta-oe and keep only libnl1 there.

I pulled this out of openembbeded repo. I guess I managed to mess
something up. Will resend/retest.

-M

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..1c3efb4
--- /dev/null
+++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
@@ -0,0 +1,29 @@ 
+Upstream-Status: Inappropriate old version / already fixed
+
+libnl has progressed to 0.3.2 and there does not appear to be any
+"make -j" issues with this build after my limited testing on that
+newer version so we can assume this issue is fixed upstream
+
+---
+ 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"