diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-26 12:20:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-26 12:20:52 +0100 |
| commit | ad2fa297451b59a3bd7e3929169b301e60467a50 (patch) | |
| tree | b749bc4223d4373042674bc602a50d9877237f76 | |
| parent | 23c4da7ff29ab2dfd2146e6b039916514b6f8557 (diff) | |
| download | ptxdist-ad2fa297451b59a3bd7e3929169b301e60467a50.tar.gz ptxdist-ad2fa297451b59a3bd7e3929169b301e60467a50.tar.xz | |
wpa_supplicant: version bump 2.3 -> 2.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | config/wpasupplicant/defconfig | 3 | ||||
| -rw-r--r-- | patches/wpa_supplicant-2.3/0001-remove-system-include-path.patch | 22 | ||||
| -rw-r--r-- | patches/wpa_supplicant-2.3/series | 4 | ||||
| -rw-r--r-- | rules/wpa_supplicant.make | 4 |
4 files changed, 2 insertions, 31 deletions
diff --git a/config/wpasupplicant/defconfig b/config/wpasupplicant/defconfig index ed9bfca1f..3ca786c26 100644 --- a/config/wpasupplicant/defconfig +++ b/config/wpasupplicant/defconfig @@ -67,9 +67,6 @@ CONFIG_LIBNL32=y # wpa_supplicant. # CONFIG_USE_NDISUIO=y -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - # Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y diff --git a/patches/wpa_supplicant-2.3/0001-remove-system-include-path.patch b/patches/wpa_supplicant-2.3/0001-remove-system-include-path.patch deleted file mode 100644 index 192a53fca..000000000 --- a/patches/wpa_supplicant-2.3/0001-remove-system-include-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 14 Nov 2014 08:52:49 +0100 -Subject: [PATCH] remove system include path - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/drivers/drivers.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak -index cdb913e31588..c2e2985a641f 100644 ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -35,7 +35,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 - ifdef CONFIG_LIBNL3_ROUTE - DRV_LIBS += -lnl-route-3 - DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE diff --git a/patches/wpa_supplicant-2.3/series b/patches/wpa_supplicant-2.3/series deleted file mode 100644 index 2667d480e..000000000 --- a/patches/wpa_supplicant-2.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-remove-system-include-path.patch -# c8e366226a18984b22b3657c5caea511 - git-ptx-patches magic diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index 84e14b227..421c02831 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_WPA_SUPPLICANT) += wpa_supplicant # Paths and names # WPA_SUPPLICANT_NAME := wpa_supplicant -WPA_SUPPLICANT_VERSION := 2.3 -WPA_SUPPLICANT_MD5 := f2ed8fef72cf63d8d446a2d0a6da630a +WPA_SUPPLICANT_VERSION := 2.4 +WPA_SUPPLICANT_MD5 := f0037dbe03897dcaf2ad2722e659095d WPA_SUPPLICANT := $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION) WPA_SUPPLICANT_SUFFIX := tar.gz WPA_SUPPLICANT_URL := http://hostap.epitest.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) |