diff options
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4e6a22b2f8..2277877988 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -734,7 +734,7 @@ def explode_deps(s): | |||
734 | 734 | ||
735 | def packaged(pkg, d): | 735 | def packaged(pkg, d): |
736 | import os, bb | 736 | import os, bb |
737 | return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK) | 737 | return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK) |
738 | 738 | ||
739 | def read_pkgdatafile(fn): | 739 | def read_pkgdatafile(fn): |
740 | pkgdata = {} | 740 | pkgdata = {} |
@@ -760,23 +760,23 @@ def read_pkgdatafile(fn): | |||
760 | 760 | ||
761 | def has_subpkgdata(pkg, d): | 761 | def has_subpkgdata(pkg, d): |
762 | import bb, os | 762 | import bb, os |
763 | fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) | 763 | fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) |
764 | return os.access(fn, os.R_OK) | 764 | return os.access(fn, os.R_OK) |
765 | 765 | ||
766 | def read_subpkgdata(pkg, d): | 766 | def read_subpkgdata(pkg, d): |
767 | import bb, os | 767 | import bb, os |
768 | fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) | 768 | fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) |
769 | return read_pkgdatafile(fn) | 769 | return read_pkgdatafile(fn) |
770 | 770 | ||
771 | 771 | ||
772 | def has_pkgdata(pn, d): | 772 | def has_pkgdata(pn, d): |
773 | import bb, os | 773 | import bb, os |
774 | fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) | 774 | fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) |
775 | return os.access(fn, os.R_OK) | 775 | return os.access(fn, os.R_OK) |
776 | 776 | ||
777 | def read_pkgdata(pn, d): | 777 | def read_pkgdata(pn, d): |
778 | import bb, os | 778 | import bb, os |
779 | fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) | 779 | fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) |
780 | return read_pkgdatafile(fn) | 780 | return read_pkgdatafile(fn) |
781 | 781 | ||
782 | python read_subpackage_metadata () { | 782 | python read_subpackage_metadata () { |