mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

package.bbclass: FILER* override syntax

Browse Source 
pkgdata no longer includes FILERPROVIDES* nor
FILERDEPENDS*. Fix with new override syntax.

Also apply to FILERPROVIDESLIST and FILERDEPENDSLIST.

(From OE-Core rev: 8f96a2d13bbae8fb70ed7feafdcff26544e3710d)

Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling
2021-08-12 16:00:04 -07:00
committed by Richard Purdie
parent 49ae4a23d8
commit ddd4b8c9a1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+12 -12
View File
@@ -1663,12 +1663,12 @@ fi
val = write_if_exists(sf, pkg, var) val = write_if_exists(sf, pkg, var)
write_if_exists(sf, pkg, 'FILERPROVIDESFLIST') write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
for dfile in (d.getVar('FILERPROVIDESFLIST_' + pkg) or "").split(): for dfile in (d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split():
write_if_exists(sf, pkg, 'FILERPROVIDES_' + dfile) write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile)
write_if_exists(sf, pkg, 'FILERDEPENDSFLIST') write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg) or "").split(): for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split():
write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile) write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile)
sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
@@ -1714,11 +1714,11 @@ RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provi
# Collect perfile run-time dependency metadata # Collect perfile run-time dependency metadata
# Output: # Output:
# FILERPROVIDESFLIST_pkg - list of all files w/ deps # FILERPROVIDESFLIST:pkg - list of all files w/ deps
# FILERPROVIDES_filepath_pkg - per file dep # FILERPROVIDES:filepath:pkg - per file dep
# #
# FILERDEPENDSFLIST_pkg - list of all files w/ deps # FILERDEPENDSFLIST:pkg - list of all files w/ deps
# FILERDEPENDS_filepath_pkg - per file dep # FILERDEPENDS:filepath:pkg - per file dep
python package_do_filedeps() { python package_do_filedeps() {
if d.getVar('SKIP_FILEDEPS') == '1': if d.getVar('SKIP_FILEDEPS') == '1':
@@ -1755,18 +1755,18 @@ python package_do_filedeps() {
for file in sorted(provides): for file in sorted(provides):
provides_files[pkg].append(file) provides_files[pkg].append(file)
key = "FILERPROVIDES_" + file + "_" + pkg key = "FILERPROVIDES:" + file + ":" + pkg
d.appendVar(key, " " + " ".join(provides[file])) d.appendVar(key, " " + " ".join(provides[file]))
for file in sorted(requires): for file in sorted(requires):
requires_files[pkg].append(file) requires_files[pkg].append(file)
key = "FILERDEPENDS_" + file + "_" + pkg key = "FILERDEPENDS:" + file + ":" + pkg
d.appendVar(key, " " + " ".join(requires[file])) d.appendVar(key, " " + " ".join(requires[file]))
for pkg in requires_files: for pkg in requires_files:
d.setVar("FILERDEPENDSFLIST_" + pkg, " ".join(requires_files[pkg])) d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(requires_files[pkg]))
for pkg in provides_files: for pkg in provides_files:
d.setVar("FILERPROVIDESFLIST_" + pkg, " ".join(provides_files[pkg])) d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(provides_files[pkg]))
} }
SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2" SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2"