diff options
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python-imaging_1.1.7.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python.inc | 2 |
3 files changed, 9 insertions, 9 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 do_compile() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} - export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} + export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} distutils_do_compile } do_install() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} - export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} + export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} distutils_do_install install -d ${D}${datadir}/doc/${BPN}/html/ install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb index 464c5c5571..09715794b3 100644 --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb @@ -85,16 +85,16 @@ do_install_append() { # Disable zypper channel support rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py* - if [ -z "${@base_contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py* rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm fi - if [ -z "${@base_contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4 fi - if [ -z "${@base_contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk fi } @@ -115,9 +115,9 @@ do_install_append_class-nativesdk() { } PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \ - ${@base_contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \ ${PN}-interface-images ${PN}" RDEPENDS_smartpm = "${PN}" diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 90079a29c8..19942baeb0 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -25,7 +25,7 @@ EXTRA_OECONF = "\ --without-cxx-main \ --with-signal-module \ --enable-shared \ - --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ + --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \ ${PYTHONLSBOPTS} \ " |