* [Buildroot] [PATCH v2 2/5] hostapd: fix build with new libnl-3
2011-12-01 11:56 [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
@ 2011-12-01 11:56 ` Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 3/5] wpa_supplicant: " Daniel Mack
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2011-12-01 11:56 UTC (permalink / raw)
To: buildroot
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..53af871 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$(TARGET_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG)
endef
define HOSTAPD_CRYPTO_CONFIG
--
1.7.7.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 3/5] wpa_supplicant: fix build with new libnl-3
2011-12-01 11:56 [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 2/5] hostapd: fix build with new libnl-3 Daniel Mack
@ 2011-12-01 11:56 ` Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 4/5] iw: using the git version fixes " Daniel Mack
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2011-12-01 11:56 UTC (permalink / raw)
To: buildroot
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..f7f1af4 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$(TARGET_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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 4/5] iw: using the git version fixes build with new libnl-3
2011-12-01 11:56 [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 2/5] hostapd: fix build with new libnl-3 Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 3/5] wpa_supplicant: " Daniel Mack
@ 2011-12-01 11:56 ` Daniel Mack
2011-12-01 11:56 ` [Buildroot] [PATCH v2 5/5] kismet: fix " Daniel Mack
2011-12-01 11:57 ` [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2011-12-01 11:56 UTC (permalink / raw)
To: buildroot
The current git version copes well with libnl-3, so use this one until
the next official release is made.
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
package/iw/iw.mk | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index ab6c676..d89fc6c 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,9 +4,8 @@
#
#############################################################
-IW_VERSION = 3.2
-IW_SOURCE = iw-$(IW_VERSION).tar.bz2
-IW_SITE = http://wireless.kernel.org/download/iw
+IW_VERSION = a82abc2cac9dea7def53070565201145c76c8c6c
+IW_SITE = git://git.sipsolutions.net/iw.git
IW_DEPENDENCIES = host-pkg-config libnl
IW_CONFIG = $(IW_DIR)/.config
IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
--
1.7.7.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 5/5] kismet: fix build with new libnl-3
2011-12-01 11:56 [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
` (2 preceding siblings ...)
2011-12-01 11:56 ` [Buildroot] [PATCH v2 4/5] iw: using the git version fixes " Daniel Mack
@ 2011-12-01 11:56 ` Daniel Mack
2011-12-01 11:57 ` [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2011-12-01 11:56 UTC (permalink / raw)
To: buildroot
The CPPFLAGS 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 | 13 +++++++++----
package/kismet/kismet.mk | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
index cf3c845..dca6151 100644
--- a/package/kismet/kismet-libnl-30-support.patch
+++ b/package/kismet/kismet-libnl-30-support.patch
@@ -35,7 +35,7 @@ Index: b/configure
libnl20_CFLAGS
C compiler flags for libnl20, overriding pkg-config
libnl20_LIBS
-@@ -6760,6 +6768,75 @@
+@@ -6760,6 +6768,76 @@
fi
fi
@@ -103,6 +103,7 @@ Index: b/configure
+ libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS
+ libnl30_LIBS=$pkg_cv_libnl30_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++ CPPFLAGS="$CPPFLAGS $libnl30_CFLAGS"
+$as_echo "yes" >&6; }
+ libnl30=yes
+fi
@@ -111,13 +112,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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3
2011-12-01 11:56 [Buildroot] [PATCH v2 1/5] libnl: bump to version 3.2.3 Daniel Mack
` (3 preceding siblings ...)
2011-12-01 11:56 ` [Buildroot] [PATCH v2 5/5] kismet: fix " Daniel Mack
@ 2011-12-01 11:57 ` Daniel Mack
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2011-12-01 11:57 UTC (permalink / raw)
To: buildroot
On 12/01/2011 12:56 PM, Daniel Mack wrote:
> This newer version splits the library code into libnl, libnl-route,
> libnl-genl and libnl-nf, each individually selectable via pkgconfig.
Forgot to mention that this series is made for the 'next' branch.
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread