[yocto] [PATCH][autobuilder 3/3] nightly-multilib: improve multilib build determinism

[Ross Burton]

There are patches for oe-core which improve the behaviour of multilib images but
show that the RPM-based multilib image construction was working more by luck
than anything else.

Explicitly set RPM_PREFER_ARCH_ELF="1" to prefer 32-bit binaries when both
options are being installed.

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 buildset-config.controller/nightly-multilib.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildset-config.controller/nightly-multilib.conf b/buildset-config.controller/nightly-multilib.conf
index 6bd68f0..7cf75c3 100644
--- a/buildset-config.controller/nightly-multilib.conf
+++ b/buildset-config.controller/nightly-multilib.conf
@@ -24,7 +24,7 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64',
                             'buildhistory' : False, 'multilib': 'lib32',
                             'distro': 'poky',
-                            'atextappend' : '\nIMAGE_INSTALL_append = " lib32-connman-gnome"\n'}},
+                            'atextappend' : '\nRPM_PREFER_ELF_ARCH = "1"\nIMAGE_INSTALL_append = " lib32-connman-gnome"\n'}},
         {'BuildImages': {'images': 'core-image-sato'}},
         {'RunSanityTests': {'images': 'core-image-sato', 'suitesappend' : 'multilib'}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64',
-- 
2.1.4