qoriq_build_64bit_kernel: Scope arch QA override

Only remove the arch QA check when BUILD_64BIT_KERNEL promotes the QorIQ kernel build to the 64-bit toolchain.

This keeps the override tied to the configuration that needs it and handles an empty ERROR_QA value safely.

Tested as part of the series with bitbake -p and yocto-check-layer.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>

1 files changed, 3 insertions, 3 deletions

diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 5186c2a41..9c8f9ce7d 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -12,7 +12,7 @@ python () {
         d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
         d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
 
-    error_qa = d.getVar('ERROR_QA')
-    if 'arch' in error_qa:
-        d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
+        error_qa = (d.getVar('ERROR_QA') or '').split()
+        if 'arch' in error_qa:
+            d.setVar('ERROR_QA', ' '.join(flag for flag in error_qa if flag != 'arch'))
 }