From 2276fd4a7bc199fc71346b0e9e7a01b6b2139c66 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Wed, 8 Jul 2015 22:56:43 +0200
Subject: [PATCH] linux-backports: fix build on master

* the kernel build directory was splitted
  and renamed on master
---
 classes/sysmocom-kernel-module-split.bbclass     |  3 ++-
 .../linux-backports/linux-backports_3.18.1.1.bb  | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/classes/sysmocom-kernel-module-split.bbclass b/classes/sysmocom-kernel-module-split.bbclass
index 2d10752..e639452 100644
--- a/classes/sysmocom-kernel-module-split.bbclass
+++ b/classes/sysmocom-kernel-module-split.bbclass
@@ -70,7 +70,8 @@ python split_kernel_module_packages () {
         m = kerverrexp.match(kernelver)
         if m:
             kernelver_stripped = m.group(1)
-        staging_kernel_dir = d.getVar("STAGING_KERNEL_DIR", True)
+        kernel_build_dir = ['STAGING_KERNEL_BUILDDIR', 'STAGING_KERNEL_DIR'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']
+        staging_kernel_dir = d.getVar(kernel_build_dir, True)
         system_map_file = "%s/boot/System.map-%s" % (dvar, kernelver)
         if not os.path.exists(system_map_file):
             system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver)
diff --git a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
index e50557a..bc2a9d5 100644
--- a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
+++ b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
@@ -16,15 +16,25 @@ SRC_URI[sha256sum] = "ff3d4d5192c4d57d7415dfcd60e02ea4fa21e0de224ae0ce2b5b9f2e9c
 
 S = "${WORKDIR}/backports-3.18.1-1"
 
+
+python __anonymous() {
+    if d.getVar('DISTRO_VERSION', True)[0:3] == '1.5':
+        d.setVar('KERNEL_BUILD_DIR', d.getVar('STAGING_KERNEL_DIR', True))
+    else:
+        d.setVar('KERNEL_BUILD_DIR', d.getVar('STAGING_KERNEL_BUILDDIR', True))
+}
+
+KERNEL_BUILD_DIR = "${@d.getVar('KERNEL_BUILD_DIR', True)}"
+
 do_configure() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC
         cp ${WORKDIR}/defconfig ${S}/.config
-        oe_runmake oldconfig KLIB_BUILD=${STAGING_KERNEL_DIR}
+        oe_runmake oldconfig KLIB_BUILD=${KERNEL_BUILD_DIR}
 }
 
 do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake KLIB_BUILD=${STAGING_KERNEL_DIR} \
+        oe_runmake KLIB_BUILD=${KERNEL_BUILD_DIR} \
                    CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
                    AR="${KERNEL_AR}" \
                    ${MAKE_TARGETS}
@@ -33,7 +43,7 @@ do_compile() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake DEPMOD=echo KLIB="${D}" \
-                   KLIB_BUILD=${STAGING_KERNEL_DIR} \
+                   KLIB_BUILD=${KERNEL_BUILD_DIR} \
                    CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
                    install
 }