[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Yegor Yefremov]

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>


Index: b/package/libnl/libnl.mk
===================================================================
--- a/package/libnl/libnl.mk	2011-04-26 02:04:14.206276675 -0700
+++ b/package/libnl/libnl.mk	2011-04-27 05:43:47.382292483 -0700
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-LIBNL_VERSION = 1.1
+LIBNL_VERSION = 3.0
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
-LIBNL_SITE = http://distfiles.gentoo.org/distfiles
+LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES
 
 define LIBNL_UNINSTALL_TARGET_CMDS
Index: b/package/libnl/libnl-1.1-flags.patch
===================================================================
--- a/package/libnl/libnl-1.1-flags.patch	2011-04-27 01:06:20.486285299 -0700
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-From f124a6ff6a19d5c6b6709d38dd2ffa8275abbd5f Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 18 Oct 2010 12:16:27 -0300
-Subject: [PATCH] Make libnl.so mode 0755 when installing, and respect LDFLAGS
-
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- lib/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 0bf8af7..0098906 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@ all:
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
-@@ -65,7 +65,7 @@ distclean:
- 
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/
--	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
-+	install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir)
- 	rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
- 	$(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
- 	rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)
--- 
-1.7.2.2
-
Index: b/package/libnl/libnl-1.1-minor-leaks.patch
===================================================================
--- a/package/libnl/libnl-1.1-minor-leaks.patch	2011-04-27 01:06:20.546285624 -0700
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:49 +0000 (+0100)
-Subject: [LIBNL]: Fix minor memleaks on exit
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=b64f15d6f947839236fa276d473d238f8c9b9d57;hp=e91bb2ffb090955d443e643a25b250bf3d33534a
-
-[LIBNL]: Fix minor memleaks on exit
-
-Make valgrind happy ...
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
-index a12d169..1386cda 100644
---- a/lib/route/route_utils.c
-+++ b/lib/route/route_utils.c
-@@ -63,6 +63,11 @@ static void __init init_routing_table_names(void)
- 	add_routing_table_name(RT_TABLE_LOCAL, "local");
- };
- 
-+static void __exit release_routing_table_names(void)
-+{
-+	__trans_list_clear(&table_names);
-+}
-+
- int rtnl_route_read_table_names(const char *path)
- {
- 	__trans_list_clear(&table_names);
-@@ -104,6 +109,11 @@ static void __init init_proto_names(void)
- 	add_proto_name(RTPROT_STATIC, "static");
- };
- 
-+static void __exit release_proto_names(void)
-+{
-+	__trans_list_clear(&proto_names);
-+}
-+
- int rtnl_route_read_protocol_names(const char *path)
- {
- 	__trans_list_clear(&proto_names);
Index: b/package/libnl/libnl-1.1-netlink-local-fix.patch
===================================================================
--- a/package/libnl/libnl-1.1-netlink-local-fix.patch	2011-04-27 01:06:20.610285624 -0700
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Fixes the ULONG_MAX definition problem:
-
-In file included from cache.c:43:
-../include/netlink-local.h: In function '__str2type':../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)
-
-Patch borrowed from OpenEmbedded, recipes/libnl/files/netlink-local-fix.patch.
-
-Index: libnl-1.1/include/netlink-local.h
-===================================================================
---- libnl-1.1.orig/include/netlink-local.h	2009-06-18 15:28:32.614209645 +0400
-+++ libnl-1.1/include/netlink-local.h	2009-06-18 15:28:44.094190518 +0400
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Yegor Yefremov]

Hi Peter,

I would leave AUTORECONF option. On my old build system  openSUSE 10.3 libnl-3.0 would compile only if reconfigured, otherwise it cannot find some header files. On my new Ubuntu 11.04 distro I don't have such problems. What do you think about this?

Best regards,
Yegor

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Thomas Petazzoni]

On Thu, 28 Apr 2011 09:30:32 +0200
Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:

> I would leave AUTORECONF option. On my old build system  openSUSE
> 10.3 libnl-3.0 would compile only if reconfigured, otherwise it
> cannot find some header files. On my new Ubuntu 11.04 distro I don't
> have such problems. What do you think about this?

I'd say we need more specific details on the header files issue rather
than blindly deciding to use the <pkg>_AUTORECONF=YES big hammer :-)

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Gustavo Zacarias]

On 04/27/11 09:59, Yegor Yefremov wrote:

> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Yegor Yefremov]

Am 28.04.2011 14:09, schrieb Thomas Petazzoni:
> On Thu, 28 Apr 2011 09:30:32 +0200
> Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:
>
>> I would leave AUTORECONF option. On my old build system  openSUSE
>> 10.3 libnl-3.0 would compile only if reconfigured, otherwise it
>> cannot find some header files. On my new Ubuntu 11.04 distro I don't
>> have such problems. What do you think about this?
> I'd say we need more specific details on the header files issue rather
> than blindly deciding to use the <pkg>_AUTORECONF=YES big hammer :-)

You're right. I tried it once again and it seems to fail only if I clean the whole buildroot and then start again. Build crashes with something like that:

  CC     addr.lo
  CC     attr.lo
  CC     cache.lo
  CC     cache_mngr.lo
  CC     cache_mngt.lo
  CC     data.lo
  CC     error.lo
  CC     handlers.lo
  CC     msg.lo
  CC     nl.lo
  CC     object.lo
  CC     socket.lo
  CC     utils.lo
  GEN    route/cls/ematch_syntax.c
  CC     route/cls/ematch.lo
  GEN    route/cls/ematch_grammar.c
  GEN    route/pktloc_syntax.c
  GEN    route/pktloc_grammar.c
  CC     route/pktloc.lo
