diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index cc466bd1b2..a03c05b9f7 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1434,7 +1434,13 @@ if [ x"$D" = "x" ]; then | |||
1434 | fi | 1434 | fi |
1435 | } | 1435 | } |
1436 | 1436 | ||
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/'" | 1437 | # In Morty and earlier releases, and on master (Rocko), the RPM file |
1438 | # dependencies are always enabled. However, since they were broken with the | ||
1439 | # release of Pyro and enabling them may cause build problems for some packages, | ||
1440 | # they are not enabled by default in Pyro. Setting ENABLE_RPM_FILEDEPS_FOR_PYRO | ||
1441 | # to "1" will enable them again. | ||
1442 | ENABLE_RPM_FILEDEPS_FOR_PYRO ??= "0" | ||
1443 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps${@' --alldeps' if d.getVar('ENABLE_RPM_FILEDEPS_FOR_PYRO') == '1' else ''}" | ||
1438 | 1444 | ||
1439 | # Collect perfile run-time dependency metadata | 1445 | # Collect perfile run-time dependency metadata |
1440 | # Output: | 1446 | # Output: |
@@ -1451,7 +1457,6 @@ python package_do_filedeps() { | |||
1451 | pkgdest = d.getVar('PKGDEST') | 1457 | pkgdest = d.getVar('PKGDEST') |
1452 | packages = d.getVar('PACKAGES') | 1458 | packages = d.getVar('PACKAGES') |
1453 | rpmdeps = d.getVar('RPMDEPS') | 1459 | rpmdeps = d.getVar('RPMDEPS') |
1454 | magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc") | ||
1455 | 1460 | ||
1456 | def chunks(files, n): | 1461 | def chunks(files, n): |
1457 | return [files[i:i+n] for i in range(0, len(files), n)] | 1462 | return [files[i:i+n] for i in range(0, len(files), n)] |
@@ -1463,7 +1468,7 @@ python package_do_filedeps() { | |||
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-'): | 1468 | 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-'): |
1464 | continue | 1469 | continue |
1465 | for files in chunks(pkgfiles[pkg], 100): | 1470 | for files in chunks(pkgfiles[pkg], 100): |
1466 | pkglist.append((pkg, files, rpmdeps, pkgdest, magic)) | 1471 | pkglist.append((pkg, files, rpmdeps, pkgdest)) |
1467 | 1472 | ||
1468 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) | 1473 | processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner) |
1469 | 1474 | ||