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