sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andreas Oberritter 2013-03-08 23:42:03 +01:00 committed by Richard Purdie
parent e4a19279ba
commit 29ec481c46
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
View File

@ -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}"

42
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch Normal file
View File

@ -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

2
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
View File

@ -1,6 +1,6 @@
require wpa-supplicant-2.0.inc
PR = "r0"
PR = "r1"
SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"