diff options
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.6.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/libproxy/libproxy_0.4.11.bb | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 356ca22f4a..0a44d79746 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -21,7 +21,7 @@ BOOST_LIBS = "\ # optional boost-python library PACKAGECONFIG ??= "" PACKAGECONFIG[python] = ",,python" -BOOST_LIBS += "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" +BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" inherit python-dir PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index c97b4498f7..98516166cf 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -19,8 +19,8 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464 S = "${WORKDIR}/ConsoleKit-${PV}" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" # No option to turn it on or off, so rely on the build dependency for now. @@ -37,7 +37,7 @@ FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" RDEPENDS_pam-plugin-ck-connector += "${PN}" do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/ConsoleKit - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index fef700a629..08f4cfedde 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -6,7 +6,7 @@ LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" DEPENDS = "attr perl-native-runtime" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" # attr and pam are disabled by EXTRA_OEMAKE_class-native DEPENDS_class-native = "perl-native-runtime" @@ -31,7 +31,7 @@ do_configure() { EXTRA_OEMAKE = " \ LIBATTR=yes \ - PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ + PAM_CAP=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ lib=${@os.path.basename('${libdir}')} \ " diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb index aecb7b5a82..a53a197615 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb @@ -29,7 +29,7 @@ do_configure_prepend() { } python() { - if base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or base_contains("DISTRO_FEATURES", "x11", "x", "", d) == "": + if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) } |