diff options
Diffstat (limited to 'meta/lib/oe/packagedata.py')
-rw-r--r-- | meta/lib/oe/packagedata.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index 918e7ad2cc..a7a40f0d06 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py | |||
@@ -26,15 +26,15 @@ def read_pkgdatafile(fn): | |||
26 | return pkgdata | 26 | return pkgdata |
27 | 27 | ||
28 | def get_subpkgedata_fn(pkg, d): | 28 | def get_subpkgedata_fn(pkg, d): |
29 | archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") | 29 | archs = d.expand("${PACKAGE_ARCHS}").split(" ") |
30 | archs.reverse() | 30 | archs.reverse() |
31 | pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d) | 31 | pkgdata = d.expand('${TMPDIR}/pkgdata/') |
32 | targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) | 32 | targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/') |
33 | for arch in archs: | 33 | for arch in archs: |
34 | fn = pkgdata + arch + targetdir + pkg | 34 | fn = pkgdata + arch + targetdir + pkg |
35 | if os.path.exists(fn): | 35 | if os.path.exists(fn): |
36 | return fn | 36 | return fn |
37 | return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) | 37 | return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg) |
38 | 38 | ||
39 | def has_subpkgdata(pkg, d): | 39 | def has_subpkgdata(pkg, d): |
40 | return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) | 40 | return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) |
@@ -43,11 +43,11 @@ def read_subpkgdata(pkg, d): | |||
43 | return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) | 43 | return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) |
44 | 44 | ||
45 | def has_pkgdata(pn, d): | 45 | def has_pkgdata(pn, d): |
46 | fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) | 46 | fn = d.expand('${PKGDATA_DIR}/%s' % pn) |
47 | return os.access(fn, os.R_OK) | 47 | return os.access(fn, os.R_OK) |
48 | 48 | ||
49 | def read_pkgdata(pn, d): | 49 | def read_pkgdata(pn, d): |
50 | fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) | 50 | fn = d.expand('${PKGDATA_DIR}/%s' % pn) |
51 | return read_pkgdatafile(fn) | 51 | return read_pkgdatafile(fn) |
52 | 52 | ||
53 | # | 53 | # |