qemu-qoriq: Merge the two do_install:append fragmentsbackport-2717-to-wrynose

One fragment sat above do_configure and the other below do_install, so
the recipe split one function in two and read as installing before
configuring; oelint flagged both as multifragments and task.order.
Folding the first into the second preserves the concatenation order, so
the generated task is unchanged. Tested with bitbake qemu-qoriq on
ls1046ardb: do_install re-executed and the buildhistory delta was empty.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
(cherry picked from commit d5c2d5181bc8b2399198286cb6e5c24f32cecf82)

1 files changed, 9 insertions, 12 deletions

diff --git a/recipes-devtools/qemu/qemu-qoriq.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index 55a8bc682..b626feae5 100644
--- a/recipes-devtools/qemu/qemu-qoriq.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
@@ -22,11 +22,6 @@ COMPATIBLE_HOST:mipsarchn64 = "null"
 # upstream states qemu doesn't work without optimization
 DEBUG_BUILD = "0"
 
-do_install:append() {
-    # Prevent QA warnings about installed ${localstatedir}/run
-    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
-}
-
 do_compile_ptest() {
     make buildtest-TESTS
 }
@@ -130,19 +125,21 @@ do_install () {
     oe_runmake 'DESTDIR=${D}' install
 }
 
-# The following fragment will create a wrapper for qemu-mips user emulation
-# binary in order to work around a segmentation fault issue. Basically, by
-# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
-# This will trigger a MMU access fault in the virtual CPU. With this change,
-# the qemu-mips works fine.
-# IMPORTANT: This piece needs to be removed once the root cause is fixed!
 do_install:append() {
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+
+    # Create a wrapper for qemu-mips user emulation binary in order to work
+    # around a segmentation fault issue. Basically, by default, the reserved
+    # virtual address space for 32-on-64 bit is set to 4GB. This will trigger a
+    # MMU access fault in the virtual CPU. With this change, the qemu-mips works
+    # fine.
+    # IMPORTANT: This piece needs to be removed once the root cause is fixed!
     if [ -e "${D}/${bindir}/qemu-mips" ]; then
         create_wrapper ${D}/${bindir}/qemu-mips \
             QEMU_RESERVED_VA=0x0
     fi
 }
-# END of qemu-mips workaround
 
 # QEMU ships firmware and BIOS blobs built for guest architectures other than
 # the build target, so the arch QA check flags them by design.