diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-devtools/python/python-imaging_1.1.7.bb | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-imaging_1.1.7.bb')
-rw-r--r-- | meta/recipes-devtools/python/python-imaging_1.1.7.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb index ed8cfcc212..a678328275 100644 --- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb +++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb | |||
@@ -25,14 +25,14 @@ inherit distutils | |||
25 | do_compile() { | 25 | do_compile() { |
26 | export STAGING_LIBDIR=${STAGING_LIBDIR} | 26 | export STAGING_LIBDIR=${STAGING_LIBDIR} |
27 | export STAGING_INCDIR=${STAGING_INCDIR} | 27 | export STAGING_INCDIR=${STAGING_INCDIR} |
28 | export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} | 28 | export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} |
29 | distutils_do_compile | 29 | distutils_do_compile |
30 | } | 30 | } |
31 | 31 | ||
32 | do_install() { | 32 | do_install() { |
33 | export STAGING_LIBDIR=${STAGING_LIBDIR} | 33 | export STAGING_LIBDIR=${STAGING_LIBDIR} |
34 | export STAGING_INCDIR=${STAGING_INCDIR} | 34 | export STAGING_INCDIR=${STAGING_INCDIR} |
35 | export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} | 35 | export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} |
36 | distutils_do_install | 36 | distutils_do_install |
37 | install -d ${D}${datadir}/doc/${BPN}/html/ | 37 | install -d ${D}${datadir}/doc/${BPN}/html/ |
38 | install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ | 38 | install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ |