From 21f10c11f39020f9502d741c774a12d1aeb39499 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Apr 2016 20:48:49 +0100 Subject: meta-oe: use bb.utils.contains() instead of base_contains() base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains(). Signed-off-by: Ross Burton Signed-off-by: Martin Jansa --- meta-oe/recipes-support/emacs/emacs.inc | 4 ++-- meta-oe/recipes-support/espeak/espeak_1.37.bb | 2 +- meta-oe/recipes-support/fftw/fftwf_3.3.4.bb | 2 +- meta-oe/recipes-support/gradm/gradm_3.1.bb | 4 ++-- meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb | 6 +++--- meta-oe/recipes-support/libee/libee.inc | 2 +- meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb | 2 +- meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb | 2 +- meta-oe/recipes-support/lvm2/lvm2.inc | 4 ++-- meta-oe/recipes-support/openct/openct_0.6.20.bb | 4 ++-- meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb | 4 ++-- meta-oe/recipes-support/postgresql/postgresql.inc | 2 +- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 6 +++--- meta-oe/recipes-support/udisks/udisks2_2.1.5.bb | 2 +- meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 2 +- meta-oe/recipes-support/vim/vim_7.4.769.bb | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index e706b18c95..ffb5c50c70 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc @@ -18,7 +18,7 @@ X11DEPENDS = " \ EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" @@ -86,7 +86,7 @@ do_compile_prepend() { ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ - if [ ! -z "${@base_contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then + if [ ! -z "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then echo "X11 build enabled" # copy only as much stuff as we need # before: 5.5G ../../qemu-treedir/ diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb index cf05d2645b..273fe340e3 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb @@ -1,7 +1,7 @@ require espeak.inc inherit siteinfo -EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}' +EXTRA_PHONEMES = '${@bb.utils.contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}' RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}" SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb index 7a4fbac8c1..4a659867d5 100644 --- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb @@ -4,7 +4,7 @@ require fftw.inc EXCLUDE_FROM_WORLD = "1" EXTRA_OECONF += "--enable-single \ - ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ " SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3" diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1.bb index fe36fba58a..252b19de2d 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://grsecurity.net/index.php" SECTION = "admin" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" -DEPENDS = "flex-native bison-native ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ file://0001-Makefile-remove-strip.patch" @@ -26,7 +26,7 @@ do_compile() { 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ 'BISON=${STAGING_BINDIR_NATIVE}/bison' \ - ${@base_contains('DISTRO_FEATURES', 'pam', ' ', 'nopam', d)} + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', ' ', 'nopam', d)} } do_install() { diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 26638c3b9a..f47377500a 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -22,9 +22,9 @@ EXTRA_OECONF = "\ --disable-lynx \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','alsa','alsa','',d)} \ - ${@base_contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \ - ${@base_contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','alsa','alsa','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index 5b552ca2a6..256fa053be 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc @@ -18,7 +18,7 @@ inherit autotools ptest pkgconfig DEPENDS += "libestr" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb index e3c833bf40..a4a0f3883e 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb @@ -16,7 +16,7 @@ EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../ --disable- PACKAGECONFIG ?= "curl" PACKAGECONFIG_append_class-target = "\ - ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ " PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb index 62ea13176d..857a57be5e 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb @@ -55,7 +55,7 @@ do_install() { install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord # Insall sensord service script - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system fi diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index a8d44daea3..3a5e1c46aa 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -17,7 +17,7 @@ S = "${WORKDIR}/LVM2.${PV}" inherit autotools-brokensep pkgconfig systemd -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" @@ -43,7 +43,7 @@ do_install_append() { # Install machine specific configuration file install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then oe_runmake 'DESTDIR=${D}' install install_systemd_units sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service else diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 3197845507..bf1ff570b3 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} SYSTEMD_SERVICE_${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" @@ -73,7 +73,7 @@ do_install () { install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system fi diff --git a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb index 1b186329ce..ed8ef267c8 100644 --- a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb +++ b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb @@ -64,7 +64,7 @@ do_install() { # fix up hardcoded paths sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/owcimomd.service ${D}/${systemd_unitdir}/system install -m 755 ${WORKDIR}/checkserverkey ${D}${sysconfdir}/openwbem/ @@ -93,7 +93,7 @@ do_install() { touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock} } -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} SYSTEMD_SERVICE_${PN} = "owcimomd.service" SYSTEMD_AUTO_ENABLE = "disable" FILES_${PN} += " \ diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 806c63873d..288a2d183d 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc @@ -55,7 +55,7 @@ pkg_postinst_${PN} () { fi } -enable_pam = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +enable_pam = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index ed41f01994..382dc5e30f 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -41,8 +41,8 @@ CONFIG_TLS = "--enable-thread-tls" CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" PACKAGECONFIG ??= "openssl \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," @@ -57,7 +57,7 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," do_configure_prepend() { - eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" + eval "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" } do_install_append() { diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb index 72db886877..f365cfaaf5 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" RDEPENDS_${PN} = "acl" diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index 8ddc20dabb..eec69333d3 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2" # optional dependencies: device-mapper parted -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" SRC_URI = " \ http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ diff --git a/meta-oe/recipes-support/vim/vim_7.4.769.bb b/meta-oe/recipes-support/vim/vim_7.4.769.bb index c257d90571..08e5027a8a 100644 --- a/meta-oe/recipes-support/vim/vim_7.4.769.bb +++ b/meta-oe/recipes-support/vim/vim_7.4.769.bb @@ -32,8 +32,8 @@ do_configure () { #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" -PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -- cgit 1.2.3-korg