summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 22:28:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 14:44:10 (GMT)
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/package.bbclass
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass114
1 files changed, 57 insertions, 57 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cf30f33..fb8e951 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -199,7 +199,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
199 packages = [pkg] + packages 199 packages = [pkg] + packages
200 else: 200 else:
201 packages.append(pkg) 201 packages.append(pkg)
202 oldfiles = d.getVar('FILES_' + pkg) 202 oldfiles = d.getVar('FILES:' + pkg)
203 newfile = os.path.join(root, o) 203 newfile = os.path.join(root, o)
204 # These names will be passed through glob() so if the filename actually 204 # These names will be passed through glob() so if the filename actually
205 # contains * or ? (rare, but possible) we need to handle that specially 205 # contains * or ? (rare, but possible) we need to handle that specially
@@ -219,19 +219,19 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
219 the_files.append(fp % m.group(1)) 219 the_files.append(fp % m.group(1))
220 else: 220 else:
221 the_files.append(aux_files_pattern_verbatim % m.group(1)) 221 the_files.append(aux_files_pattern_verbatim % m.group(1))
222 d.setVar('FILES_' + pkg, " ".join(the_files)) 222 d.setVar('FILES:' + pkg, " ".join(the_files))
223 else: 223 else:
224 d.setVar('FILES_' + pkg, oldfiles + " " + newfile) 224 d.setVar('FILES:' + pkg, oldfiles + " " + newfile)
225 if extra_depends != '': 225 if extra_depends != '':
226 d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends) 226 d.appendVar('RDEPENDS:' + pkg, ' ' + extra_depends)
227 if not d.getVar('DESCRIPTION_' + pkg): 227 if not d.getVar('DESCRIPTION:' + pkg):
228 d.setVar('DESCRIPTION_' + pkg, description % on) 228 d.setVar('DESCRIPTION:' + pkg, description % on)
229 if not d.getVar('SUMMARY_' + pkg): 229 if not d.getVar('SUMMARY:' + pkg):
230 d.setVar('SUMMARY_' + pkg, summary % on) 230 d.setVar('SUMMARY:' + pkg, summary % on)
231 if postinst: 231 if postinst:
232 d.setVar('pkg_postinst_' + pkg, postinst) 232 d.setVar('pkg_postinst:' + pkg, postinst)
233 if postrm: 233 if postrm:
234 d.setVar('pkg_postrm_' + pkg, postrm) 234 d.setVar('pkg_postrm:' + pkg, postrm)
235 if callable(hook): 235 if callable(hook):
236 hook(f, pkg, file_regex, output_pattern, m.group(1)) 236 hook(f, pkg, file_regex, output_pattern, m.group(1))
237 237
@@ -303,7 +303,7 @@ def get_conffiles(pkg, d):
303 cwd = os.getcwd() 303 cwd = os.getcwd()
304 os.chdir(root) 304 os.chdir(root)
305 305
306 conffiles = d.getVar('CONFFILES_%s' % pkg); 306 conffiles = d.getVar('CONFFILES:%s' % pkg);
307 if conffiles == None: 307 if conffiles == None:
308 conffiles = d.getVar('CONFFILES') 308 conffiles = d.getVar('CONFFILES')
309 if conffiles == None: 309 if conffiles == None:
@@ -618,7 +618,7 @@ def get_package_mapping (pkg, basepkg, d, depversions=None):
618 import oe.packagedata 618 import oe.packagedata
619 619
620 data = oe.packagedata.read_subpkgdata(pkg, d) 620 data = oe.packagedata.read_subpkgdata(pkg, d)
621 key = "PKG_%s" % pkg 621 key = "PKG:%s" % pkg
622 622
623 if key in data: 623 if key in data:
624 # Have to avoid undoing the write_extra_pkgs(global_variants...) 624 # Have to avoid undoing the write_extra_pkgs(global_variants...)
@@ -627,7 +627,7 @@ def get_package_mapping (pkg, basepkg, d, depversions=None):
627 return pkg 627 return pkg
628 if depversions == []: 628 if depversions == []:
629 # Avoid returning a mapping if the renamed package rprovides its original name 629 # Avoid returning a mapping if the renamed package rprovides its original name
630 rprovkey = "RPROVIDES_%s" % pkg 630 rprovkey = "RPROVIDES:%s" % pkg
631 if rprovkey in data: 631 if rprovkey in data:
632 if pkg in bb.utils.explode_dep_versions2(data[rprovkey]): 632 if pkg in bb.utils.explode_dep_versions2(data[rprovkey]):
633 bb.note("%s rprovides %s, not replacing the latter" % (data[key], pkg)) 633 bb.note("%s rprovides %s, not replacing the latter" % (data[key], pkg))
@@ -784,13 +784,13 @@ python package_do_split_locales() {
784 ln = legitimize_package_name(l) 784 ln = legitimize_package_name(l)
785 pkg = pn + '-locale-' + ln 785 pkg = pn + '-locale-' + ln
786 packages.append(pkg) 786 packages.append(pkg)
787 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) 787 d.setVar('FILES:' + pkg, os.path.join(datadir, 'locale', l))
788 d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) 788 d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
789 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) 789 d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
790 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) 790 d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l))
791 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) 791 d.setVar('DESCRIPTION:' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))
792 if locale_section: 792 if locale_section:
793 d.setVar('SECTION_' + pkg, locale_section) 793 d.setVar('SECTION:' + pkg, locale_section)
794 794
795 d.setVar('PACKAGES', ' '.join(packages)) 795 d.setVar('PACKAGES', ' '.join(packages))
796 796
@@ -800,9 +800,9 @@ python package_do_split_locales() {
800 # glibc-localedata-translit* won't install as a dependency 800 # glibc-localedata-translit* won't install as a dependency
801 # for some other package which breaks meta-toolchain 801 # for some other package which breaks meta-toolchain
802 # Probably breaks since virtual-locale- isn't provided anywhere 802 # Probably breaks since virtual-locale- isn't provided anywhere
803 #rdep = (d.getVar('RDEPENDS_%s' % pn) or "").split() 803 #rdep = (d.getVar('RDEPENDS:%s' % pn) or "").split()
804 #rdep.append('%s-locale*' % pn) 804 #rdep.append('%s-locale*' % pn)
805 #d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep)) 805 #d.setVar('RDEPENDS:%s' % pn, ' '.join(rdep))
806} 806}
807 807
808python perform_packagecopy () { 808python perform_packagecopy () {
@@ -1199,7 +1199,7 @@ python split_and_strip_files () {
1199 # ...but is it ELF, and is it already stripped? 1199 # ...but is it ELF, and is it already stripped?
1200 if elf_file & 1: 1200 if elf_file & 1:
1201 if elf_file & 2: 1201 if elf_file & 2:
1202 if 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split(): 1202 if 'already-stripped' in (d.getVar('INSANE_SKIP:' + pn) or "").split():
1203 bb.note("Skipping file %s from %s for already-stripped QA test" % (file[len(dvar):], pn)) 1203 bb.note("Skipping file %s from %s for already-stripped QA test" % (file[len(dvar):], pn))
1204 else: 1204 else:
1205 msg = "File '%s' from %s was already stripped, this will prevent future debugging!" % (file[len(dvar):], pn) 1205 msg = "File '%s' from %s was already stripped, this will prevent future debugging!" % (file[len(dvar):], pn)
@@ -1344,7 +1344,7 @@ python populate_packages () {
1344 src_package_name = ('%s-src' % d.getVar('PN')) 1344 src_package_name = ('%s-src' % d.getVar('PN'))
1345 if not src_package_name in packages: 1345 if not src_package_name in packages:
1346 packages.append(src_package_name) 1346 packages.append(src_package_name)
1347 d.setVar('FILES_%s' % src_package_name, '/usr/src/debug') 1347 d.setVar('FILES:%s' % src_package_name, '/usr/src/debug')
1348 1348
1349 # Sanity check PACKAGES for duplicates 1349 # Sanity check PACKAGES for duplicates
1350 # Sanity should be moved to sanity.bbclass once we have the infrastructure 1350 # Sanity should be moved to sanity.bbclass once we have the infrastructure
@@ -1387,7 +1387,7 @@ python populate_packages () {
1387 root = os.path.join(pkgdest, pkg) 1387 root = os.path.join(pkgdest, pkg)
1388 bb.utils.mkdirhier(root) 1388 bb.utils.mkdirhier(root)
1389 1389
1390 filesvar = d.getVar('FILES_%s' % pkg) or "" 1390 filesvar = d.getVar('FILES:%s' % pkg) or ""
1391 if "//" in filesvar: 1391 if "//" in filesvar:
1392 msg = "FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg 1392 msg = "FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg
1393 package_qa_handle_error("files-invalid", msg, d) 1393 package_qa_handle_error("files-invalid", msg, d)
@@ -1476,7 +1476,7 @@ python populate_packages () {
1476 1476
1477 if unshipped != []: 1477 if unshipped != []:
1478 msg = pn + ": Files/directories were installed but not shipped in any package:" 1478 msg = pn + ": Files/directories were installed but not shipped in any package:"
1479 if "installed-vs-shipped" in (d.getVar('INSANE_SKIP_' + pn) or "").split(): 1479 if "installed-vs-shipped" in (d.getVar('INSANE_SKIP:' + pn) or "").split():
1480 bb.note("Package %s skipping QA tests: installed-vs-shipped" % pn) 1480 bb.note("Package %s skipping QA tests: installed-vs-shipped" % pn)
1481 else: 1481 else:
1482 for f in unshipped: 1482 for f in unshipped:
@@ -1524,11 +1524,11 @@ python package_fixsymlinks () {
1524 bb.note("%s contains dangling symlink to %s" % (pkg, l)) 1524 bb.note("%s contains dangling symlink to %s" % (pkg, l))
1525 1525
1526 for pkg in newrdepends: 1526 for pkg in newrdepends:
1527 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg) or "") 1527 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS:' + pkg) or "")
1528 for p in newrdepends[pkg]: 1528 for p in newrdepends[pkg]:
1529 if p not in rdepends: 1529 if p not in rdepends:
1530 rdepends[p] = [] 1530 rdepends[p] = []
1531 d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) 1531 d.setVar('RDEPENDS:' + pkg, bb.utils.join_deps(rdepends, commasep=False))
1532} 1532}
1533 1533
1534 1534
@@ -1552,7 +1552,7 @@ python emit_pkgdata() {
1552 import json 1552 import json
1553 1553
1554 def process_postinst_on_target(pkg, mlprefix): 1554 def process_postinst_on_target(pkg, mlprefix):
1555 pkgval = d.getVar('PKG_%s' % pkg) 1555 pkgval = d.getVar('PKG:%s' % pkg)
1556 if pkgval is None: 1556 if pkgval is None:
1557 pkgval = pkg 1557 pkgval = pkg
1558 1558
@@ -1563,8 +1563,8 @@ if [ -n "$D" ]; then
1563fi 1563fi
1564""" % (pkgval, mlprefix) 1564""" % (pkgval, mlprefix)
1565 1565
1566 postinst = d.getVar('pkg_postinst_%s' % pkg) 1566 postinst = d.getVar('pkg_postinst:%s' % pkg)
1567 postinst_ontarget = d.getVar('pkg_postinst_ontarget_%s' % pkg) 1567 postinst_ontarget = d.getVar('pkg_postinst_ontarget:%s' % pkg)
1568 1568
1569 if postinst_ontarget: 1569 if postinst_ontarget:
1570 bb.debug(1, 'adding deferred pkg_postinst_ontarget() to pkg_postinst() for %s' % pkg) 1570 bb.debug(1, 'adding deferred pkg_postinst_ontarget() to pkg_postinst() for %s' % pkg)
@@ -1572,11 +1572,11 @@ fi
1572 postinst = '#!/bin/sh\n' 1572 postinst = '#!/bin/sh\n'
1573 postinst += defer_fragment 1573 postinst += defer_fragment
1574 postinst += postinst_ontarget 1574 postinst += postinst_ontarget
1575 d.setVar('pkg_postinst_%s' % pkg, postinst) 1575 d.setVar('pkg_postinst:%s' % pkg, postinst)
1576 1576
1577 def add_set_e_to_scriptlets(pkg): 1577 def add_set_e_to_scriptlets(pkg):
1578 for scriptlet_name in ('pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm'): 1578 for scriptlet_name in ('pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm'):
1579 scriptlet = d.getVar('%s_%s' % (scriptlet_name, pkg)) 1579 scriptlet = d.getVar('%s:%s' % (scriptlet_name, pkg))
1580 if scriptlet: 1580 if scriptlet:
1581 scriptlet_split = scriptlet.split('\n') 1581 scriptlet_split = scriptlet.split('\n')
1582 if scriptlet_split[0].startswith("#!"): 1582 if scriptlet_split[0].startswith("#!"):
@@ -1591,9 +1591,9 @@ fi
1591 c = codecs.getencoder("unicode_escape") 1591 c = codecs.getencoder("unicode_escape")
1592 return c(str)[0].decode("latin1") 1592 return c(str)[0].decode("latin1")
1593 1593
1594 val = d.getVar('%s_%s' % (var, pkg)) 1594 val = d.getVar('%s:%s' % (var, pkg))
1595 if val: 1595 if val:
1596 f.write('%s_%s: %s\n' % (var, pkg, encode(val))) 1596 f.write('%s:%s: %s\n' % (var, pkg, encode(val)))
1597 return val 1597 return val
1598 val = d.getVar('%s' % (var)) 1598 val = d.getVar('%s' % (var))
1599 if val: 1599 if val:
@@ -1612,7 +1612,7 @@ fi
1612 ml_pkg = "%s-%s" % (variant, pkg) 1612 ml_pkg = "%s-%s" % (variant, pkg)
1613 subdata_file = "%s/runtime/%s" % (pkgdatadir, ml_pkg) 1613 subdata_file = "%s/runtime/%s" % (pkgdatadir, ml_pkg)
1614 with open(subdata_file, 'w') as fd: 1614 with open(subdata_file, 'w') as fd:
1615 fd.write("PKG_%s: %s" % (ml_pkg, pkg)) 1615 fd.write("PKG:%s: %s" % (ml_pkg, pkg))
1616 1616
1617 packages = d.getVar('PACKAGES') 1617 packages = d.getVar('PACKAGES')
1618 pkgdest = d.getVar('PKGDEST') 1618 pkgdest = d.getVar('PKGDEST')
@@ -1636,10 +1636,10 @@ fi
1636 workdir = d.getVar('WORKDIR') 1636 workdir = d.getVar('WORKDIR')
1637 1637
1638 for pkg in packages.split(): 1638 for pkg in packages.split():
1639 pkgval = d.getVar('PKG_%s' % pkg) 1639 pkgval = d.getVar('PKG:%s' % pkg)
1640 if pkgval is None: 1640 if pkgval is None:
1641 pkgval = pkg 1641 pkgval = pkg
1642 d.setVar('PKG_%s' % pkg, pkg) 1642 d.setVar('PKG:%s' % pkg, pkg)
1643 1643
1644 pkgdestpkg = os.path.join(pkgdest, pkg) 1644 pkgdestpkg = os.path.join(pkgdest, pkg)
1645 files = {} 1645 files = {}
@@ -1673,14 +1673,14 @@ fi
1673 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) 1673 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
1674 1674
1675 # Symlinks needed for rprovides lookup 1675 # Symlinks needed for rprovides lookup
1676 rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES') 1676 rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES')
1677 if rprov: 1677 if rprov:
1678 for p in bb.utils.explode_deps(rprov): 1678 for p in bb.utils.explode_deps(rprov):
1679 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg) 1679 subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg)
1680 bb.utils.mkdirhier(os.path.dirname(subdata_sym)) 1680 bb.utils.mkdirhier(os.path.dirname(subdata_sym))
1681 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True) 1681 oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True)
1682 1682
1683 allow_empty = d.getVar('ALLOW_EMPTY_%s' % pkg) 1683 allow_empty = d.getVar('ALLOW_EMPTY:%s' % pkg)
1684 if not allow_empty: 1684 if not allow_empty:
1685 allow_empty = d.getVar('ALLOW_EMPTY') 1685 allow_empty = d.getVar('ALLOW_EMPTY')
1686 root = "%s/%s" % (pkgdest, pkg) 1686 root = "%s/%s" % (pkgdest, pkg)
@@ -1733,7 +1733,7 @@ python package_do_filedeps() {
1733 1733
1734 pkglist = [] 1734 pkglist = []
1735 for pkg in packages.split(): 1735 for pkg in packages.split():
1736 if d.getVar('SKIP_FILEDEPS_' + pkg) == '1': 1736 if d.getVar('SKIP_FILEDEPS:' + pkg) == '1':
1737 continue 1737 continue
1738 if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') or pkg.endswith('-src'): 1738 if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') or pkg.endswith('-src'):
1739 continue 1739 continue
@@ -1930,12 +1930,12 @@ python package_do_shlibs() {
1930 shlib_provider = oe.package.read_shlib_providers(d) 1930 shlib_provider = oe.package.read_shlib_providers(d)
1931 1931
1932 for pkg in shlib_pkgs: 1932 for pkg in shlib_pkgs:
1933 private_libs = d.getVar('PRIVATE_LIBS_' + pkg) or d.getVar('PRIVATE_LIBS') or "" 1933 private_libs = d.getVar('PRIVATE_LIBS:' + pkg) or d.getVar('PRIVATE_LIBS') or ""
1934 private_libs = private_libs.split() 1934 private_libs = private_libs.split()
1935 needs_ldconfig = False 1935 needs_ldconfig = False
1936 bb.debug(2, "calculating shlib provides for %s" % pkg) 1936 bb.debug(2, "calculating shlib provides for %s" % pkg)
1937 1937
1938 pkgver = d.getVar('PKGV_' + pkg) 1938 pkgver = d.getVar('PKGV:' + pkg)
1939 if not pkgver: 1939 if not pkgver:
1940 pkgver = d.getVar('PV_' + pkg) 1940 pkgver = d.getVar('PV_' + pkg)
1941 if not pkgver: 1941 if not pkgver:
@@ -1985,11 +1985,11 @@ python package_do_shlibs() {
1985 shlib_provider[s[0]][s[1]] = (pkg, pkgver) 1985 shlib_provider[s[0]][s[1]] = (pkg, pkgver)
1986 if needs_ldconfig: 1986 if needs_ldconfig:
1987 bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) 1987 bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
1988 postinst = d.getVar('pkg_postinst_%s' % pkg) 1988 postinst = d.getVar('pkg_postinst:%s' % pkg)
1989 if not postinst: 1989 if not postinst:
1990 postinst = '#!/bin/sh\n' 1990 postinst = '#!/bin/sh\n'
1991 postinst += d.getVar('ldconfig_postinst_fragment') 1991 postinst += d.getVar('ldconfig_postinst_fragment')
1992 d.setVar('pkg_postinst_%s' % pkg, postinst) 1992 d.setVar('pkg_postinst:%s' % pkg, postinst)
1993 bb.debug(1, 'LIBNAMES: pkg %s sonames %s' % (pkg, sonames)) 1993 bb.debug(1, 'LIBNAMES: pkg %s sonames %s' % (pkg, sonames))
1994 1994
1995 assumed_libs = d.getVar('ASSUME_SHLIBS') 1995 assumed_libs = d.getVar('ASSUME_SHLIBS')
@@ -2011,7 +2011,7 @@ python package_do_shlibs() {
2011 for pkg in shlib_pkgs: 2011 for pkg in shlib_pkgs:
2012 bb.debug(2, "calculating shlib requirements for %s" % pkg) 2012 bb.debug(2, "calculating shlib requirements for %s" % pkg)
2013 2013
2014 private_libs = d.getVar('PRIVATE_LIBS_' + pkg) or d.getVar('PRIVATE_LIBS') or "" 2014 private_libs = d.getVar('PRIVATE_LIBS:' + pkg) or d.getVar('PRIVATE_LIBS') or ""
2015 private_libs = private_libs.split() 2015 private_libs = private_libs.split()
2016 2016
2017 deps = list() 2017 deps = list()
@@ -2165,7 +2165,7 @@ python read_shlibdeps () {
2165 2165
2166 packages = d.getVar('PACKAGES').split() 2166 packages = d.getVar('PACKAGES').split()
2167 for pkg in packages: 2167 for pkg in packages:
2168 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg) or "") 2168 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS:' + pkg) or "")
2169 for dep in sorted(pkglibdeps[pkg]): 2169 for dep in sorted(pkglibdeps[pkg]):
2170 # Add the dep if it's not already there, or if no comparison is set 2170 # Add the dep if it's not already there, or if no comparison is set
2171 if dep not in rdepends: 2171 if dep not in rdepends:
@@ -2173,7 +2173,7 @@ python read_shlibdeps () {
2173 for v in pkglibdeps[pkg][dep]: 2173 for v in pkglibdeps[pkg][dep]:
2174 if v not in rdepends[dep]: 2174 if v not in rdepends[dep]:
2175 rdepends[dep].append(v) 2175 rdepends[dep].append(v)
2176 d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) 2176 d.setVar('RDEPENDS:' + pkg, bb.utils.join_deps(rdepends, commasep=False))
2177} 2177}
2178 2178
2179python package_depchains() { 2179python package_depchains() {
@@ -2197,7 +2197,7 @@ python package_depchains() {
2197 def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): 2197 def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
2198 2198
2199 #bb.note('depends for %s is %s' % (base, depends)) 2199 #bb.note('depends for %s is %s' % (base, depends))
2200 rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") 2200 rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS:' + pkg) or "")
2201 2201
2202 for depend in sorted(depends): 2202 for depend in sorted(depends):
2203 if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): 2203 if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
@@ -2212,13 +2212,13 @@ python package_depchains() {
2212 if pkgname not in rreclist and pkgname != pkg: 2212 if pkgname not in rreclist and pkgname != pkg:
2213 rreclist[pkgname] = [] 2213 rreclist[pkgname] = []
2214 2214
2215 #bb.note('setting: RRECOMMENDS_%s=%s' % (pkg, ' '.join(rreclist))) 2215 #bb.note('setting: RRECOMMENDS:%s=%s' % (pkg, ' '.join(rreclist)))
2216 d.setVar('RRECOMMENDS_%s' % pkg, bb.utils.join_deps(rreclist, commasep=False)) 2216 d.setVar('RRECOMMENDS:%s' % pkg, bb.utils.join_deps(rreclist, commasep=False))
2217 2217
2218 def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): 2218 def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
2219 2219
2220 #bb.note('rdepends for %s is %s' % (base, rdepends)) 2220 #bb.note('rdepends for %s is %s' % (base, rdepends))
2221 rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") 2221 rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS:' + pkg) or "")
2222 2222
2223 for depend in sorted(rdepends): 2223 for depend in sorted(rdepends):
2224 if depend.find('virtual-locale-') != -1: 2224 if depend.find('virtual-locale-') != -1:
@@ -2233,8 +2233,8 @@ python package_depchains() {
2233 if pkgname not in rreclist and pkgname != pkg: 2233 if pkgname not in rreclist and pkgname != pkg:
2234 rreclist[pkgname] = [] 2234 rreclist[pkgname] = []
2235 2235
2236 #bb.note('setting: RRECOMMENDS_%s=%s' % (pkg, ' '.join(rreclist))) 2236 #bb.note('setting: RRECOMMENDS:%s=%s' % (pkg, ' '.join(rreclist)))
2237 d.setVar('RRECOMMENDS_%s' % pkg, bb.utils.join_deps(rreclist, commasep=False)) 2237 d.setVar('RRECOMMENDS:%s' % pkg, bb.utils.join_deps(rreclist, commasep=False))
2238 2238
2239 def add_dep(list, dep): 2239 def add_dep(list, dep):
2240 if dep not in list: 2240 if dep not in list:
@@ -2246,7 +2246,7 @@ python package_depchains() {
2246 2246
2247 rdepends = [] 2247 rdepends = []
2248 for pkg in packages.split(): 2248 for pkg in packages.split():
2249 for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + pkg) or ""): 2249 for dep in bb.utils.explode_deps(d.getVar('RDEPENDS:' + pkg) or ""):
2250 add_dep(rdepends, dep) 2250 add_dep(rdepends, dep)
2251 2251
2252 #bb.note('rdepends is %s' % rdepends) 2252 #bb.note('rdepends is %s' % rdepends)
@@ -2280,7 +2280,7 @@ python package_depchains() {
2280 2280
2281 for suffix in pkgs: 2281 for suffix in pkgs:
2282 for pkg in pkgs[suffix]: 2282 for pkg in pkgs[suffix]:
2283 if d.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs'): 2283 if d.getVarFlag('RRECOMMENDS:' + pkg, 'nodeprrecs'):
2284 continue 2284 continue
2285 (base, func) = pkgs[suffix][pkg] 2285 (base, func) = pkgs[suffix][pkg]
2286 if suffix == "-dev": 2286 if suffix == "-dev":
@@ -2293,7 +2293,7 @@ python package_depchains() {
2293 pkg_addrrecs(pkg, base, suffix, func, rdepends, d) 2293 pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
2294 else: 2294 else:
2295 rdeps = [] 2295 rdeps = []
2296 for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + base) or ""): 2296 for dep in bb.utils.explode_deps(d.getVar('RDEPENDS:' + base) or ""):
2297 add_dep(rdeps, dep) 2297 add_dep(rdeps, dep)
2298 pkg_addrrecs(pkg, base, suffix, func, rdeps, d) 2298 pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
2299} 2299}
@@ -2310,7 +2310,7 @@ def gen_packagevar(d, pkgvars="PACKAGEVARS"):
2310 ret.append(v) 2310 ret.append(v)
2311 for p in pkgs: 2311 for p in pkgs:
2312 for v in vars: 2312 for v in vars:
2313 ret.append(v + "_" + p) 2313 ret.append(v + ":" + p)
2314 2314
2315 # Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for 2315 # Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for
2316 # affected recipes. 2316 # affected recipes.