From f600e77bbdc1d6a0f29bf8bd775b79dc01bc0b4d Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 11 Nov 2014 10:46:22 +0200 Subject: wpa-supplicant: upgrade to 2.3 - P2P WiFi improvements; - Bug fixes. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- .../recipes-connectivity/wpa-supplicant/wpa-supplicant.inc | 4 ++-- .../wpa-supplicant/fix-libnl3-host-contamination.patch | 14 +++++++------- .../wpa-supplicant/wpa-supplicant_2.2.bb | 2 -- .../wpa-supplicant/wpa-supplicant_2.3.bb | 2 ++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc index 3abcf86819..2bc93392ef 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc @@ -26,8 +26,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://99_wpa_supplicant \ file://fix-libnl3-host-contamination.patch \ " -SRC_URI[md5sum] = "238e8e888bbd558e1a57e3eb28d1dd07" -SRC_URI[sha256sum] = "e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed" +SRC_URI[md5sum] = "f2ed8fef72cf63d8d446a2d0a6da630a" +SRC_URI[sha256sum] = "eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a" S = "${WORKDIR}/wpa_supplicant-${PV}" diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch index eb8036f50c..e899c1655d 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch @@ -15,15 +15,15 @@ diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index 68ff910..1f38f57 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak -@@ -30,7 +30,7 @@ NEED_RFKILL=y +@@ -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 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny + ifdef CONFIG_LIBNL3_ROUTE + DRV_LIBS += -lnl-route-3 + DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk index db8561a..c93e88d 100644 --- a/src/drivers/drivers.mk @@ -34,9 +34,9 @@ index db8561a..c93e88d 100644 DRV_LIBS += -lnl-genl-3 - DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 + DRV_CFLAGS += -DCONFIG_LIBNL20 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny + ifdef CONFIG_LIBNL3_ROUTE + DRV_LIBS += -lnl-route-3 + DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE -- 1.7.10.4 diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb deleted file mode 100644 index afd0654016..0000000000 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require wpa-supplicant.inc - diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb new file mode 100644 index 0000000000..afd0654016 --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb @@ -0,0 +1,2 @@ +require wpa-supplicant.inc + -- cgit 1.2.3-korg