Skip to contentSkip to conversation

package_manager.py: search provides when not found by pkgname

PATCH New Robert Yang 1 participant 2 messages Sep 7, 2015

lore
Share & tools
lore
#0 lore raw

cover package_manager.py: search provides when not found by pkgname

The following changes since commit 8402958cd2cb87b8283c8ee4e2d08e1a6717d67a:

pseudo_1.7.3.bb: New version of pseudo (2015-09-06 15:24:28 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/smart
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/smart

Robert Yang (1):
package_manager.py: search provides when not found by pkgname

 meta/lib/oe/package_manager.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 package_manager.py: search provides when not found by pkgname

Fixed when:
PACKAGE_CLASSES = "package_rpm" IMAGE_INSTALL_append = " perl-module-warnings-register"

$ bitbake core-image-minimal
[snip]
ERROR: perl-module-warnings-register not found in the base feeds
[snip]

And it works well when PACKAGE_CLASSES = "package_ipk" since perl provides perl-module-warnings-register, the "smart install perl-module-warnings-register" also works well, this was because _search_pkg_name_in_feeds() only searched pkg name, but no provides, this patch fixes the problem.

---
 meta/lib/oe/package_manager.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
meta/lib/oe/package_manager.py +16 -0
index 810b728..292ed44 100644
@@ -760,6 +760,22 @@ class RpmPM(PackageManager):
                     # bb.note('%s -> %s' % (pkg, pkg + '@' + arch))
                     return pkg + '@' + arch
 
+        # Search provides if not found by pkgname.
+        bb.note('Not found %s by name, searching provides ...' % pkg)
+        cmd = "%s %s query --provides %s --show-format='$name-$version'" % \
+                (self.smart_cmd, self.smart_opt, pkg)
+        cmd += " | sed -ne 's/ *Provides://p'"
+        bb.note('cmd: %s' % cmd)
+        output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+        # Found a provider
+        if output:
+            bb.note('Found providers for %s: %s' % (pkg, output))
+            for p in output.split():
+                for arch in feed_archs:
+                    arch = arch.replace('-', '_')
+                    if p.rstrip().endswith('@' + arch):
+                        return p
+
         return ""
 
     '''
Signature · 1 line
1.7.9.5