From: Jens Rehsack <jens.rehsack.ext@safrangroup.com>
Date: Mon, 16 Dec 2019 09:20:47 +0000 (+0100)
Subject: Revert "linux-qoriq recipes: reorder merge_delta_config task"
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=eab80ecde3618b1b16555ccfbcefb6df8c86aae1;p=meta-freescale.git

Revert "linux-qoriq recipes: reorder merge_delta_config task"

This reverts commit 6e0b6f295fa7f62484b7a448fb729fbd32191a6b,
which unfortunately causes a blank build for e.g. ls2088ardb fail as that

    ERROR: linux-qoriq-4.19-r0 do_preconfigure: Execution of 'mp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614' failed with exit code 2:
    tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: 119: tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: cannot open tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/defconfig: No such file
    WARNING: exit code 2 from a shell command.

    ERROR: Logfile of failure stored in: tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/log.do_preconfigure.13614
    Log data follows:
    | DEBUG: Executing shell function do_preconfigure
    | tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: 119: tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: cannot open tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/defconfig: No such file
    | WARNING: exit code 2 from a shell command.
    | ERROR: Execution of 'tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614' failed with exit code 2:
    | tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: 119: tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/temp/run.do_preconfigure.13614: cannot open tmp/work/ls2088ardb-poky-linux/linux-qoriq/4.19-r0/defconfig: No such file
    | WARNING: exit code 2 from a shell command.
    |
    ERROR: Task (/build/sno/sources/meta-freescale/recipes-kernel/linux/linux-qoriq_4.19.bb:do_preconfigure) failed with exit code '1'

This is caused by do_preconfigure() from classes/fsl-kernel-localversion.bbclass
expects a ${WORKDIR}/defconfig which was earlier created by merge_delta_config.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
---

diff --git a/recipes-kernel/linux/linux-qoriq-rt_4.14.bb b/recipes-kernel/linux/linux-qoriq-rt_4.14.bb
index 5a1147e5..e880081a 100644
--- a/recipes-kernel/linux/linux-qoriq-rt_4.14.bb
+++ b/recipes-kernel/linux/linux-qoriq-rt_4.14.bb
@@ -37,7 +37,7 @@ do_merge_delta_config[dirs] = "${B}"
 do_merge_delta_config() {
     # create config with make config
     oe_runmake  -C ${S} O=${B} ${KERNEL_DEFCONFIG}
-
+    
     # check if bigendian is enabled
     if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then
         echo "CONFIG_CPU_BIG_ENDIAN=y" >> .config
@@ -56,7 +56,7 @@ do_merge_delta_config() {
     done
     cp .config ${WORKDIR}/defconfig
 }
-addtask merge_delta_config before do_configure after do_patch do_preconfigure
+addtask merge_delta_config before do_preconfigure 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() {
diff --git a/recipes-kernel/linux/linux-qoriq_4.14.bb b/recipes-kernel/linux/linux-qoriq_4.14.bb
index 8a28918c..f2e0a4b8 100644
--- a/recipes-kernel/linux/linux-qoriq_4.14.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.14.bb
@@ -56,7 +56,7 @@ do_merge_delta_config() {
     done
     cp .config ${WORKDIR}/defconfig
 }
-addtask merge_delta_config before do_configure after do_patch do_preconfigure
+addtask merge_delta_config before do_preconfigure 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() {
diff --git a/recipes-kernel/linux/linux-qoriq_4.19.bb b/recipes-kernel/linux/linux-qoriq_4.19.bb
index 78125352..aed29df6 100644
--- a/recipes-kernel/linux/linux-qoriq_4.19.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.19.bb
@@ -57,7 +57,7 @@ do_merge_delta_config() {
     done
     cp .config ${WORKDIR}/defconfig
 }
-addtask merge_delta_config before do_configure after do_patch do_preconfigure
+addtask merge_delta_config before do_preconfigure 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() {