summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2021-08-12 23:00:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-13 21:43:56 (GMT)
commitddd4b8c9a1bf590f784ba5ced84fb1fef198cd10 (patch)
treeaffee78b06d229b8c5d13f8091f495a5fbeb3930 /meta/classes/package.bbclass
parent49ae4a23d8a9e0f8327fb009872429622761f0d1 (diff)
downloadpoky-ddd4b8c9a1bf590f784ba5ced84fb1fef198cd10.tar.gz
package.bbclass: FILER* override syntax
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>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a659a1e..a9138ff 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1663,12 +1663,12 @@ fi
1663 val = write_if_exists(sf, pkg, var) 1663 val = write_if_exists(sf, pkg, var)
1664 1664
1665 write_if_exists(sf, pkg, 'FILERPROVIDESFLIST') 1665 write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
1666 for dfile in (d.getVar('FILERPROVIDESFLIST_' + pkg) or "").split(): 1666 for dfile in (d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split():
1667 write_if_exists(sf, pkg, 'FILERPROVIDES_' + dfile) 1667 write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile)
1668 1668
1669 write_if_exists(sf, pkg, 'FILERDEPENDSFLIST') 1669 write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
1670 for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg) or "").split(): 1670 for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split():
1671 write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile) 1671 write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile)
1672 1672
1673 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) 1673 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
1674 1674
@@ -1714,11 +1714,11 @@ RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provi
1714 1714
1715# Collect perfile run-time dependency metadata 1715# Collect perfile run-time dependency metadata
1716# Output: 1716# Output:
1717# FILERPROVIDESFLIST_pkg - list of all files w/ deps 1717# FILERPROVIDESFLIST:pkg - list of all files w/ deps
1718# FILERPROVIDES_filepath_pkg - per file dep 1718# FILERPROVIDES:filepath:pkg - per file dep
1719# 1719#
1720# FILERDEPENDSFLIST_pkg - list of all files w/ deps 1720# FILERDEPENDSFLIST:pkg - list of all files w/ deps
1721# FILERDEPENDS_filepath_pkg - per file dep 1721# FILERDEPENDS:filepath:pkg - per file dep
1722 1722
1723python package_do_filedeps() { 1723python package_do_filedeps() {
1724 if d.getVar('SKIP_FILEDEPS') == '1': 1724 if d.getVar('SKIP_FILEDEPS') == '1':
@@ -1755,18 +1755,18 @@ python package_do_filedeps() {
1755 1755
1756 for file in sorted(provides): 1756 for file in sorted(provides):
1757 provides_files[pkg].append(file) 1757 provides_files[pkg].append(file)
1758 key = "FILERPROVIDES_" + file + "_" + pkg 1758 key = "FILERPROVIDES:" + file + ":" + pkg
1759 d.appendVar(key, " " + " ".join(provides[file])) 1759 d.appendVar(key, " " + " ".join(provides[file]))
1760 1760
1761 for file in sorted(requires): 1761 for file in sorted(requires):
1762 requires_files[pkg].append(file) 1762 requires_files[pkg].append(file)
1763 key = "FILERDEPENDS_" + file + "_" + pkg 1763 key = "FILERDEPENDS:" + file + ":" + pkg
1764 d.appendVar(key, " " + " ".join(requires[file])) 1764 d.appendVar(key, " " + " ".join(requires[file]))
1765 1765
1766 for pkg in requires_files: 1766 for pkg in requires_files:
1767 d.setVar("FILERDEPENDSFLIST_" + pkg, " ".join(requires_files[pkg])) 1767 d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(requires_files[pkg]))
1768 for pkg in provides_files: 1768 for pkg in provides_files:
1769 d.setVar("FILERPROVIDESFLIST_" + pkg, " ".join(provides_files[pkg])) 1769 d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(provides_files[pkg]))
1770} 1770}
1771 1771
1772SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2" 1772SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2"