diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 282315567f..df870142f1 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -2,6 +2,8 @@ | |||
2 | # General packaging help functions | 2 | # General packaging help functions |
3 | # | 3 | # |
4 | 4 | ||
5 | inherit packagedata | ||
6 | |||
5 | PKGDEST = "${WORKDIR}/install" | 7 | PKGDEST = "${WORKDIR}/install" |
6 | 8 | ||
7 | def legitimize_package_name(s): | 9 | def legitimize_package_name(s): |
@@ -208,7 +210,7 @@ def runtime_mapping_rename (varname, d): | |||
208 | #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1))) | 210 | #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1))) |
209 | 211 | ||
210 | new_depends = [] | 212 | new_depends = [] |
211 | for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""): | 213 | for depend in bb.utils.explode_deps(bb.data.getVar(varname, d, 1) or ""): |
212 | # Have to be careful with any version component of the depend | 214 | # Have to be careful with any version component of the depend |
213 | split_depend = depend.split(' (') | 215 | split_depend = depend.split(' (') |
214 | new_depend = get_package_mapping(split_depend[0].strip(), d) | 216 | new_depend = get_package_mapping(split_depend[0].strip(), d) |
@@ -438,7 +440,7 @@ python populate_packages () { | |||
438 | dangling_links[pkg].append(os.path.normpath(target)) | 440 | dangling_links[pkg].append(os.path.normpath(target)) |
439 | 441 | ||
440 | for pkg in package_list: | 442 | for pkg in package_list: |
441 | rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "") | 443 | rdepends = bb.utils.explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "") |
442 | for l in dangling_links[pkg]: | 444 | for l in dangling_links[pkg]: |
443 | found = False | 445 | found = False |
444 | bb.debug(1, "%s contains dangling link %s" % (pkg, l)) | 446 | bb.debug(1, "%s contains dangling link %s" % (pkg, l)) |
@@ -868,7 +870,7 @@ python package_do_pkgconfig () { | |||
868 | python read_shlibdeps () { | 870 | python read_shlibdeps () { |
869 | packages = bb.data.getVar('PACKAGES', d, 1).split() | 871 | packages = bb.data.getVar('PACKAGES', d, 1).split() |
870 | for pkg in packages: | 872 | for pkg in packages: |
871 | rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") | 873 | rdepends = bb.utils.explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") |
872 | for extension in ".shlibdeps", ".pcdeps", ".clilibdeps": | 874 | for extension in ".shlibdeps", ".pcdeps", ".clilibdeps": |
873 | depsfile = bb.data.expand("${PKGDEST}/" + pkg + extension, d) | 875 | depsfile = bb.data.expand("${PKGDEST}/" + pkg + extension, d) |
874 | if os.access(depsfile, os.R_OK): | 876 | if os.access(depsfile, os.R_OK): |
@@ -901,7 +903,7 @@ python package_depchains() { | |||
901 | def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): | 903 | def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): |
902 | 904 | ||
903 | #bb.note('depends for %s is %s' % (base, depends)) | 905 | #bb.note('depends for %s is %s' % (base, depends)) |
904 | rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") | 906 | rreclist = bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") |
905 | 907 | ||
906 | for depend in depends: | 908 | for depend in depends: |
907 | if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): | 909 | if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): |
@@ -922,7 +924,7 @@ python package_depchains() { | |||
922 | def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): | 924 | def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): |
923 | 925 | ||
924 | #bb.note('rdepends for %s is %s' % (base, rdepends)) | 926 | #bb.note('rdepends for %s is %s' % (base, rdepends)) |
925 | rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") | 927 | rreclist = bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") |
926 | 928 | ||
927 | for depend in rdepends: | 929 | for depend in rdepends: |
928 | if depend.find('virtual-locale-') != -1: | 930 | if depend.find('virtual-locale-') != -1: |
@@ -946,15 +948,15 @@ python package_depchains() { | |||
946 | list.append(dep) | 948 | list.append(dep) |
947 | 949 | ||
948 | depends = [] | 950 | depends = [] |
949 | for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""): | 951 | for dep in bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""): |
950 | add_dep(depends, dep) | 952 | add_dep(depends, dep) |
951 | 953 | ||
952 | rdepends = [] | 954 | rdepends = [] |
953 | for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""): | 955 | for dep in bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""): |
954 | add_dep(rdepends, dep) | 956 | add_dep(rdepends, dep) |
955 | 957 | ||
956 | for pkg in packages.split(): | 958 | for pkg in packages.split(): |
957 | for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""): | 959 | for dep in bb.utils.explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""): |
958 | add_dep(rdepends, dep) | 960 | add_dep(rdepends, dep) |
959 | 961 | ||
960 | #bb.note('rdepends is %s' % rdepends) | 962 | #bb.note('rdepends is %s' % rdepends) |
@@ -987,7 +989,7 @@ python package_depchains() { | |||
987 | pkg_addrrecs(pkg, base, suffix, func, rdepends, d) | 989 | pkg_addrrecs(pkg, base, suffix, func, rdepends, d) |
988 | else: | 990 | else: |
989 | rdeps = [] | 991 | rdeps = [] |
990 | for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""): | 992 | for dep in bb.utils.explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""): |
991 | add_dep(rdeps, dep) | 993 | add_dep(rdeps, dep) |
992 | pkg_addrrecs(pkg, base, suffix, func, rdeps, d) | 994 | pkg_addrrecs(pkg, base, suffix, func, rdeps, d) |
993 | } | 995 | } |