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 = "\ | |||
21 | # optional boost-python library | 21 | # optional boost-python library |
22 | PACKAGECONFIG ??= "" | 22 | PACKAGECONFIG ??= "" |
23 | PACKAGECONFIG[python] = ",,python" | 23 | PACKAGECONFIG[python] = ",,python" |
24 | BOOST_LIBS += "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" | 24 | BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" |
25 | inherit python-dir | 25 | inherit python-dir |
26 | PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" | 26 | PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" |
27 | 27 | ||
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 | |||
19 | 19 | ||
20 | S = "${WORKDIR}/ConsoleKit-${PV}" | 20 | S = "${WORKDIR}/ConsoleKit-${PV}" |
21 | 21 | ||
22 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 22 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ |
23 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
24 | 24 | ||
25 | PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" | 25 | PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" |
26 | # No option to turn it on or off, so rely on the build dependency for now. | 26 | # 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" | |||
37 | RDEPENDS_pam-plugin-ck-connector += "${PN}" | 37 | RDEPENDS_pam-plugin-ck-connector += "${PN}" |
38 | 38 | ||
39 | do_install_append() { | 39 | do_install_append() { |
40 | if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
41 | install -d ${D}${sysconfdir}/tmpfiles.d | 41 | install -d ${D}${sysconfdir}/tmpfiles.d |
42 | echo "d ${localstatedir}/log/ConsoleKit - - - -" \ | 42 | echo "d ${localstatedir}/log/ConsoleKit - - - -" \ |
43 | > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf | 43 | > ${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" | |||
6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" | 6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" |
7 | 7 | ||
8 | DEPENDS = "attr perl-native-runtime" | 8 | DEPENDS = "attr perl-native-runtime" |
9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 9 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
10 | # attr and pam are disabled by EXTRA_OEMAKE_class-native | 10 | # attr and pam are disabled by EXTRA_OEMAKE_class-native |
11 | DEPENDS_class-native = "perl-native-runtime" | 11 | DEPENDS_class-native = "perl-native-runtime" |
12 | 12 | ||
@@ -31,7 +31,7 @@ do_configure() { | |||
31 | 31 | ||
32 | EXTRA_OEMAKE = " \ | 32 | EXTRA_OEMAKE = " \ |
33 | LIBATTR=yes \ | 33 | LIBATTR=yes \ |
34 | PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ | 34 | PAM_CAP=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ |
35 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ | 35 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ |
36 | lib=${@os.path.basename('${libdir}')} \ | 36 | lib=${@os.path.basename('${libdir}')} \ |
37 | " | 37 | " |
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() { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | python() { | 31 | python() { |
32 | if base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or base_contains("DISTRO_FEATURES", "x11", "x", "", d) == "": | 32 | if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": |
33 | d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) | 33 | d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) |
34 | d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) | 34 | d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) |
35 | } | 35 | } |