diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f95fdf7251..77b3b4a219 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -418,7 +418,7 @@ python package_do_split_locales() { | |||
418 | # glibc-localedata-translit* won't install as a dependency | 418 | # glibc-localedata-translit* won't install as a dependency |
419 | # for some other package which breaks meta-toolchain | 419 | # for some other package which breaks meta-toolchain |
420 | # Probably breaks since virtual-locale- isn't provided anywhere | 420 | # Probably breaks since virtual-locale- isn't provided anywhere |
421 | #rdep = (d.getVar('RDEPENDS_%s' % pn, True) or d.getVar('RDEPENDS', True) or "").split() | 421 | #rdep = (d.getVar('RDEPENDS_%s' % pn, True) or "").split() |
422 | #rdep.append('%s-locale*' % pn) | 422 | #rdep.append('%s-locale*' % pn) |
423 | #d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep)) | 423 | #d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep)) |
424 | } | 424 | } |
@@ -901,7 +901,7 @@ python populate_packages () { | |||
901 | root = os.path.join(pkgdest, pkg) | 901 | root = os.path.join(pkgdest, pkg) |
902 | bb.utils.mkdirhier(root) | 902 | bb.utils.mkdirhier(root) |
903 | 903 | ||
904 | filesvar = d.getVar('FILES_%s' % pkg, True) or d.getVar('FILES', True) or "" | 904 | filesvar = d.getVar('FILES_%s' % pkg, True) or "" |
905 | if "//" in filesvar: | 905 | if "//" in filesvar: |
906 | bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg) | 906 | bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg) |
907 | filesvar.replace("//", "/") | 907 | filesvar.replace("//", "/") |
@@ -1023,7 +1023,7 @@ python package_fixsymlinks () { | |||
1023 | bb.note("%s contains dangling symlink to %s" % (pkg, l)) | 1023 | bb.note("%s contains dangling symlink to %s" % (pkg, l)) |
1024 | 1024 | ||
1025 | for pkg in newrdepends: | 1025 | for pkg in newrdepends: |
1026 | rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or d.getVar('RDEPENDS', True) or "") | 1026 | rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "") |
1027 | for p in newrdepends[pkg]: | 1027 | for p in newrdepends[pkg]: |
1028 | if p not in rdepends: | 1028 | if p not in rdepends: |
1029 | rdepends[p] = [] | 1029 | rdepends[p] = [] |
@@ -1408,7 +1408,7 @@ python package_do_shlibs() { | |||
1408 | fd.close() | 1408 | fd.close() |
1409 | if needs_ldconfig and use_ldconfig: | 1409 | if needs_ldconfig and use_ldconfig: |
1410 | bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) | 1410 | bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) |
1411 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) | 1411 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) |
1412 | if not postinst: | 1412 | if not postinst: |
1413 | postinst = '#!/bin/sh\n' | 1413 | postinst = '#!/bin/sh\n' |
1414 | postinst += d.getVar('ldconfig_postinst_fragment', True) | 1414 | postinst += d.getVar('ldconfig_postinst_fragment', True) |
@@ -1595,7 +1595,7 @@ python read_shlibdeps () { | |||
1595 | 1595 | ||
1596 | packages = d.getVar('PACKAGES', True).split() | 1596 | packages = d.getVar('PACKAGES', True).split() |
1597 | for pkg in packages: | 1597 | for pkg in packages: |
1598 | rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or d.getVar('RDEPENDS', True) or "") | 1598 | rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "") |
1599 | for dep in pkglibdeps[pkg]: | 1599 | for dep in pkglibdeps[pkg]: |
1600 | # Add the dep if it's not already there, or if no comparison is set | 1600 | # Add the dep if it's not already there, or if no comparison is set |
1601 | if dep not in rdepends: | 1601 | if dep not in rdepends: |
@@ -1627,7 +1627,7 @@ python package_depchains() { | |||
1627 | def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): | 1627 | def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): |
1628 | 1628 | ||
1629 | #bb.note('depends for %s is %s' % (base, depends)) | 1629 | #bb.note('depends for %s is %s' % (base, depends)) |
1630 | rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or d.getVar('RRECOMMENDS', True) or "") | 1630 | rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or "") |
1631 | 1631 | ||
1632 | for depend in depends: | 1632 | for depend in depends: |
1633 | if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): | 1633 | if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): |
@@ -1648,7 +1648,7 @@ python package_depchains() { | |||
1648 | def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): | 1648 | def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): |
1649 | 1649 | ||
1650 | #bb.note('rdepends for %s is %s' % (base, rdepends)) | 1650 | #bb.note('rdepends for %s is %s' % (base, rdepends)) |
1651 | rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or d.getVar('RRECOMMENDS', True) or "") | 1651 | rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg, True) or "") |
1652 | 1652 | ||
1653 | for depend in rdepends: | 1653 | for depend in rdepends: |
1654 | if depend.find('virtual-locale-') != -1: | 1654 | if depend.find('virtual-locale-') != -1: |
@@ -1675,9 +1675,6 @@ python package_depchains() { | |||
1675 | add_dep(depends, dep) | 1675 | add_dep(depends, dep) |
1676 | 1676 | ||
1677 | rdepends = [] | 1677 | rdepends = [] |
1678 | for dep in bb.utils.explode_deps(d.getVar('RDEPENDS', True) or ""): | ||
1679 | add_dep(rdepends, dep) | ||
1680 | |||
1681 | for pkg in packages.split(): | 1678 | for pkg in packages.split(): |
1682 | for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + pkg, True) or ""): | 1679 | for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + pkg, True) or ""): |
1683 | add_dep(rdepends, dep) | 1680 | add_dep(rdepends, dep) |
@@ -1727,7 +1724,7 @@ python package_depchains() { | |||
1727 | pkg_addrrecs(pkg, base, suffix, func, rdepends, d) | 1724 | pkg_addrrecs(pkg, base, suffix, func, rdepends, d) |
1728 | else: | 1725 | else: |
1729 | rdeps = [] | 1726 | rdeps = [] |
1730 | for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + base, True) or d.getVar('RDEPENDS', True) or ""): | 1727 | for dep in bb.utils.explode_deps(d.getVar('RDEPENDS_' + base, True) or ""): |
1731 | add_dep(rdeps, dep) | 1728 | add_dep(rdeps, dep) |
1732 | pkg_addrrecs(pkg, base, suffix, func, rdeps, d) | 1729 | pkg_addrrecs(pkg, base, suffix, func, rdeps, d) |
1733 | } | 1730 | } |