From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1RNUW8-00072B-Bl for openembedded-core@lists.openembedded.org; Mon, 07 Nov 2011 20:06:00 +0100 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 07 Nov 2011 10:59:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.69,471,1315206000"; d="scan'208";a="71476832" Received: from unknown (HELO [10.255.12.14]) ([10.255.12.14]) by azsmga001.ch.intel.com with ESMTP; 07 Nov 2011 10:59:45 -0800 Message-ID: <4EB82AA1.1030206@linux.intel.com> Date: Mon, 07 Nov 2011 10:59:45 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1320339165-25029-1-git-send-email-Martin.Jansa@gmail.com> In-Reply-To: <1320339165-25029-1-git-send-email-Martin.Jansa@gmail.com> Cc: Martin Jansa Subject: Re: [PATCH 1/4] libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2011 19:06:00 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 11/03/2011 09:52 AM, Martin Jansa wrote: > Signed-off-by: Martin Jansa > --- > .../libnl/libnl-2.0/fix-makefile.patch | 32 -------------------- > .../{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch | 5 ++- > meta/recipes-support/libnl/libnl_2.0.bb | 8 ++-- > 3 files changed, 8 insertions(+), 37 deletions(-) > delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch > rename meta/recipes-support/libnl/{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch (86%) > > diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch > deleted file mode 100644 > index 3e88fbd..0000000 > --- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -Upstream-Status: Pending > - > -12/03/2010 > - > -add explicit rules for header files generated by lex and yacc, > -otherwise the build of lib/route/pktloc.c may fail in a parallel > -environment. > - > -Signed-off-by: Qing He > - > -12/06/2010 > - > -the dependency rule should really read pktloc.lo instead of > -pktloc.$(OBJEXT), since it's in a libtool setup. > - > -Signed-off-by: Qing He > - > -diff --git a/lib/Makefile.am b/lib/Makefile.am > -index 92a916e..e8b8ef3 100644 > ---- a/lib/Makefile.am > -+++ b/lib/Makefile.am > -@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l > - route/pktloc_syntax.c: route/pktloc_syntax.y > - $(YACC) -d $(YFLAGS) -o $@ $^ > - > -+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h > -+route/pktloc_syntax.h: route/pktloc_syntax.c > -+route/pktloc_grammar.h: route/pktloc_grammar.c > -+ > - libnl_route_la_LDFLAGS = -version-info 2:0:0 > - libnl_route_la_LIBADD = libnl.la > - libnl_route_la_SOURCES = \ > diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch > similarity index 86% > rename from meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch > rename to meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch > index 05d75db..ea32e82 100644 > --- a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch > +++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch > @@ -4,11 +4,13 @@ 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 > > +Signed-off-by: Martin Jansa > + > 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 = \ > +@@ -27,11 +27,16 @@ CLEANFILES = \ > route/pktloc_grammar.c route/pktloc_grammar.h \ > route/pktloc_syntax.c route/pktloc_syntax.h > > @@ -16,6 +18,7 @@ Index: libnl-2.0/lib/Makefile.am > + > # Hack to avoid using ylwrap. It does not function correctly in combination > # with --header-file= > ++route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h > +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 $@ $^ > diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb > index 5339846..f783867 100644 > --- a/meta/recipes-support/libnl/libnl_2.0.bb > +++ b/meta/recipes-support/libnl/libnl_2.0.bb > @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" > DEPENDS = "flex-native bison-native" > 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 = "\ > + http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ > + file://fix-pktloc_syntax_h-race.patch \ > +" > > SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" > SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" Merged into OE-Core Thanks Sau!