diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2013-03-08 23:42:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-12 18:27:24 +0000 |
| commit | 1c3beda0015da9a0fec2581af7645c9ea122c7e3 (patch) | |
| tree | f20a52b27a1c1d5fca7b174dd94057be737db876 /meta/recipes-connectivity/wpa-supplicant | |
| parent | 82205345d777f7f34d43e4f81df0fa3bfe409fc4 (diff) | |
| download | openembedded-core-1c3beda0015da9a0fec2581af7645c9ea122c7e3.tar.gz openembedded-core-1c3beda0015da9a0fec2581af7645c9ea122c7e3.tar.bz2 openembedded-core-1c3beda0015da9a0fec2581af7645c9ea122c7e3.zip | |
wpa-supplicant: avoid host contamination by libnl3
Removes hardcoded include path -I/usr/include/libnl3. OE's include
path gets injected by do_configure.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant')
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 \ file://wpa-supplicant.sh \ file://wpa_supplicant.conf \ file://wpa_supplicant.conf-sane \ - file://99_wpa_supplicant" + file://99_wpa_supplicant \ + file://fix-libnl3-host-contamination.patch" 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 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 @@ +Upstream-Status: Pending + +From 37d6b3dd5a737cd67468e4a58b372bddd924a7be Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter <obi@opendreambox.org> +Date: Fri, 8 Mar 2013 22:55:19 +0100 +Subject: [PATCH] Revert "build: Use updated libnl3 header paths" + +This reverts commit e7ecddf33a446072effbc85a27a078a8e582c89e. +--- + src/drivers/drivers.mak | 2 +- + src/drivers/drivers.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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 + 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 +diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk +index db8561a..c93e88d 100644 +--- a/src/drivers/drivers.mk ++++ b/src/drivers/drivers.mk +@@ -30,7 +30,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 +-- +1.7.10.4 + 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 @@ require wpa-supplicant-2.0.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d" SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09" |