From ec287c69f8bd3c4d84896ca87d903eb364e396f7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 28 Jul 2015 19:13:54 -0300 Subject: 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 Signed-off-by: Martin Jansa --- .../hostapd/hostapd/add-sysroot-to-gcc.patch | 40 ---------------------- .../recipes-connectivity/hostapd/hostapd_2.4.bb | 1 - 2 files changed, 41 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch 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 d1134b9aa7..0000000000 --- a/meta-oe/recipes-connectivity/hostapd/hostapd/add-sysroot-to-gcc.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Pending - -We should make sure that sysroot is used by gcc instead of assuming -hardcoded locations for include paths - -Signed-off-by: Roy Li ---- - 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 -I=/usr/include/libnl3 - 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 -I=/usr/include/libnl3 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny --- -2.1.2 - diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.4.bb index 84b1128488..36c0cd4908 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 = " \ file://defconfig \ file://init \ file://hostapd.service \ - file://add-sysroot-to-gcc.patch;patchdir=.. \ " S = "${WORKDIR}/hostapd-${PV}/hostapd" -- cgit v1.2.3-54-g00ecf