summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package.bbclass5
-rw-r--r--meta/lib/oe/package.py7
2 files changed, 8 insertions, 4 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
1433fi 1433fi
1434} 1434}
1435 1435
1436RPMDEPS = "${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" 1436RPMDEPS = "${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
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 0ca41aa91c..52c5f16cf8 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -57,7 +57,7 @@ def file_translate(file):
57def filedeprunner(arg): 57def filedeprunner(arg):
58 import re, subprocess, shlex 58 import re, subprocess, shlex
59 59
60 (pkg, pkgfiles, rpmdeps, pkgdest) = arg 60 (pkg, pkgfiles, rpmdeps, pkgdest, magic) = arg
61 provides = {} 61 provides = {}
62 requires = {} 62 requires = {}
63 63
@@ -90,8 +90,11 @@ def filedeprunner(arg):
90 90
91 return provides, requires 91 return provides, requires
92 92
93 env = os.environ.copy()
94 env["MAGIC"] = magic
95
93 try: 96 try:
94 dep_popen = subprocess.Popen(shlex.split(rpmdeps) + pkgfiles, stdout=subprocess.PIPE) 97 dep_popen = subprocess.Popen(shlex.split(rpmdeps) + pkgfiles, stdout=subprocess.PIPE, env=env)
95 provides, requires = process_deps(dep_popen.stdout, pkg, pkgdest, provides, requires) 98 provides, requires = process_deps(dep_popen.stdout, pkg, pkgdest, provides, requires)
96 except OSError as e: 99 except OSError as e:
97 bb.error("rpmdeps: '%s' command failed, '%s'" % (shlex.split(rpmdeps) + pkgfiles, e)) 100 bb.error("rpmdeps: '%s' command failed, '%s'" % (shlex.split(rpmdeps) + pkgfiles, e))