| Submitter | Matthew McClintock |
|---|---|
| Date | Sept. 30, 2011, 5:21 p.m. |
| Message ID | <1317403283-17471-1-git-send-email-msm@freescale.com> |
| Download | mbox | patch |
| Permalink | /patch/12583/ |
| State | New, archived |
| Headers | show |
Comments
On Fri, Sep 30, 2011 at 12:21:23PM -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). On Fri, Sep 30, 2011 at 9:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote: 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. Thanks > > Signed-off-by: Tom Rini <tom_rini@mentor.com> > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > .../libnl/fix-pktloc_syntax_h-race.patch | 26 ++++++++++++++++++++ > 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" > -- > 1.7.6.1 > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Fri, Sep 30, 2011 at 12:26 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > On Fri, Sep 30, 2011 at 12:21:23PM -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). > > On Fri, Sep 30, 2011 at 9:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > 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. Sorry, I'm not sure I follow. Are you referring to all the other stuff in the old openembedded? I'm not following this package particularly closely. * 9fef5f0 Add 'ucred' structure declaration in netlink headers for the integrity * f9e4241 libnl-1.1: rename to libnl1 and build only static lib * 4ccaf2c libnl_git: remove fix-pktloc-dep-race.patch from this version * 91e03b2 libnl: add libnl.inc and use INC_PR * 4702231 libnl: don't use /usr/include/libnl2 anymore * 5ef679a libnl: rename libnl2 to libnl as used in openembedded-core -M
On Mon, Oct 03, 2011 at 06:39:52PM +0000, McClintock Matthew-B29882 wrote: > On Fri, Sep 30, 2011 at 12:26 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > > On Fri, Sep 30, 2011 at 12:21:23PM -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). > > > > On Fri, Sep 30, 2011 at 9:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > > 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. > > Sorry, I'm not sure I follow. Are you referring to all the other stuff > in the old openembedded? I'm not following this package particularly > closely. just see diff oe-core/meta/recipes*/libnl* and meta-openembedded/meta-oe/recipes*/libnl* and it will be clearer Regards, > * 9fef5f0 Add 'ucred' structure declaration in netlink headers for the integrity > * f9e4241 libnl-1.1: rename to libnl1 and build only static lib > * 4ccaf2c libnl_git: remove fix-pktloc-dep-race.patch from this version > * 91e03b2 libnl: add libnl.inc and use INC_PR > * 4702231 libnl: don't use /usr/include/libnl2 anymore > * 5ef679a libnl: rename libnl2 to libnl as used in openembedded-core
On Mon, Oct 3, 2011 at 2:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote: >> Sorry, I'm not sure I follow. Are you referring to all the other stuff >> in the old openembedded? I'm not following this package particularly >> closely. > > just see diff oe-core/meta/recipes*/libnl* and meta-openembedded/meta-oe/recipes*/libnl* > and it will be clearer I can do this but besides build errors I have no way to really test this. -M
On 09/30/2011 10:21 AM, 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> > Signed-off-by: Matthew McClintock<msm@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"
On Tue, Oct 11, 2011 at 3:47 PM, Saul Wold <saul.wold@intel.com> wrote: > On 09/30/2011 10:21 AM, 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> >> Signed-off-by: Matthew McClintock<msm@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? Are you referring to this: http://patches.openembedded.org/patch/12749/ > Cab you test that against the wpa-supplicant which seems to be libnl's sole > dependee. I can't - don't have a board with wireless - dont't have a wireless network... -M
Op 11 okt. 2011, om 22:47 heeft Saul Wold het volgende geschreven: > On 09/30/2011 10:21 AM, 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> >> Signed-off-by: Matthew McClintock<msm@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? libnl3 is *again* incompatible with its previous version, like libnl2 is incompatible with libnl1.
On 10/11/2011 01:59 PM, Koen Kooi wrote: > > Op 11 okt. 2011, om 22:47 heeft Saul Wold het volgende geschreven: > >> On 09/30/2011 10:21 AM, 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> >>> Signed-off-by: Matthew McClintock<msm@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? > > libnl3 is *again* incompatible with its previous version, like libnl2 is incompatible with libnl1. > Koen, Thanks for that bit of info, I had not gotten much further into investigating libnl, other than seeing the newer version out there. Sau! > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On Tue, Oct 11, 2011 at 08:57:47PM +0000, McClintock Matthew-B29882 wrote: > On Tue, Oct 11, 2011 at 3:47 PM, Saul Wold <saul.wold@intel.com> wrote: > > On 09/30/2011 10:21 AM, 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> > >> Signed-off-by: Matthew McClintock<msm@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? > > Are you referring to this: http://patches.openembedded.org/patch/12749/ This pach is moving fix-makefile.patch from libnl-2.0 to libnl dir as Saul mentioned and patch wasn't even formated with -M to make it easier to review such move, please move it back to libnl-2.0 and send it again. .../libnl/libnl-2.0/fix-makefile.patch | 32 -------------------- .../recipes-support/libnl/libnl/fix-makefile.patch | 32 ++++++++++++++++++++ Cheers, > > > Cab you test that against the wpa-supplicant which seems to be libnl's sole > > dependee. > > I can't - don't have a board with wireless - dont't have a wireless network... > > -M > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Wed, Nov 2, 2011 at 4:16 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > On Tue, Oct 11, 2011 at 08:57:47PM +0000, McClintock Matthew-B29882 wrote: >> On Tue, Oct 11, 2011 at 3:47 PM, Saul Wold <saul.wold@intel.com> wrote: >> > On 09/30/2011 10:21 AM, 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> >> >> Signed-off-by: Matthew McClintock<msm@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? >> >> Are you referring to this: http://patches.openembedded.org/patch/12749/ > > This pach is moving fix-makefile.patch from libnl-2.0 to libnl dir as Saul mentioned > and patch wasn't even formated with -M to make it easier to review such move, please > move it back to libnl-2.0 and send it again. > > .../libnl/libnl-2.0/fix-makefile.patch | 32 -------------------- > .../recipes-support/libnl/libnl/fix-makefile.patch | 32 ++++++++++++++++++++ > > Cheers, I really need to defer on any changes to libnl - I have no way to test any of this. I was just trying to fix a parallel build issues for the lsb image. Otherwise I'm blindly making changes and more changes that people request with no actual testing being done. -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..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"