summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package.bbclass')
-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