mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
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). (From OE-Core rev: 806e37264d7102ae982867350ad8363ed3e5f475) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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
|
||||
|
||||
try:
|
||||
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))
|
||||
|
||||
Reference in New Issue
Block a user