summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-28 19:13:54 -0300
committerMartin Jansa <Martin.Jansa@gmail.com>2015-08-18 11:52:30 +0200
commitec287c69f8bd3c4d84896ca87d903eb364e396f7 (patch)
tree9a34973a50990b3368ebc5488a98e5647561ff85
parentc8f37d873ab0380f0eedaf708c6c7c801a57e3b8 (diff)
downloadmeta-openembedded-ec287c69f8bd3c4d84896ca87d903eb364e396f7.tar.gz
hostapd: Remove add-sysroot-to-gcc.patch
The patch has not been available in the 2.4 version form and thus the recipe was unbuildable. Fix by removing the patch file, which is unused, and the reference for it from the recipe. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch40
-rw-r--r--meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb1
2 files changed, 0 insertions, 41 deletions
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch b/meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch
deleted file mode 100644
index d1134b9aa..000000000
--- a/meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Pending
2
3We should make sure that sysroot is used by gcc instead of assuming
4hardcoded locations for include paths
5
6Signed-off-by: Roy Li <rongqing.li@windriver.com>
7---
8 src/drivers/drivers.mak | 2 +-
9 src/drivers/drivers.mk | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
13index 7e175f4..950701f 100644
14--- a/src/drivers/drivers.mak
15+++ b/src/drivers/drivers.mak
16@@ -35,7 +35,7 @@ NEED_RFKILL=y
17 ifdef CONFIG_LIBNL32
18 DRV_LIBS += -lnl-3
19 DRV_LIBS += -lnl-genl-3
20- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
21+ DRV_CFLAGS += -DCONFIG_LIBNL20 -I=/usr/include/libnl3
22 else
23 ifdef CONFIG_LIBNL_TINY
24 DRV_LIBS += -lnl-tiny
25diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
26index db8561a..c93e88d 100644
27--- a/src/drivers/drivers.mk
28+++ b/src/drivers/drivers.mk
29@@ -30,7 +30,7 @@ NEED_RFKILL=y
30 ifdef CONFIG_LIBNL32
31 DRV_LIBS += -lnl-3
32 DRV_LIBS += -lnl-genl-3
33- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
34+ DRV_CFLAGS += -DCONFIG_LIBNL20 -I=/usr/include/libnl3
35 else
36 ifdef CONFIG_LIBNL_TINY
37 DRV_LIBS += -lnl-tiny
38--
392.1.2
40
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb
index 84b112848..36c0cd490 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
18 file://defconfig \ 18 file://defconfig \
19 file://init \ 19 file://init \
20 file://hostapd.service \ 20 file://hostapd.service \
21 file://add-sysroot-to-gcc.patch;patchdir=.. \
22" 21"
23 22
24S = "${WORKDIR}/hostapd-${PV}/hostapd" 23S = "${WORKDIR}/hostapd-${PV}/hostapd"