* [Buildroot] [PATCH] libnl: bump to version 2.0
@ 2011-04-27 8:23 Yegor Yefremov
2011-04-27 11:26 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Yegor Yefremov @ 2011-04-27 8:23 UTC (permalink / raw)
To: buildroot
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-26 03:29:21.934275959 -0700
@@ -4,10 +4,11 @@
#
#############################################################
-LIBNL_VERSION = 1.1
+LIBNL_VERSION = 2.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
+LIBNL_AUTORECONF = YES
define LIBNL_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/lib/libnl.so*
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>
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 8:23 [Buildroot] [PATCH] libnl: bump to version 2.0 Yegor Yefremov
@ 2011-04-27 11:26 ` Peter Korsgaard
2011-04-27 12:51 ` Yegor Yefremov
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2011-04-27 11:26 UTC (permalink / raw)
To: buildroot
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Out of interest, how did you create this patch? It doesn't have the nice
diffstat overview like git format-patch normally creates.
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-26 03:29:21.934275959 -0700
Yegor> @@ -4,10 +4,11 @@
Yegor> #
Yegor> #############################################################
Yegor> -LIBNL_VERSION = 1.1
Yegor> +LIBNL_VERSION = 2.0
I see there's already a libnl-3.0, is there any reason why you stick
with 2.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
Yegor> +LIBNL_AUTORECONF = YES
Why? You don't seem to be patching any auto* stuff?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 11:26 ` Peter Korsgaard
@ 2011-04-27 12:51 ` Yegor Yefremov
2011-04-27 12:56 ` Peter Korsgaard
2011-04-27 13:41 ` Gustavo Zacarias
0 siblings, 2 replies; 9+ messages in thread
From: Yegor Yefremov @ 2011-04-27 12:51 UTC (permalink / raw)
To: buildroot
> Out of interest, how did you create this patch? It doesn't have the nice
> diffstat overview like git format-patch normally creates.
Just quilt :-) I'm working with various version control systems, so quilt is a versatile tool for me. But the patch could be applied without any problems?
> 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-26 03:29:21.934275959 -0700
> Yegor> @@ -4,10 +4,11 @@
> Yegor> #
> Yegor> #############################################################
>
> Yegor> -LIBNL_VERSION = 1.1
> Yegor> +LIBNL_VERSION = 2.0
>
> I see there's already a libnl-3.0, is there any reason why you stick
> with 2.0?
You're right. I first tried 3.0 and it failed by some package, so I took 2.0 and didn't verify what was wrong. But I just checked the 3.0 version and it works with all 5 packages:
wpa_supplicant
iw
hostapd
kismet
ti-utils
> 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
> Yegor> +LIBNL_AUTORECONF = YES
>
> Why? You don't seem to be patching any auto* stuff?
We don't need it. I had a problem compiling it under Ubuntu without reconfiguring, but with buildroot under Ubuntu I have no problem.
Thanks for reviewing.
Best regards,
Yegor
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 12:51 ` Yegor Yefremov
@ 2011-04-27 12:56 ` Peter Korsgaard
2011-04-27 12:58 ` Yegor Yefremov
2011-04-27 13:41 ` Gustavo Zacarias
1 sibling, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2011-04-27 12:56 UTC (permalink / raw)
To: buildroot
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
>> Out of interest, how did you create this patch? It doesn't have the nice
>> diffstat overview like git format-patch normally creates.
Yegor> Just quilt :-) I'm working with various version control systems, so quilt is a versatile tool for me. But the patch could be applied without any problems?
Sure, diffstat is just nice to get a quick overview of what the patch
does.
I use:
QUILT_REFRESH_ARGS="--diffstat --no-timestamps"
in my ~/.quiltrc
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 12:56 ` Peter Korsgaard
@ 2011-04-27 12:58 ` Yegor Yefremov
0 siblings, 0 replies; 9+ messages in thread
From: Yegor Yefremov @ 2011-04-27 12:58 UTC (permalink / raw)
To: buildroot
Am 27.04.2011 14:56, schrieb Peter Korsgaard:
>>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
> >> Out of interest, how did you create this patch? It doesn't have the nice
> >> diffstat overview like git format-patch normally creates.
>
> Yegor> Just quilt :-) I'm working with various version control systems, so quilt is a versatile tool for me. But the patch could be applied without any problems?
>
> Sure, diffstat is just nice to get a quick overview of what the patch
> does.
>
> I use:
>
> QUILT_REFRESH_ARGS="--diffstat --no-timestamps"
>
> in my ~/.quiltrc
>
O.K. I see thanks for the hint. My
~/.quiltrc
looks like that:
QUILT_REFRESH_ARGS="-p ab --strip-trailing-whitespace"
So I'll extend it.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 12:51 ` Yegor Yefremov
2011-04-27 12:56 ` Peter Korsgaard
@ 2011-04-27 13:41 ` Gustavo Zacarias
2011-04-28 7:26 ` Yegor Yefremov
1 sibling, 1 reply; 9+ messages in thread
From: Gustavo Zacarias @ 2011-04-27 13:41 UTC (permalink / raw)
To: buildroot
On 04/27/11 09:51, Yegor Yefremov wrote:
>> I see there's already a libnl-3.0, is there any reason why you stick
>> with 2.0?
>
> You're right. I first tried 3.0 and it failed by some package, so I took 2.0 and didn't verify what was wrong. But I just checked the 3.0 version and it works with all 5 packages:
>
> wpa_supplicant
> iw
> hostapd
> kismet
> ti-utils
iw fails to build with 3.0
kismet builds without libnl support with 3.0
hostapd & wpa_supplicant build ok with your patches.
Did you make clean completely before trying? Otherwise you'll get stale
files in staging.
Regards.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-27 13:41 ` Gustavo Zacarias
@ 2011-04-28 7:26 ` Yegor Yefremov
2011-04-28 12:17 ` Gustavo Zacarias
0 siblings, 1 reply; 9+ messages in thread
From: Yegor Yefremov @ 2011-04-28 7:26 UTC (permalink / raw)
To: buildroot
>>> I see there's already a libnl-3.0, is there any reason why you stick
>>> with 2.0?
>> You're right. I first tried 3.0 and it failed by some package, so I took 2.0 and didn't verify what was wrong. But I just checked the 3.0 version and it works with all 5 packages:
>>
>> wpa_supplicant
>> iw
>> hostapd
>> kismet
>> ti-utils
> iw fails to build with 3.0
> kismet builds without libnl support with 3.0
> hostapd & wpa_supplicant build ok with your patches.
> Did you make clean completely before trying? Otherwise you'll get stale
> files in staging.
> Regards
You're right, that were stale files in staging. I made a patch for iw and will send it also upstream.
I'll look into kismet issue or has it gone with the latest version?
Best regards,
Yegor
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-28 7:26 ` Yegor Yefremov
@ 2011-04-28 12:17 ` Gustavo Zacarias
2011-04-28 12:26 ` Yegor Yefremov
0 siblings, 1 reply; 9+ messages in thread
From: Gustavo Zacarias @ 2011-04-28 12:17 UTC (permalink / raw)
To: buildroot
On 04/28/11 04:26, Yegor Yefremov wrote:
>>>> I see there's already a libnl-3.0, is there any reason why you stick
>>>> with 2.0?
>>> You're right. I first tried 3.0 and it failed by some package, so I took 2.0 and didn't verify what was wrong. But I just checked the 3.0 version and it works with all 5 packages:
>>>
>>> wpa_supplicant
>>> iw
>>> hostapd
>>> kismet
>>> ti-utils
>> iw fails to build with 3.0
>> kismet builds without libnl support with 3.0
>> hostapd & wpa_supplicant build ok with your patches.
>> Did you make clean completely before trying? Otherwise you'll get stale
>> files in staging.
>> Regards
>
> You're right, that were stale files in staging. I made a patch for iw and will send it also upstream.
>
> I'll look into kismet issue or has it gone with the latest version?
>
> Best regards,
> Yegor
Latest kismet doesn't handle libnl-3.0 yet and i've just received your
patch for it.
I'll give the whole set a run and Ack once i'm done, we probably want
libnl-3.0 while we're at it like Peter said. It's supposed to be the
first API/ABI-stable version.
Regards.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH] libnl: bump to version 2.0
2011-04-28 12:17 ` Gustavo Zacarias
@ 2011-04-28 12:26 ` Yegor Yefremov
0 siblings, 0 replies; 9+ messages in thread
From: Yegor Yefremov @ 2011-04-28 12:26 UTC (permalink / raw)
To: buildroot
Am 28.04.2011 14:17, schrieb Gustavo Zacarias:
> On 04/28/11 04:26, Yegor Yefremov wrote:
>
>>>>> I see there's already a libnl-3.0, is there any reason why you stick
>>>>> with 2.0?
>>>> You're right. I first tried 3.0 and it failed by some package, so I took 2.0 and didn't verify what was wrong. But I just checked the 3.0 version and it works with all 5 packages:
>>>>
>>>> wpa_supplicant
>>>> iw
>>>> hostapd
>>>> kismet
>>>> ti-utils
>>> iw fails to build with 3.0
>>> kismet builds without libnl support with 3.0
>>> hostapd & wpa_supplicant build ok with your patches.
>>> Did you make clean completely before trying? Otherwise you'll get stale
>>> files in staging.
>>> Regards
>> You're right, that were stale files in staging. I made a patch for iw and will send it also upstream.
>>
>> I'll look into kismet issue or has it gone with the latest version?
>>
>> Best regards,
>> Yegor
> Latest kismet doesn't handle libnl-3.0 yet and i've just received your
> patch for it.
> I'll give the whole set a run and Ack once i'm done, we probably want
> libnl-3.0 while we're at it like Peter said. It's supposed to be the
> first API/ABI-stable version.
> Regards.
O.K. Thanks for testing. I'm looking forward to getting the test results.
Yegor
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-04-28 12:26 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 8:23 [Buildroot] [PATCH] libnl: bump to version 2.0 Yegor Yefremov
2011-04-27 11:26 ` Peter Korsgaard
2011-04-27 12:51 ` Yegor Yefremov
2011-04-27 12:56 ` Peter Korsgaard
2011-04-27 12:58 ` Yegor Yefremov
2011-04-27 13:41 ` Gustavo Zacarias
2011-04-28 7:26 ` Yegor Yefremov
2011-04-28 12:17 ` Gustavo Zacarias
2011-04-28 12:26 ` Yegor Yefremov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox