<div dir="ltr">The following changes since commit 55bd8d189f647443b28f988ccfc9eebffaec84d1:<br><br>  providers.py: Add PREFERRED_RPROVIDER (2015-05-13 11:29:52 -0400)<br><br>are available in the git repository at:<br><br>  git://<a href="http://github.com/jatedev/poky.git">github.com/jatedev/poky.git</a> preferred-provider-runtime-2<br><br>for you to fetch changes up to 832a47ff79a06a797ddd39db86c792a43cdf0865:<br><br>  image.bbclass/rootfs.py: use PREFERRED_RPROVIDER to select package (2015-05-13 12:24:02 -0400)<br><br>----------------------------------------------------------------<br>Jate Sujjavanich (1):<br>      image.bbclass/rootfs.py: use PREFERRED_RPROVIDER to select package<br><br> meta/classes/image.bbclass |   14 ++++++++++++++<br> meta/lib/oe/rootfs.py      |    2 +-<br> 2 files changed, 15 insertions(+), 1 deletion(-)<br><br>diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass<br>index 01f8b3f..80484d6 100644<br>--- a/meta/classes/image.bbclass<br>+++ b/meta/classes/image.bbclass<br>@@ -283,6 +283,20 @@ python rootfs_process_ignore() {<br> }<br> do_rootfs[prefuncs] += &quot;rootfs_process_ignore&quot;<br><br>+python rootfs_process_preferred_rproviders() {<br>+    inst_pkgs = d.getVar(&quot;PACKAGE_INSTALL&quot;, True).split()<br>+    pref_pkgs = list()<br>+    for pkg in inst_pkgs:<br>+        prefervar = d.getVar(&quot;PREFERRED_RPROVIDER_%s&quot; % pkg, True)<br>+        if prefervar:<br>+            inst_pkgs.remove(pkg)<br>+            pref_pkgs.append(prefervar)<br>+            bb.note(&quot;Selecting %s to provide %s due to PREFERRED_RPROVIDER&quot; % (prefervar, pkg))<br>+    inst_pkgs.extend(pref_pkgs)<br>+    d.setVar(&quot;PACKAGE_INSTALL&quot;, &#39; &#39;.join(inst_pkgs))<br>+}<br>+do_rootfs[prefuncs] += &quot;rootfs_process_preferred_rproviders&quot;<br>+<br> # We have to delay the runtime_mapping_rename until just before rootfs runs<br> # otherwise, the multilib renaming could step in and squash any fixups that<br> # may have occurred.<br>diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py<br>index 6fb749f..4bad7ef 100644<br>--- a/meta/lib/oe/rootfs.py<br>+++ b/meta/lib/oe/rootfs.py<br>@@ -393,7 +393,7 @@ class RpmRootfs(Rootfs):<br>         pass<br><br>     def _log_check_error(self):<br>-        r = re.compile(&#39;(unpacking of archive failed|Cannot find package|exit 1|ERR|Fail)&#39;)<br>+        r = re.compile(&#39;(unpacking of archive failed|Cannot find package|exit 1|ERR(?!ED_RPROVIDER)|Fail)&#39;)<br>         log_path = self.d.expand(&quot;${T}/log.do_rootfs&quot;)<br>         with open(log_path, &#39;r&#39;) as log:<br>             found_error = 0<br><br></div>