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 48fef97251..871263f086 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1433,7 +1433,7 @@ if [ x"$D" = "x" ]; then | |||
1433 | fi | 1433 | fi |
1434 | } | 1434 | } |
1435 | 1435 | ||
1436 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" | 1436 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --rcfile ${STAGING_LIBDIR_NATIVE}/rpm/rpmrc --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmconfigdir ${STAGING_LIBDIR_NATIVE}/rpm/'" |
1437 | 1437 | ||
1438 | # Collect perfile run-time dependency metadata | 1438 | # Collect perfile run-time dependency metadata |
1439 | # Output: | 1439 | # Output: |
@@ -1450,6 +1450,7 @@ python package_do_filedeps() { | |||
1450 | pkgdest = d.getVar('PKGDEST') | 1450 | pkgdest = d.getVar('PKGDEST') |
1451 | packages = d.getVar('PACKAGES') | 1451 | packages = d.getVar('PACKAGES') |
1452 | rpmdeps = d.getVar('RPMDEPS') | 1452 | rpmdeps = d.getVar('RPMDEPS') |
1453 | magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc") | ||
1453 | 1454 | ||
1454 | def chunks(files, n): | 1455 | def chunks(files, n): |
1455 | return [files[i:i+n] for i in range(0, len(files), n)] | 1456 | return [files[i:i+n] for i in range(0, len(files), n)] |
@@ -1461,7 +1462,7 @@ python package_do_filedeps() { | |||
1461 | 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-'): | 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-'): |
1462 | continue | 1463 | continue |
1463 | for files in chunks(pkgfiles[pkg], 100): | 1464 | for files in chunks(pkgfiles[pkg], 100): |
1464 | pkglist.append((pkg, files, rpmdeps, pkgdest)) | 1465 | pkglist.append((pkg, files, rpmdeps, pkgdest, magic)) |
1465 | 1466 | ||
1466 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) | 1467 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) |
1467 | 1468 | ||