summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-03-08 23:42:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-12 18:33:28 +0000
commit29ec481c46b6f10e31a7bcaa84f6d77f280be6ec (patch)
tree240605c7893420ca6e9758e462524b37b1090b3c
parente4a19279babc24a7a0805be5af83d4e42bba1c95 (diff)
downloadpoky-29ec481c46b6f10e31a7bcaa84f6d77f280be6ec.tar.gz
wpa-supplicant: avoid host contamination by libnl3
Removes hardcoded include path -I/usr/include/libnl3. OE's include path gets injected by do_configure. (From OE-Core rev: 1c3beda0015da9a0fec2581af7645c9ea122c7e3) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc3
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch42
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb2
3 files changed, 45 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 4e15369d0e..dd850578af 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -19,7 +19,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
19 file://wpa-supplicant.sh \ 19 file://wpa-supplicant.sh \
20 file://wpa_supplicant.conf \ 20 file://wpa_supplicant.conf \
21 file://wpa_supplicant.conf-sane \ 21 file://wpa_supplicant.conf-sane \
22 file://99_wpa_supplicant" 22 file://99_wpa_supplicant \
23 file://fix-libnl3-host-contamination.patch"
23 24
24S = "${WORKDIR}/wpa_supplicant-${PV}" 25S = "${WORKDIR}/wpa_supplicant-${PV}"
25 26
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
new file mode 100644
index 0000000000..eb8036f50c
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Pending
2
3From 37d6b3dd5a737cd67468e4a58b372bddd924a7be Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@opendreambox.org>
5Date: Fri, 8 Mar 2013 22:55:19 +0100
6Subject: [PATCH] Revert "build: Use updated libnl3 header paths"
7
8This reverts commit e7ecddf33a446072effbc85a27a078a8e582c89e.
9---
10 src/drivers/drivers.mak | 2 +-
11 src/drivers/drivers.mk | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
15index 68ff910..1f38f57 100644
16--- a/src/drivers/drivers.mak
17+++ b/src/drivers/drivers.mak
18@@ -30,7 +30,7 @@ NEED_RFKILL=y
19 ifdef CONFIG_LIBNL32
20 DRV_LIBS += -lnl-3
21 DRV_LIBS += -lnl-genl-3
22- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
23+ DRV_CFLAGS += -DCONFIG_LIBNL20
24 else
25 ifdef CONFIG_LIBNL_TINY
26 DRV_LIBS += -lnl-tiny
27diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
28index db8561a..c93e88d 100644
29--- a/src/drivers/drivers.mk
30+++ b/src/drivers/drivers.mk
31@@ -30,7 +30,7 @@ NEED_RFKILL=y
32 ifdef CONFIG_LIBNL32
33 DRV_LIBS += -lnl-3
34 DRV_LIBS += -lnl-genl-3
35- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
36+ DRV_CFLAGS += -DCONFIG_LIBNL20
37 else
38 ifdef CONFIG_LIBNL_TINY
39 DRV_LIBS += -lnl-tiny
40--
411.7.10.4
42
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
index 22e42dd3f9..a8b0dad302 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
@@ -1,6 +1,6 @@
1require wpa-supplicant-2.0.inc 1require wpa-supplicant-2.0.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d" 5SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
6SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09" 6SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"