From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 14 Apr 2021 21:18:22 +0000 (-0300)
Subject: linux-qoriq: Fix task order of merge_delta_config task
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ac80eb42b01c3231b9763177f43f10fd1206702b;p=meta-freescale.git

linux-qoriq: Fix task order of merge_delta_config task

The merge_delta_config must run before do_kernel_localversion task,
which is what fsl-kernel-localversion now use.

Fixes: #721.
Fixes: 49299998 ("classes: fsl-kernel-localversion: Fix task dependency")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 33653d391b7f8bd9f932e613da46c2f61f2fc336)
---

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index dcf28401..4d134b47 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -53,7 +53,7 @@ do_merge_delta_config() {
     done
     cp .config ${WORKDIR}/defconfig
 }
-addtask merge_delta_config before do_preconfigure after do_patch
+addtask merge_delta_config before do_kernel_localversion after do_patch
 
 # The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b)
 do_compile_prepend_fsl-lsch2-32b() {