summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2017-08-15 16:41:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commit1b5d1b36bbb802a95483d8712849ee8deb823e54 (patch)
tree653f1279cad2193983d8a438d2489c2740f3e07b /meta/classes
parent8c01d5ccb8d5d70226d8a6707a35a27a93e15f89 (diff)
downloadpoky-1b5d1b36bbb802a95483d8712849ee8deb823e54.tar.gz
package.bbclass: Restore functionality to detect RPM dependencies
During the transition to dnf and rpm4, the functionality to automatically make RPM determine dependencies was lost. Before the transition, an OE specific tool called rpmdeps-oecore had been added to the rpm suit. It was based on the rpmdeps tool that is part of rpm. For each file specified on its command line, it would output the provides and requires that RPM could determine. During the transition to rpm4, rpmdeps-oecore was replaced with the standard rpmdeps. However, what no one noticed was that unless rpmdeps is given options, e.g., -P or -R, to tell it what it should output, it will not output anything. Thus, it would do all the work to determine the requirements, but would keep silent about it. And since no output from rpmdeps is expected unless there are requirements, there were no warnings indicating that everything was not working as expected. Porting the old rpmdeps-oecore to work with rpm4 is not really possible since it relied on being able to access internals of RPM that are no longer available. However, it turned out that rpmdeps had a debug option, --rpmfcdebug, that would output exactly the information that we need, albeit in a different format and to stderr. To make this usable, rpmdeps has now received a new option, --alldeps, which sends the information we need to stdout. (From OE-Core rev: 958501b3d9201aaabb81ec644c6049e0c9b737e7) (From OE-Core rev: bf017930036f19b3d6df8e5b50d9979ee7045c5c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d2fa6175e6..2fe30dac0c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1453,7 +1453,7 @@ if [ x"$D" = "x" ]; then
1453fi 1453fi
1454} 1454}
1455 1455
1456RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --rcfile ${STAGING_LIBDIR_NATIVE}/rpm/rpmrc --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmconfigdir ${STAGING_LIBDIR_NATIVE}/rpm/'" 1456RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps"
1457 1457
1458# Collect perfile run-time dependency metadata 1458# Collect perfile run-time dependency metadata
1459# Output: 1459# Output:
@@ -1470,7 +1470,6 @@ python package_do_filedeps() {
1470 pkgdest = d.getVar('PKGDEST') 1470 pkgdest = d.getVar('PKGDEST')
1471 packages = d.getVar('PACKAGES') 1471 packages = d.getVar('PACKAGES')
1472 rpmdeps = d.getVar('RPMDEPS') 1472 rpmdeps = d.getVar('RPMDEPS')
1473 magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc")
1474 1473
1475 def chunks(files, n): 1474 def chunks(files, n):
1476 return [files[i:i+n] for i in range(0, len(files), n)] 1475 return [files[i:i+n] for i in range(0, len(files), n)]
@@ -1482,7 +1481,7 @@ python package_do_filedeps() {
1482 if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') or pkg.endswith('-src'): 1481 if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') or pkg.endswith('-src'):
1483 continue 1482 continue
1484 for files in chunks(pkgfiles[pkg], 100): 1483 for files in chunks(pkgfiles[pkg], 100):
1485 pkglist.append((pkg, files, rpmdeps, pkgdest, magic)) 1484 pkglist.append((pkg, files, rpmdeps, pkgdest))
1486 1485
1487 processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) 1486 processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner)
1488 1487