path: root/meta/lib/oe/package.py
diff options
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-13 22:46:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:19:02 +0000
commit806e37264d7102ae982867350ad8363ed3e5f475 (patch)
tree6c46a603306d04432da44185e5df9c73f24cf009 /meta/lib/oe/package.py
parent4837b8cc3248c07f77a91745b80e6129ec3dfa1f (diff)
package: Fix various rpmdeps relocation issues
There are several issues with rpmdeps after the rpm v5 -> v4 transition: * _rpmfc_magic_path is an invalid option for rpm4 * --rpmpopt is an invalid option for rpm4 * we need to use the path to rpmrc since otherwise it poitns at the original build path * we need to set MAGIC in the environment so libmagic can find its files. This patch addresses those and ensures rpmdeps works in relocated builds from sstate (or with rm_work). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package.py')
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):
def filedeprunner(arg):
import re, subprocess, shlex
- (pkg, pkgfiles, rpmdeps, pkgdest) = arg
+ (pkg, pkgfiles, rpmdeps, pkgdest, magic) = arg
provides = {}
requires = {}
@@ -90,8 +90,11 @@ def filedeprunner(arg):
return provides, requires
+ env = os.environ.copy()
+ env["MAGIC"] = magic
- dep_popen = subprocess.Popen(shlex.split(rpmdeps) + pkgfiles, stdout=subprocess.PIPE)
+ dep_popen = subprocess.Popen(shlex.split(rpmdeps) + pkgfiles, stdout=subprocess.PIPE, env=env)
provides, requires = process_deps(dep_popen.stdout, pkg, pkgdest, provides, requires)
except OSError as e:
bb.error("rpmdeps: '%s' command failed, '%s'" % (shlex.split(rpmdeps) + pkgfiles, e))