[OE-core] [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h

[Saul Wold]

On 09/30/2011 10:21 AM, Matthew McClintock wrote:
> From: Tom Rini<tom_rini at 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 at mentor.com>
> Signed-off-by: Matthew McClintock<msm at freescale.com>
> ---
>   .../libnl/fix-pktloc_syntax_h-race.patch           |   26 ++++++++++++++++++++
I just noticed that this patch get put in the libnl directory, not the 
libnl-2.0 directory.

Can you pull all the libnl changes together and resbumit this, also is 
there a reason you can not just update this to the latest libnl 3.2.1?

Cab you test that against the wpa-supplicant which seems to be libnl's 
sole dependee.

Thanks
	Sau!


>   meta/recipes-support/libnl/libnl_2.0.bb            |    3 +-
>   2 files changed, 28 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..05d75db
> --- /dev/null
> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> @@ -0,0 +1,26 @@
> +Upstream-Status: Inappropriate [configuration]
> +
> +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
> +
> +Index: libnl-2.0/lib/Makefile.am
> +===================================================================
> +--- libnl-2.0.orig/lib/Makefile.am
> ++++ libnl-2.0/lib/Makefile.am
> +@@ -27,11 +27,15 @@ CLEANFILES = \
> + 	route/pktloc_grammar.c route/pktloc_grammar.h \
> + 	route/pktloc_syntax.c route/pktloc_syntax.h
> +
> ++BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
> ++
> + # Hack to avoid using ylwrap. It does not function correctly in combination
> + # with --header-file=
> ++route/pktloc_grammar.h: route/pktloc_grammar.c
> + 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"