mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

package.bbclass: Fix per-file dependency generation

Browse Source 
The overall file list was being constructed with the wrong variable, it
should have had FLIST in the name.

Also it was possible to construct the system with some illegal variable
names.  Names that would have include "[]".  So translate these away...

Finally fix an issues where a filename with an _ could cause a package
variable conflict.  Again translate this away..

Signed-off-by: Mark Hatle <mhatle@windriver.com>
This commit is contained in:
Mark Hatle
2010-08-23 09:12:54 -07:00
committed by Richard Purdie
parent e37ee51157
commit f29f9364a3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/classes/package.bbclass
View File

@@ -508,6 +508,7 @@ python emit_pkgdata() {
for pkg in packages.split():
subdata_file = pkgdatadir + "/runtime/%s" % pkg
sf = open(subdata_file, 'w')
write_if_exists(sf, pkg, 'PN')
write_if_exists(sf, pkg, 'PV')
@@ -580,22 +581,26 @@ python package_do_filedeps() {
def process_deps(pipe, pkg, varname):
dep_files = ""
for line in pipe:
key = "";
value = "";
key = ""
value = ""
# We expect two items on each line
# 1 - filepath
# 2 - dep list
line_list = line.split(None,1);
line_list = line.rstrip().split(None,1);
if len(line_list) <= 0 or len(line_list) > 2:
bb.error("deps list length error! " + len(line_list));
if len(line_list) == 2:
file = line_list[0];
value = line_list[1]
file = file.replace(pkgdest + "/" + pkg, "")
file = file.replace("@", "@at@")
file = file.replace("[", "@openbrace@")
file = file.replace("]", "@closebrace@")
file = file.replace("_", "@underscore@")
dep_files = dep_files + " " + file
key = "FILE" + varname + "_" + file + "_" + pkg
bb.data.setVar(key, value, d)
bb.data.setVar("FILE" + varname + "_" + pkg, dep_files, d)
bb.data.setVar("FILE" + varname + "FLIST_" + pkg, dep_files, d)
# Determine dependencies
for pkg in packages.split():