diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 65cf5fac5f..cc466bd1b2 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1434,7 +1434,7 @@ if [ x"$D" = "x" ]; then | |||
1434 | fi | 1434 | fi |
1435 | } | 1435 | } |
1436 | 1436 | ||
1437 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps" | 1437 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --rcfile ${STAGING_LIBDIR_NATIVE}/rpm/rpmrc --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmconfigdir ${STAGING_LIBDIR_NATIVE}/rpm/'" |
1438 | 1438 | ||
1439 | # Collect perfile run-time dependency metadata | 1439 | # Collect perfile run-time dependency metadata |
1440 | # Output: | 1440 | # Output: |
@@ -1451,6 +1451,7 @@ python package_do_filedeps() { | |||
1451 | pkgdest = d.getVar('PKGDEST') | 1451 | pkgdest = d.getVar('PKGDEST') |
1452 | packages = d.getVar('PACKAGES') | 1452 | packages = d.getVar('PACKAGES') |
1453 | rpmdeps = d.getVar('RPMDEPS') | 1453 | rpmdeps = d.getVar('RPMDEPS') |
1454 | magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc") | ||
1454 | 1455 | ||
1455 | def chunks(files, n): | 1456 | def chunks(files, n): |
1456 | return [files[i:i+n] for i in range(0, len(files), n)] | 1457 | return [files[i:i+n] for i in range(0, len(files), n)] |
@@ -1462,7 +1463,7 @@ python package_do_filedeps() { | |||
1462 | 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-'): | 1463 | 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-'): |
1463 | continue | 1464 | continue |
1464 | for files in chunks(pkgfiles[pkg], 100): | 1465 | for files in chunks(pkgfiles[pkg], 100): |
1465 | pkglist.append((pkg, files, rpmdeps, pkgdest)) | 1466 | pkglist.append((pkg, files, rpmdeps, pkgdest, magic)) |
1466 | 1467 | ||
1467 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) | 1468 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) |
1468 | 1469 | ||