route/pktloc.c:39:27: fatal error: pktloc_syntax.h: No such file or directory
compilation terminated.
cd .. && /bin/sh ./config.status lib/defs.h
  CC     genl/ctrl.lo

but if I run make again everything gets built like a charm. Perhaps this is caused by -j16. So no need for big hammer :-)

Best regards,
Yegor

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Gustavo Zacarias]

On 04/28/11 11:19, Yegor Yefremov wrote:

> but if I run make again everything gets built like a charm. Perhaps this is caused by -j16. So no need for big hammer :-)
> 
> Best regards,
> Yegor

Define LIBNL_MAKE = $(MAKE1) in libnl.mk and try to reproduce it again.
It's not ideal and the libnl Makefile should be fixed upstream though.
Regards.

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Yegor Yefremov]

>> but if I run make again everything gets built like a charm. Perhaps this is caused by -j16. So no need for big hammer :-)
>>
>> Best regards,
>> Yegor
> Define LIBNL_MAKE = $(MAKE1) in libnl.mk and try to reproduce it again.
> It's not ideal and the libnl Makefile should be fixed upstream though.
> Regards.

It helped. If I have time I'll look into this issue and report upstream. There are some more bugs, if compiling out-of-source.

Best regards,
Yegor

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:

 Yegor> You're right. I tried it once again and it seems to fail only if I clean the whole buildroot and then start again. Build crashes with something like that:

 Yegor>   CC     addr.lo
 Yegor>   CC     attr.lo
 Yegor>   CC     cache.lo
 Yegor>   CC     cache_mngr.lo
 Yegor>   CC     cache_mngt.lo
 Yegor>   CC     data.lo
 Yegor>   CC     error.lo
 Yegor>   CC     handlers.lo
 Yegor>   CC     msg.lo
 Yegor>   CC     nl.lo
 Yegor>   CC     object.lo
 Yegor>   CC     socket.lo
 Yegor>   CC     utils.lo
 Yegor>   GEN    route/cls/ematch_syntax.c
 Yegor>   CC     route/cls/ematch.lo
 Yegor>   GEN    route/cls/ematch_grammar.c
 Yegor>   GEN    route/pktloc_syntax.c
 Yegor>   GEN    route/pktloc_grammar.c
 Yegor>   CC     route/pktloc.lo
 Yegor> route/pktloc.c:39:27: fatal error: pktloc_syntax.h: No such file or directory
 Yegor> compilation terminated.
 Yegor> cd .. && /bin/sh ./config.status lib/defs.h
 Yegor>   CC     genl/ctrl.lo

 Yegor> but if I run make again everything gets built like a charm. Perhaps this is caused by -j16. So no need for big hammer :-)

Yes, sounds like a race condition.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Yegor Yefremov]

>  Yegor> You're right. I tried it once again and it seems to fail only if I clean the whole buildroot and then start again. Build crashes with something like that:
>
>  Yegor>   CC     addr.lo
>  Yegor>   CC     attr.lo
>  Yegor>   CC     cache.lo
>  Yegor>   CC     cache_mngr.lo
>  Yegor>   CC     cache_mngt.lo
>  Yegor>   CC     data.lo
>  Yegor>   CC     error.lo
>  Yegor>   CC     handlers.lo
>  Yegor>   CC     msg.lo
>  Yegor>   CC     nl.lo
>  Yegor>   CC     object.lo
>  Yegor>   CC     socket.lo
>  Yegor>   CC     utils.lo
>  Yegor>   GEN    route/cls/ematch_syntax.c
>  Yegor>   CC     route/cls/ematch.lo
>  Yegor>   GEN    route/cls/ematch_grammar.c
>  Yegor>   GEN    route/pktloc_syntax.c
>  Yegor>   GEN    route/pktloc_grammar.c
>  Yegor>   CC     route/pktloc.lo
>  Yegor> route/pktloc.c:39:27: fatal error: pktloc_syntax.h: No such file or directory
>  Yegor> compilation terminated.
>  Yegor> cd .. && /bin/sh ./config.status lib/defs.h
>  Yegor>   CC     genl/ctrl.lo
>
>  Yegor> but if I run make again everything gets built like a charm. Perhaps this is caused by -j16. So no need for big hammer :-)
>
> Yes, sounds like a race condition

Peter, are the patches O.K. for you or is there something that must be fixed ASAP?

Yegor

[Buildroot] [PATCH v3] libnl: bump to version 3.0

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:

 Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
 Yegor> Index: b/package/libnl/libnl.mk
 Yegor> ===================================================================
 Yegor> --- a/package/libnl/libnl.mk	2011-04-26 02:04:14.206276675 -0700
 Yegor> +++ b/package/libnl/libnl.mk	2011-04-27 05:43:47.382292483 -0700
 Yegor> @@ -4,9 +4,9 @@
 Yegor>  #
 Yegor>  #############################################################
 
 Yegor> -LIBNL_VERSION = 1.1
 Yegor> +LIBNL_VERSION = 3.0
 Yegor>  LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 Yegor> -LIBNL_SITE = http://distfiles.gentoo.org/distfiles
 Yegor> +LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 Yegor>  LIBNL_INSTALL_STAGING = YES

Committed, thanks.

-- 
Bye, Peter Korsgaard