diff options
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
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): | |||
| 57 | def filedeprunner(arg): | 57 | def 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)) |
