[PATCH 0/2] Fix packages for new kernel Headers

[PATCH 0/2] Fix packages for new kernel Headers

[Saul Wold]

These patches actually remove the use of the kernel headers
and target the userspace headers

Saul

Saul Wold (2):
  connman: add header to define in6_addr
  iproute2: don't use the kernel header tree

 .../connman/connman/add-in.h-for-ipv6.patch           | 19 +++++++++++++++++++
 meta/recipes-connectivity/connman/connman_1.10.bb     |  3 ++-
 meta/recipes-connectivity/iproute2/iproute2.inc       |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch

-- 
1.8.0.2

[PATCH 1/2] connman: add header to define in6_addr

[Saul Wold]

Needed because the 3.8 if_bridge.h uses in6_addr before it's defined

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../connman/connman/add-in.h-for-ipv6.patch           | 19 +++++++++++++++++++
 meta/recipes-connectivity/connman/connman_1.10.bb     |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch

diff --git a/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch b/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
new file mode 100644
index 0000000..e0f1d47
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/add-in.h-for-ipv6.patch
@@ -0,0 +1,19 @@
+
+The 3.8 Kernel headers for if_bridge.h uses the in6_addr struct
+which is defined by netinet/in.h which is not included prior.
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.inte.com>
+Index: git/src/tethering.c
+===================================================================
+--- git.orig/src/tethering.c
++++ git/src/tethering.c
+@@ -35,6 +35,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <linux/if_tun.h>
++#include <netinet/in.h>
+ #include <linux/if_bridge.h>
+ 
+ #include "connman.h"
diff --git a/meta/recipes-connectivity/connman/connman_1.10.bb b/meta/recipes-connectivity/connman/connman_1.10.bb
index 10d5255..7dca1b4 100644
--- a/meta/recipes-connectivity/connman/connman_1.10.bb
+++ b/meta/recipes-connectivity/connman/connman_1.10.bb
@@ -7,7 +7,8 @@ SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
             file://add_xuser_dbus_permission.patch \
             file://connman \
             file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
-            file://inet-fix-ip-cleanup-functions.patch"
+            file://inet-fix-ip-cleanup-functions.patch \
+            file://add-in.h-for-ipv6.patch"
 S = "${WORKDIR}/git"
 PR = "${INC_PR}.0"
 
-- 
1.8.0.2

[PATCH 2/2] iproute2: don't use the kernel header tree

[Saul Wold]

This should compile against the userspace safe kernel headers

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/iproute2/iproute2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 41957ce..fb233eb 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables"
 
 inherit update-alternatives
 
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
 
 do_install () {
     oe_runmake DESTDIR=${D} install
-- 
1.8.0.2