[OE-core] [meta-oe][PATCH] hostapd: Remove include from drivers makefiles

Jean-Michel Hautbois jean-michel.hautbois at vodalys.com
Mon Dec 15 15:17:27 UTC 2014


When compiling (tested on Arch) QA fails saying that it uses host
include files.

Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois at vodalys.com>
---
 ...apd-Don-t-include-libnl-include-directory.patch | 43 ++++++++++++++++++++++
 .../recipes-connectivity/hostapd/hostapd_2.2.bb    |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd-2.2/0001-hostapd-Don-t-include-libnl-include-directory.patch

diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/0001-hostapd-Don-t-include-libnl-include-directory.patch b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/0001-hostapd-Don-t-include-libnl-include-directory.patch
new file mode 100644
index 0000000..f28429e
--- /dev/null
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/0001-hostapd-Don-t-include-libnl-include-directory.patch
@@ -0,0 +1,43 @@
+From f4a132167c62f607f248a28ef292252ba6b42a59 Mon Sep 17 00:00:00 2001
+From: Jean-Michel Hautbois <jean-michel.hautbois at vodalys.com>
+Date: Mon, 15 Dec 2014 15:46:53 +0100
+Subject: [PATCH] hostapd: Don't include libnl include directory
+
+Remove hostapd include directories for libnl, as these can be in conflict
+with the host includes.
+
+Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois at vodalys.com>
+---
+ 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 7e175f4..950701f 100644
+--- a/src/drivers/drivers.mak
++++ b/src/drivers/drivers.mak
+@@ -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
+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
+-- 
+2.1.2
+
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
index b75f2b9..9ef8f7e 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
     file://defconfig \
     file://init \
     file://hostapd.service \
+    file://0001-hostapd-Don-t-include-libnl-include-directory.patch;patchdir=.. \
 "
 
 S = "${WORKDIR}/hostapd-${PV}/hostapd"
-- 
2.1.2




More information about the Openembedded-core mailing list