From: Liu Ting-B28495 <ting.liu@freescale.com>
Date: Fri, 1 May 2015 15:53:45 +0000 (+0800)
Subject: asf: use KBUILD_OUTPUT to point to build-artifacts
X-Git-Tag: 2.1~534^2~5
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d941ab6d0a6d7862d477c53acca282efaec49d2f;p=meta-freescale.git

asf: use KBUILD_OUTPUT to point to build-artifacts

In poky commit 46cdaf1, the kernel build output was put into
kernel-build-artifacts, and kernel-source is kept "pristine".

KERNEL_PATH points to kernel-source, while KBUILD_OUTPUT points
to build-artifacts which can be used for external module build.

asf Makefile tries to include the .config, use KBUILD_OUTPUT to
avoid build error.

Signed-off-by: Liu Ting-B28495 <ting.liu@freescale.com>
---

diff --git a/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb b/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb
index b3379c1a..1ca4c8ea 100644
--- a/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb
@@ -7,15 +7,17 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;nobranch=1"
 SRCREV = "16eb472d6b2b34c8b605a86c469611bc8ddec1c9"
 
 inherit module qoriq_build_64bit_kernel
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
 S = "${WORKDIR}/git/asfmodule"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
+
 INHIBIT_PACKAGE_STRIP = "1"
 
-do_configure_append (){
-    cp ${STAGING_KERNEL_BUILDDIR}/.config  ${STAGING_KERNEL_DIR}/
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_configure_prepend () {
+    sed -i 's,$(KERNEL_PATH)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/Makefile
 }
 
 do_install(){
@@ -28,3 +30,4 @@ do_install(){
 
 FILES_${PN} += "${libexecdir} /lib/modules/${KERNEL_VERSION}/asf"
 RDEPENDS_${PN} += "ipsec-tools"
+