From 3a1b450f6029e45f48bc3c25020ac5085d69c4a0 Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fathi.boudra@linaro.org>
Date: Thu, 22 Jun 2017 17:14:08 +0300
Subject: [PATCH] linux.inc: split kernel-headers package into a separate
 include

With Linux Mainline and Next, it's causing build issues:
|   INSTALL usr/include/video/ (3 files)
|   INSTALL usr/include/video/uvesafb.h/ (0 file)
| touch: cannot touch 'usr/include/video/uvesafb.h/.install': Not a directory
| scripts/Makefile.headersinst:116: recipe for target 'usr/include/video/uvesafb.h/.install' failed

Workaround the build failure by splitting the kernel-headers package into
a separate include. If kernel recipes need the kernel-headers, they can
include linux-headers.inc file.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 recipes-kernel/linux/linux-headers.inc | 8 ++++++++
 recipes-kernel/linux/linux.inc         | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-headers.inc

diff --git a/recipes-kernel/linux/linux-headers.inc b/recipes-kernel/linux/linux-headers.inc
new file mode 100644
index 00000000..07abac53
--- /dev/null
+++ b/recipes-kernel/linux/linux-headers.inc
@@ -0,0 +1,8 @@
+inherit kernel-arch
+
+do_install_append() {
+    oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
+}
+
+PACKAGES =+ "kernel-headers"
+FILES_kernel-headers = "${exec_prefix}/src/linux*"
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 24d26330..b2c2c281 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -201,7 +201,6 @@ do_configure_append() {
 EXTRA_OEMAKE = "${PARALLEL_MAKE} "
 
 do_install_append() {
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
 	oe_runmake firmware_install INSTALL_MOD_PATH=${D} ARCH=$ARCH
 	install -d ${D}/boot
 	make -C ${S} O=${B} ARCH=$ARCH dtbs || true
@@ -213,9 +212,6 @@ do_install_append() {
 	rm -f ${D}${KERNEL_SRC_PATH}/arch/*/vdso/vdso*.so
 }
 
-PACKAGES =+ "kernel-headers"
-FILES_kernel-headers = "${exec_prefix}/src/linux*"
-
 require recipes-kernel/linux/linux-dtb.inc
 
 PACKAGES =+ "kernel-devicetree-overlays"