From 987c0f626e5e08fe570a56e54949c932e78b59ed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 17 Mar 2015 13:34:55 +0100 Subject: [PATCH] wpa_supplicant: update to wpa_supplicant-2.4 Signed-off-by: Stephan Raue --- packages/network/wpa_supplicant/package.mk | 2 +- .../wpa_supplicant-2.3-libnl3-includes.patch | 24 ------------------- .../wpa_supplicant-2.4-libnl3-includes.patch | 12 ++++++++++ 3 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-2.3-libnl3-includes.patch create mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch diff --git a/packages/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk index ffcebeaf50..cd537b891f 100644 --- a/packages/network/wpa_supplicant/package.mk +++ b/packages/network/wpa_supplicant/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="wpa_supplicant" -PKG_VERSION="2.3" +PKG_VERSION="2.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-2.3-libnl3-includes.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-2.3-libnl3-includes.patch deleted file mode 100644 index 1591256a61..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-2.3-libnl3-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur wpa_supplicant-2.3/src/drivers/drivers.mak wpa_supplicant-2.3.patch/src/drivers/drivers.mak ---- wpa_supplicant-2.3/src/drivers/drivers.mak 2014-10-09 16:41:31.000000000 +0200 -+++ wpa_supplicant-2.3.patch/src/drivers/drivers.mak 2014-10-10 17:54:54.030025202 +0200 -@@ -35,7 +35,7 @@ - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - ifdef CONFIG_LIBNL3_ROUTE - DRV_LIBS += -lnl-route-3 - DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE -diff -Naur wpa_supplicant-2.3/src/drivers/drivers.mk wpa_supplicant-2.3.patch/src/drivers/drivers.mk ---- wpa_supplicant-2.3/src/drivers/drivers.mk 2014-10-09 16:41:31.000000000 +0200 -+++ wpa_supplicant-2.3.patch/src/drivers/drivers.mk 2014-10-10 17:54:32.261065224 +0200 -@@ -30,7 +30,7 @@ - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - ifdef CONFIG_LIBNL3_ROUTE - DRV_LIBS += -lnl-route-3 - DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch new file mode 100644 index 0000000000..f3dce5172d --- /dev/null +++ b/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch @@ -0,0 +1,12 @@ +diff -Naur wpa_supplicant-2.4/src/drivers/drivers.mk wpa_supplicant-2.4.patch/src/drivers/drivers.mk +--- wpa_supplicant-2.4/src/drivers/drivers.mk 2015-03-15 18:30:39.000000000 +0100 ++++ wpa_supplicant-2.4.patch/src/drivers/drivers.mk 2015-03-17 13:16:01.390789977 +0100 +@@ -35,7 +35,7 @@ + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + ifdef CONFIG_LIBNL3_ROUTE + DRV_LIBS += -lnl-route-3 + DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE