[Buildroot] [PATCH v3 1/5] libnl: bump to version 3.2.3

[Buildroot] [PATCH v3 1/5] libnl: bump to version 3.2.3

[Daniel Mack]

This newer version splits the library code into libnl, libnl-route,
libnl-genl and libnl-nf, each individually selectable via pkgconfig.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 package/libnl/libnl.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index dd0d7fb..612908b 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.0
+LIBNL_VERSION = 3.2.3
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES
-- 
1.7.7.3

[Buildroot] [PATCH v3 2/5] hostapd: fix build with new libnl-3

[Daniel Mack]

The CFLAGS have to be augmented for the include dir and a small patch
will make the binary link to libnl-3 and libnl-genl-3 instead of libnl
and libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 package/hostapd/hostapd-0.7.3-libnl3.patch |   15 +++++++++++++++
 package/hostapd/hostapd.mk                 |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 package/hostapd/hostapd-0.7.3-libnl3.patch

diff --git a/package/hostapd/hostapd-0.7.3-libnl3.patch b/package/hostapd/hostapd-0.7.3-libnl3.patch
new file mode 100644
index 0000000..e47da73
--- /dev/null
+++ b/package/hostapd/hostapd-0.7.3-libnl3.patch
@@ -0,0 +1,15 @@
+--- a/src/drivers/drivers.mak	2011-11-29 19:09:23.889942913 +0100
++++ b/src/drivers/drivers.mak	2011-11-29 19:09:40.637381428 +0100
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++DRV_LIBS += -lnl-3
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++DRV_LIBS += -lnl-genl-3
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 0d6c2c5..26ebf1d 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -18,6 +18,7 @@ endif
 
 define HOSTAPD_LIBNL_CONFIG
 	echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
+	echo "CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG)
 endef
 
 define HOSTAPD_CRYPTO_CONFIG
-- 
1.7.7.3

[Buildroot] [PATCH v3 3/5] wpa_supplicant: fix build with new libnl-3

[Daniel Mack]

The CFLAGS have to be augmented for the include dir and a small patch
will make the binary link to libnl-3 and libnl-genl-3 instead of libnl
and libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 .../wpa_supplicant-0.7.3-libnl-3.patch             |   15 +++++++++++++++
 package/wpa_supplicant/wpa_supplicant.mk           |    2 +-
 2 files changed, 16 insertions(+), 1 deletions(-)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
new file mode 100644
index 0000000..a460c2a
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
@@ -0,0 +1,15 @@
+--- a/src/drivers/drivers.mak	2011-11-29 19:19:56.684221050 +0100
++++ b/src/drivers/drivers.mak	2011-11-29 19:20:12.199609246 +0100
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++DRV_LIBS += -lnl-3
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++DRV_LIBS += -lnl-genl-3
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index b2e7be3..96f64ca 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -56,7 +56,7 @@ endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
 	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
-	echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
+	echo "CFLAGS += $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
 	$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
-- 
1.7.7.3

[Buildroot] [PATCH v3 4/5] iw: fix build with new libnl-3

[Daniel Mack]

The CFLAGS have to be augmented for the include dir and the patch
needs to be tweaked to make the binary link to libnl-3 instead of
libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 package/iw/iw-libnl-30-support.patch |    2 +-
 package/iw/iw.mk                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
index 48a179f..02e818c 100644
--- a/package/iw/iw-libnl-30-support.patch
+++ b/package/iw/iw-libnl-30-support.patch
@@ -20,7 +20,7 @@ Index: b/Makefile
 
 +ifeq ($(NL3FOUND),Y)
 +CFLAGS += -DCONFIG_LIBNL20
-+LIBS += -lnl-genl
++LIBS += -lnl-genl-3
 +NLLIBNAME = libnl-3.0
 +endif
 +
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 9f1d65f..65326b7 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -15,7 +15,7 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 
 define IW_CONFIGURE_CMDS
 	echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
-	echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
+	echo "CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(IW_CONFIG)
 	echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
 endef
 
-- 
1.7.7.3

[Buildroot] [PATCH v3 5/5] kismet: fix build with new libnl-3

[Daniel Mack]

The CFLAGS have to be augmented, so configure finds the correct include
dir, and the patch needs to be tweaked to make the binary link to
libnl-3 instead of libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 package/kismet/kismet-libnl-30-support.patch |   10 +++++++---
 package/kismet/kismet.mk                     |    1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
index cf3c845..5100a69 100644
--- a/package/kismet/kismet-libnl-30-support.patch
+++ b/package/kismet/kismet-libnl-30-support.patch
@@ -111,13 +111,17 @@ Index: b/configure
  pkg_failed=no
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
  $as_echo_n "checking for libnl20... " >&6; }
-@@ -6897,7 +6974,7 @@
+@@ -6897,7 +6974,11 @@
  $as_echo "yes" >&6; }
  	libnl1=yes
  fi
 -	if test "$libnl20" = "yes"; then
-+	if test "$libnl20" = "yes" -o "$libnl30" = "yes"; then
-
++	if test "$libnl30" = "yes"; then
++$as_echo "#define HAVE_LIBNL 1" >>confdefs.h
++$as_echo "#define HAVE_LIBNL20 1" >>confdefs.h
++               NLLIBS="-lnl-genl-3 -lnl-3"
++	elif test "$libnl20" = "yes"; then
+ 
  $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 4c7d6e2..854c9dd 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -10,6 +10,7 @@ KISMET_DEPENDENCIES = libpcap ncurses
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	KISMET_DEPENDENCIES += libnl
+	KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/"
 endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 	KISMET_DEPENDENCIES += pcre
-- 
1.7.7.3

[Buildroot] [PATCH v3 4/5] iw: fix build with new libnl-3

[Yegor Yefremov]

On Sat, Dec 3, 2011 at 2:07 PM, Daniel Mack <zonque@gmail.com> wrote:
> The CFLAGS have to be augmented for the include dir and the patch
> needs to be tweaked to make the binary link to libnl-3 instead of
> libnl-gen.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> ---
> ?package/iw/iw-libnl-30-support.patch | ? ?2 +-
> ?package/iw/iw.mk ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
> index 48a179f..02e818c 100644
> --- a/package/iw/iw-libnl-30-support.patch
> +++ b/package/iw/iw-libnl-30-support.patch
> @@ -20,7 +20,7 @@ Index: b/Makefile
>
> ?+ifeq ($(NL3FOUND),Y)
> ?+CFLAGS += -DCONFIG_LIBNL20
> -+LIBS += -lnl-genl
> ++LIBS += -lnl-genl-3
> ?+NLLIBNAME = libnl-3.0
> ?+endif
> ?+
> diff --git a/package/iw/iw.mk b/package/iw/iw.mk
> index 9f1d65f..65326b7 100644
> --- a/package/iw/iw.mk
> +++ b/package/iw/iw.mk
> @@ -15,7 +15,7 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
>
> ?define IW_CONFIGURE_CMDS
> ? ? ? ?echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
> - ? ? ? echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
> + ? ? ? echo "CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(IW_CONFIG)
> ? ? ? ?echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
> ?endef

This patch won't apply. This an old version (v1). What is the reason for v3?

Yegor

[Buildroot] [PATCH v3 4/5] iw: fix build with new libnl-3

[Daniel Mack]

On 12/03/2011 04:20 PM, Yegor Yefremov wrote:
> On Sat, Dec 3, 2011 at 2:07 PM, Daniel Mack <zonque@gmail.com> wrote:
>> The CFLAGS have to be augmented for the include dir and the patch
>> needs to be tweaked to make the binary link to libnl-3 instead of
>> libnl-gen.
>>
>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>> ---
>>  package/iw/iw-libnl-30-support.patch |    2 +-
>>  package/iw/iw.mk                     |    2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
>> index 48a179f..02e818c 100644
>> --- a/package/iw/iw-libnl-30-support.patch
>> +++ b/package/iw/iw-libnl-30-support.patch
>> @@ -20,7 +20,7 @@ Index: b/Makefile
>>
>>  +ifeq ($(NL3FOUND),Y)
>>  +CFLAGS += -DCONFIG_LIBNL20
>> -+LIBS += -lnl-genl
>> ++LIBS += -lnl-genl-3
>>  +NLLIBNAME = libnl-3.0
>>  +endif
>>  +
>> diff --git a/package/iw/iw.mk b/package/iw/iw.mk
>> index 9f1d65f..65326b7 100644
>> --- a/package/iw/iw.mk
>> +++ b/package/iw/iw.mk
>> @@ -15,7 +15,7 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
>>
>>  define IW_CONFIGURE_CMDS
>>        echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
>> -       echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
>> +       echo "CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(IW_CONFIG)
>>        echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
>>  endef
> 
> This patch won't apply. This an old version (v1). 

Sorry, branch confusion on my side. Thanks for noticing.

> What is the reason for v3?

TARGET_DIR vs. STAGING_DIR confusion. I'll post a v4 against -next then.

Thanks,
Daniel

[Buildroot] [PATCH v3 4/5] iw: fix build with new libnl-3

[Yegor Yefremov]

On Sat, Dec 3, 2011 at 5:43 PM, Daniel Mack <zonque@gmail.com> wrote:
> On 12/03/2011 04:20 PM, Yegor Yefremov wrote:
>> On Sat, Dec 3, 2011 at 2:07 PM, Daniel Mack <zonque@gmail.com> wrote:
>>> The CFLAGS have to be augmented for the include dir and the patch
>>> needs to be tweaked to make the binary link to libnl-3 instead of
>>> libnl-gen.
>>>
>>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>>> ---
>>> ?package/iw/iw-libnl-30-support.patch | ? ?2 +-
>>> ?package/iw/iw.mk ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
>>> ?2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
>>> index 48a179f..02e818c 100644
>>> --- a/package/iw/iw-libnl-30-support.patch
>>> +++ b/package/iw/iw-libnl-30-support.patch
>>> @@ -20,7 +20,7 @@ Index: b/Makefile
>>>
>>> ?+ifeq ($(NL3FOUND),Y)
>>> ?+CFLAGS += -DCONFIG_LIBNL20
>>> -+LIBS += -lnl-genl
>>> ++LIBS += -lnl-genl-3
>>> ?+NLLIBNAME = libnl-3.0
>>> ?+endif
>>> ?+
>>> diff --git a/package/iw/iw.mk b/package/iw/iw.mk
>>> index 9f1d65f..65326b7 100644
>>> --- a/package/iw/iw.mk
>>> +++ b/package/iw/iw.mk
>>> @@ -15,7 +15,7 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
>>>
>>> ?define IW_CONFIGURE_CMDS
>>> ? ? ? ?echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
>>> - ? ? ? echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
>>> + ? ? ? echo "CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(IW_CONFIG)
>>> ? ? ? ?echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
>>> ?endef
>>
>> This patch won't apply. This an old version (v1).
>
> Sorry, branch confusion on my side. Thanks for noticing.
>
>> What is the reason for v3?
>
> TARGET_DIR vs. STAGING_DIR confusion. I'll post a v4 against -next then.

AFAIK both branches should be in sync now. The next is there to cover
the time between the first rc and a final release.

Yegor