meta-oe: use bb.utils.contains() instead of base_contains()
PATCH 1/8 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().
--- .../recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 2 +- meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +- meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | 2 +- meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb | 2 +- meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb | 2 +- meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb | 2 +- .../recipes-core/packagegroups/packagegroup-basic.bb | 10 +++++----- .../recipes-core/packagegroups/packagegroup-boot.bb | 2 +- meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 2 +- meta-oe/recipes-extended/corosync/corosync_2.3.5.bb | 2 +- meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 2 +- .../konkretcmpi/konkretcmpi-native_0.9.2.bb | 2 +- meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb | 2 +- .../openlmi/openlmi-providers_0.6.0.bb | 2 +- meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb | 4 ++-- meta-oe/recipes-extended/polkit/polkit_0.113.bb | 6 +++--- meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb | 4 ++-- meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb | 6 +++--- .../recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 6 +++--- .../smartmontools/smartmontools_6.4.bb | 4 ++-- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 14 +++++++------- meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb | 2 +- meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 18 +++++++++--------- meta-oe/recipes-graphics/slim/slim_1.3.2.bb | 4 ++-- .../terminus-font/terminus-font_4.38.bb | 8 ++++---- .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 2 +- meta-oe/recipes-kernel/ktap/ktap.inc | 4 ++-- meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 2 +- meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb | 2 +- meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | 4 ++-- 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 ++-- .../recipes-support/libcanberra/libcanberra_0.30.bb | 6 +++--- meta-oe/recipes-support/libee/libee.inc | 2 +- .../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 ++-- 46 files changed, 89 insertions(+), 89 deletions(-)
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +1 -1
@@ -37,7 +37,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" #The CUSTOM_LDSCRIPTS doesn't work with the gold linker do_configure() { - if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile fi
meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +1 -1
@@ -46,7 +46,7 @@ do_install () { echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ > ${D}${sysconfdir}/default/volatiles/99_lmbench - 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 /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf
meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" DEPENDS = "glib-2.0" X11DEPENDS = " libxpm gtk+" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb +1 -1
@@ -85,7 +85,7 @@ do_install_append() { mkdir -p ${D}/${sysconfdir}/default/volatiles echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ > ${D}${sysconfdir}/default/volatiles/87_krb5 - 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 /run/krb5kdc - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/krb5.conf
meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb +1 -1
@@ -39,7 +39,7 @@ inherit autotools pkgconfig lib_package EXTRA_OECONF += "--disable-rpath" PACKAGECONFIG ?= "\ - ${@base_contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \ " PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb +1 -1
@@ -60,7 +60,7 @@ do_configure_prepend() { } 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}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb +5 -5
@@ -42,12 +42,12 @@ RDEPENDS_${PN} = "\ # RRECOMMENDS_${PN} = "\ ${MACHINE_EXTRA_RRECOMMENDS} \ - ${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ \ tzdata \ \
meta-oe/recipes-core/packagegroups/packagegroup-boot.bb +1 -1
@@ -24,7 +24,7 @@ RDEPENDS_${PN} = "\ base-passwd \ busybox \ netbase \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ "
meta-oe/recipes-devtools/ltrace/ltrace_git.bb +1 -1
@@ -24,7 +24,7 @@ S = "${WORKDIR}/git" inherit autotools -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
meta-oe/recipes-extended/corosync/corosync_2.3.5.bb +1 -1
@@ -41,7 +41,7 @@ do_install_append() { install -m 0644 ${S}/init/corosync.in ${D}${sysconfdir}/init.d/corosync install -m 0644 ${S}/init/corosync-notifyd.in ${D}${sysconfdir}/init.d/corosync-notifyd - 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}/init/corosync.service.in ${D}${systemd_unitdir}/system/corosync.service install -m 0644 ${S}/init/corosync-notifyd.service.in ${D}${systemd_unitdir}/system/corosync-notifyd.service
meta-oe/recipes-extended/dlm/dlm_4.0.2.bb +1 -1
@@ -37,7 +37,7 @@ do_install_append (){ install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm # install systemd unit files - 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}/init/dlm.service ${D}${systemd_unitdir}/system fi
meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb +1 -1
@@ -16,7 +16,7 @@ SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769" S = "${WORKDIR}/git" inherit native cmake -LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb +1 -1
@@ -7,7 +7,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" -LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" +LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" do_install_append () { # binaries
meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb +1 -1
@@ -17,7 +17,7 @@ SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd" SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56" inherit cmake -LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" EXTRA_OECMAKE = " \ -DWITH-DEVASSISTANT=OFF \ -DWITH-JOURNALD=OFF \
meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb +2 -2
@@ -29,7 +29,7 @@ inherit systemd cmake pkgconfig pythonnative perlnative SYSTEMD_SERVICE_${PN} = "openwsmand.service" SYSTEMD_AUTO_ENABLE = "disable" -LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ -DBUILD_LIBCIM=NO \
@@ -50,7 +50,7 @@ do_install_append() { install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh - 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}/openwsmand.service ${D}/${systemd_unitdir}/system
meta-oe/recipes-extended/polkit/polkit_0.113.bb +3 -3
@@ -9,8 +9,8 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection -PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" +PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd"
@@ -20,7 +20,7 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ file://0001-make-netgroup-support-configurable.patch \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ " SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +2 -2
@@ -38,13 +38,13 @@ do_install() { install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers - 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 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ fi } -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)} SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "rarpd.service"
meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb +3 -3
@@ -41,9 +41,9 @@ EXTRA_OECONF += "--enable-cached-man-pages" PACKAGECONFIG ??= " \ zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ imdiag gnutls imfile \ - ${@base_contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'ptest', 'testbench ${VALGRIND}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench ${VALGRIND}', '', d)} \ " # default yes in configure
meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +3 -3
@@ -25,13 +25,13 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" inherit autotools -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" SYSTEMD_AUTO_ENABLE = "enable" -LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" EXTRA_OECONF = '--enable-debug \ --enable-ssl \
@@ -50,7 +50,7 @@ do_install() { oe_runmake DESTDIR=${D} install - 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 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service fi
meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb +2 -2
@@ -18,8 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ file://smartd.service \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ " PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
meta-oe/recipes-graphics/fbida/fbida_2.10.bb +7 -7
@@ -31,25 +31,25 @@ do_compile() { # Be sure to respect preferences (force to "no") # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} - if [ -z "${@base_contains('PACKAGECONFIG', 'curl', 'curl', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'curl', 'curl', '', d)}" ]; then sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'png', 'png', '', d)}" ]; then sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'webp', 'webp', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'webp', 'webp', '', d)}" ]; then sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile fi - if [ -z "${@base_contains('PACKAGECONFIG', 'lirc', 'lirc', '', d)}" ]; then + if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'lirc', 'lirc', '', d)}" ]; then sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile fi
meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff lcms gegl poppler jasper bzip2 libgudev" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" inherit gnome gtk-doc
meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +9 -9
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ file://lxdm.conf \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ - ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ + ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ file://0002-let-autotools-create-lxdm.conf.patch \ " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93 PE = "1" DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" -DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" +DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" # combine oe-core way with angstrom DISTRO_TYPE -DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" +DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" inherit autotools pkgconfig gettext systemd distro_features_check # depends on virtual/libx11
@@ -27,8 +27,8 @@ REQUIRED_DISTRO_FEATURES = "x11" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ - ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ " do_configure_prepend() {
@@ -48,11 +48,11 @@ do_compile_append() { do_install_append() { install -d ${D}${localstatedir}/lib/lxdm install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm - if ${@base_contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then # ArchLinux version of pam config has the following advantages: # * simple setup of passwordless login # * in XFCE powerdown/restart enabled in logoff dialog - install -m 644 ${WORKDIR}/${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm + install -m 644 ${WORKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm fi }
@@ -70,7 +70,7 @@ done sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf } -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" +RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd"
meta-oe/recipes-graphics/slim/slim_1.3.2.bb +2 -2
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PR = "r1" -DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = " \ http://download.berlios.de/${BPN}/${BP}.tar.gz \
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72db EXTRA_OEMAKE += " \ - USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ + USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ PREFIX=${prefix} \ CFGDIR=${sysconfdir} \ MANDIR=${mandir} \
meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb +4 -4
@@ -16,11 +16,11 @@ SRC_URI[sha256sum] = "f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5e inherit allarch fontcache -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = "" # Don't use font cache mecanism for console packages -FONT_PACKAGES = "${@base_contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" +FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" # Hand made configure script. Don't need oe_runconf do_configure() {
@@ -32,11 +32,11 @@ do_configure() { } do_compile() { - oe_runmake DESTDIR=${D} psf txt ${@base_contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} + oe_runmake DESTDIR=${D} psf txt ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} } do_install() { - oe_runmake DESTDIR=${D} install-psf install-acm ${@base_contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} + oe_runmake DESTDIR=${D} install-psf install-acm ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} } PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf"
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +1 -1
@@ -24,7 +24,7 @@ do_install() { install -d ${D}${sysconfdir}/default - 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 xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
meta-oe/recipes-kernel/ktap/ktap.inc +2 -2
@@ -21,6 +21,6 @@ PACKAGECONFIG[libelf] = ",,elfutils" PACKAGECONFIG ?= "libelf" EXTRA_OEMAKE = " \ - ${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ - ${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ "
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +1 -1
@@ -14,7 +14,7 @@ RCONFLICTS_${PN} = "mplayer" REQUIRED_DISTRO_FEATURES = "x11" # because it depends on libpostproc/libav which has commercial flag -LICENSE_FLAGS = "${@base_contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" +LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" inherit autotools gettext pkgconfig
meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb +2 -2
@@ -30,12 +30,12 @@ inherit scons update-rc.d python-dir pythonnative systemd bluetooth INITSCRIPT_NAME = "gpsd" INITSCRIPT_PARAMS = "defaults 35" -SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" +SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" export STAGING_INCDIR export STAGING_LIBDIR -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "bluez='true',bluez='false',${BLUEZ}" PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" EXTRA_OESCONS = " \
meta-oe/recipes-support/emacs/emacs.inc +2 -2
@@ -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/
meta-oe/recipes-support/espeak/espeak_1.37.bb +1 -1
@@ -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"
meta-oe/recipes-support/fftw/fftwf_3.3.4.bb +1 -1
@@ -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"
meta-oe/recipes-support/gradm/gradm_3.1.bb +2 -2
@@ -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() {
meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +3 -3
@@ -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"
meta-oe/recipes-support/libee/libee.inc +1 -1
@@ -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,,"
meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb +1 -1
@@ -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,"
meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +1 -1
@@ -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
meta-oe/recipes-support/lvm2/lvm2.inc +2 -2
@@ -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
meta-oe/recipes-support/openct/openct_0.6.20.bb +2 -2
@@ -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
meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb +2 -2
@@ -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} += " \
meta-oe/recipes-support/postgresql/postgresql.inc +1 -1
@@ -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,"
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +3 -3
@@ -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() {
meta-oe/recipes-support/udisks/udisks2_2.1.5.bb +1 -1
@@ -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"
meta-oe/recipes-support/udisks/udisks_1.0.5.bb +1 -1
@@ -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} \
meta-oe/recipes-support/vim/vim_7.4.769.bb +2 -2
@@ -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,"
Signature · 1 line
2.8.0.rc3
PATCH 2/8 meta-networking: 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().
--- .../recipes-connectivity/inetutils/inetutils_1.9.4.bb | 4 ++-- meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 6 +++--- meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb | 2 +- .../recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 6 +++--- meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | 4 ++-- meta-networking/recipes-daemons/postfix/postfix.inc | 12 ++++++------ meta-networking/recipes-daemons/squid/squid_3.5.7.bb | 8 ++++---- meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 14 +++++++------- .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 6 +++--- .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +- meta-networking/recipes-protocols/openflow/openflow.inc | 2 +- meta-networking/recipes-protocols/quagga/quagga.inc | 12 ++++++------ meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 +++++++------- meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb | 4 ++-- meta-networking/recipes-support/fping/fping_3.5.bb | 2 +- .../recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | 2 +- .../recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb | 2 +- meta-networking/recipes-support/netcf/netcf_git.bb | 2 +- meta-networking/recipes-support/netperf/netperf_2.6.0.bb | 4 ++-- meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | 2 +- meta-networking/recipes-support/nis/ypbind-mt_2.2.bb | 2 +- meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb | 6 +++--- .../recipes-support/strongswan/strongswan_5.3.2.bb | 4 ++-- meta-networking/recipes-support/stunnel/stunnel_5.28.bb | 2 +- 24 files changed, 62 insertions(+), 62 deletions(-)
meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +2 -2
@@ -28,8 +28,8 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9 inherit autotools gettext update-alternatives texinfo -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" -noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" +noipv6="${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" PACKAGECONFIG ??= "ftp uucpd \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +3 -3
@@ -32,10 +32,10 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ "
meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +1 -1
@@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +3 -3
@@ -24,8 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \ andrew_cv_runpath_switch=none" PACKAGECONFIG ??= "ntlm \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
@@ -54,7 +54,7 @@ do_compile_prepend () { } 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}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system
meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +2 -2
@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" SYSTEMD_AUTO_ENABLE = "disable" inherit autotools -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} do_install() { oe_runmake install DESTDIR=${D} INSTALL="install -p"
@@ -34,7 +34,7 @@ do_install() { install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d -m 0755 ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system fi
meta-networking/recipes-daemons/postfix/postfix.inc +6 -6
@@ -7,8 +7,8 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" DEPENDS = "virtual/db libpcre openssl postfix-native \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native"
@@ -52,9 +52,9 @@ export SYSLIBS = "${LDFLAGS}" # ldap support export CCARGS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" export AUXLIBS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap export CCARGS-ldap_class-native = ""
@@ -63,9 +63,9 @@ export AUXLIBS-ldap_class-native = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" export AUXLIBS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = ""
meta-networking/recipes-daemons/squid/squid_3.5.7.bb +4 -4
@@ -34,15 +34,15 @@ inherit autotools useradd ptest USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ + ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ " PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," BASIC_AUTH = "DB SASL LDAP NIS" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +7 -7
@@ -29,13 +29,13 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" +SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" -PAMLIB = "${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" -NOPAM_SRC ="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" +NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd
@@ -75,7 +75,7 @@ do_install() { sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd fi - 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 /var/run/vsftpd/empty 0755 root root -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +3 -3
@@ -26,7 +26,7 @@ SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d98 PAM_SRC_URI = "file://rexec.pam \ file://rlogin.pam \ file://rsh.pam" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" inherit pkgconfig
@@ -41,7 +41,7 @@ do_configure () { ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} echo "INSTALLROOT=${D}" > MCONFIG - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then echo "USE_PAM=1" >> MCONFIG fi
@@ -63,7 +63,7 @@ do_install () { 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 'MANDIR=${mandir}' install - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -1
@@ -143,7 +143,7 @@ INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME_${PN}-server = "snmpd" INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd"
meta-networking/recipes-protocols/openflow/openflow.inc +1 -1
@@ -20,7 +20,7 @@ PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl" EXTRA_OECONF += " \ KARCH=${TARGET_ARCH} \ - ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ " S = "${WORKDIR}/git"
meta-networking/recipes-protocols/quagga/quagga.inc +6 -6
@@ -9,8 +9,8 @@ HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" LICENSE = "GPL-2.0 & LGPL-2.0" DEPENDS = "readline ncurses perl-native" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" +SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c"
@@ -41,7 +41,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://zebra.service \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam"
@@ -62,7 +62,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ --enable-exampledir=${docdir}/quagga/examples/ \ --enable-vtysh \ --enable-isisd \ - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ --enable-ospf-te \ --enable-opaque-lsa \ --enable-ospfclient=yes \
@@ -125,7 +125,7 @@ do_install () { fi done - 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 /var/run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
@@ -162,7 +162,7 @@ pkg_postinst_${PN} () { # Split into a main package and separate per-protocol packages PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" + ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd"
meta-networking/recipes-support/dnsmasq/dnsmasq.inc +7 -7
@@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" PACKAGECONFIG[lua] = ",,lua" PACKAGECONFIG[resolvconf] = ",,,resolvconf" EXTRA_OEMAKE = "\ - 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ + 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ "
@@ -53,7 +53,7 @@ do_install () { install -d ${D}${systemd_unitdir}/system - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
@@ -61,11 +61,11 @@ do_install () { install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} - if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/dbus-1/system.d install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ fi - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/resolvconf/update.d/ install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq
meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb +2 -2
@@ -17,8 +17,8 @@ DEPENDS = "openssl xz zlib bzip2 libcap icu" inherit autotools pkgconfig systemd useradd PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
meta-networking/recipes-support/fping/fping_3.5.bb +1 -1
@@ -21,5 +21,5 @@ inherit autotools EXTRA_OECONF = "--enable-ipv4" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +1 -1
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ --enable-dpd \ --enable-natt=yes \ --sysconfdir=${sysconfdir}/racoon \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 CFLAGS += "-fno-strict-aliasing"
meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version #| collect2: error: ld returned 1 exit status #| make[4]: *** [libsctp.la] Error 1 -PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" +PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" S = "${WORKDIR}/${BP}"
meta-networking/recipes-support/netcf/netcf_git.bb +1 -1
@@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," 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}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
meta-networking/recipes-support/netperf/netperf_2.6.0.bb +2 -2
@@ -24,7 +24,7 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', \ +CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ ' -D_FILE_OFFSET_BITS=64', '', d)}" PACKAGECONFIG ??= ""
@@ -60,7 +60,7 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults"
meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +1 -1
@@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" DEPENDS = " \ yp-tools \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " RDEPENDS_${PN} += "yp-tools"
meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +1 -1
@@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first. \ " HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" -DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PROVIDES += "ypbind" PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb +3 -3
@@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd
@@ -22,7 +22,7 @@ CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw) EXTRA_OECONF += "--enable-password-save --enable-iproute2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=/sbin/ip"
@@ -38,7 +38,7 @@ do_install_append() { install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - 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}/[email protected] ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/[email protected] ${D}/${systemd_unitdir}/system/[email protected]
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +2 -2
@@ -20,11 +20,11 @@ EXTRA_OECONF = " \ --without-lib-prefix \ " -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
meta-networking/recipes-support/stunnel/stunnel_5.28.bb +1 -1
@@ -16,5 +16,5 @@ inherit autotools EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
Signature · 1 line
2.8.0.rc3
PATCH 3/8 meta-webserver: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb | 4 ++-- meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb | 4 ++-- meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb | 2 +- meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb | 2 +- meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +- meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb +2 -2
@@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-ssl \ --enable-mpms-shared \ ac_cv_have_threadsafe_pollset=no" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
@@ -86,7 +86,7 @@ do_install_append() { # Set 'ServerName' to fix error messages when restart apache service sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf - 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/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ fi
meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb +2 -2
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r9" -DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://www.cherokee-project.de/mirrors/cherokee/1.2/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init \
@@ -26,7 +26,7 @@ PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" EXTRA_OECONF = "--disable-static \ --disable-nls \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ --with-wwwroot=${localstatedir}/www/cherokee \ "
meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb +1 -1
@@ -48,7 +48,7 @@ do_install_append() { # by default if php is installed echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf - 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}/hiawatha.service ${D}/${systemd_unitdir}/system fi
meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +1 -1
@@ -58,7 +58,7 @@ do_install_append() { mkdir -p ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey - 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}/monkey.service ${D}/${systemd_unitdir}/system fi
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
@@ -66,7 +66,7 @@ do_configure () { do_install () { oe_runmake 'DESTDIR=${D}' install rm -fr ${D}${localstatedir}/run ${D}/run - 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 /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +1 -1
@@ -46,7 +46,7 @@ do_install() { install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf fi install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html
Signature · 1 line
2.8.0.rc3
PATCH 4/8 meta-xfce: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- .../recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb | 4 ++-- meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb +2 -2
@@ -18,7 +18,7 @@ EXTRA_OECONF = " \ --enable-panel-plugins \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--enable-polkit, --disable-polkit, polkit" PACKAGES += "xfce4-powermanager-plugin"
@@ -34,7 +34,7 @@ FILES_xfce4-powermanager-plugin = " \ " RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@base_contains('DISTRO_FEATURES','systemd','','consolekit',d)}" +RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" # xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin"
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +4 -4
@@ -21,8 +21,8 @@ PV = "4.12.0+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ - ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ " PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
@@ -34,5 +34,5 @@ FILES_${PN} += " \ " RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"
Signature · 1 line
2.8.0.rc3
PATCH 5/8 meta-multimedia: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- meta-multimedia/recipes-connectivity/gupnp/gssdp.inc | 2 +- meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | 6 +++--- .../recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb | 2 +- .../recipes-multimedia/libao/libao_1.2.0.bb | 2 +- .../recipes-multimedia/mpg123/mpg123_1.22.4.bb | 18 +++++++++--------- .../recipes-multimedia/musicpd/mpd_0.19.10.bb | 2 +- .../recipes-multimedia/openal/openal-soft_1.15.1.bb | 4 ++-- meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-)
meta-multimedia/recipes-connectivity/gupnp/gssdp.inc +1 -1
@@ -12,7 +12,7 @@ do_configure_prepend() { cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true } -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" PACKAGES =+ "gssdp-tools"
meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb +3 -3
@@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS += " \ ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew" PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,"
@@ -43,7 +43,7 @@ EXTRA_OECONF = " \ --enable-airplay \ --disable-optical-drive \ --enable-external-libraries \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \ " FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
@@ -94,6 +94,6 @@ RRECOMMENDS_${PN}_append = " libcec \ python-netclient \ libcurl \ xdpyinfo \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \ " RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bcce inherit autotools-brokensep pkgconfig lib_package -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio"
meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb +1 -1
@@ -27,7 +27,7 @@ python populate_packages_prepend () { do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') } -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" PACKAGECONFIG[esound] = "--enable-esd,--disable-esd,esound" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb +9 -9
@@ -22,8 +22,8 @@ inherit autotools pkgconfig # The options should be mutually exclusive for configuration script. # If both alsa and pulseaudio are specified (as in the default distro features) # pulseaudio takes precedence. -PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" +PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" PACKAGECONFIG[esd] = ",,esound"
@@ -35,13 +35,13 @@ PACKAGECONFIG[sdl] = ",,libsdl" # Following are possible sound output modules: # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" EXTRA_OECONF = " \ --enable-shared \
meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791 inherit autotools useradd systemd EXTRA_OECONF = "enable_bzip2=yes" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag"
meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb +2 -2
@@ -10,8 +10,8 @@ SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71" SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056" PACKAGECONFIG ?= "\ - ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ " PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio"
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +2 -2
@@ -8,8 +8,8 @@ DEPENDS = "libpng libav libsndfile1 libvorbis" PR = "r2" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ magic \ " PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio,"
Signature · 1 line
2.8.0.rc3
PATCH 6/8 meta-efl: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- meta-efl/recipes-efl/e17/e-wm.inc | 4 ++-- meta-efl/recipes-efl/efl/entrance_svn.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
meta-efl/recipes-efl/e17/e-wm.inc +2 -2
@@ -7,8 +7,8 @@ SRCNAME = "e" inherit e update-alternatives gettext pkgconfig S = "${WORKDIR}/${SRCNAME}" -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,--disable-pam,libpam" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
meta-efl/recipes-efl/efl/entrance_svn.bb +1 -1
@@ -16,7 +16,7 @@ PNBLACKLIST[entrance] ?= "broken: switch to https://git.enlightenment.org/misc/e PACKAGECONFIG ??= "" PACKAGECONFIG[consolekit] = "--enable-consolekit,--disable-consolekit,consolekit" -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" PR = "r7" PV = "0.0.4+svnr${SRCPV}"
Signature · 1 line
2.8.0.rc3
PATCH 7/8 meta-gnome: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 4 ++-- meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb | 2 +- .../gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 2 +- meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +2 -2
@@ -17,10 +17,10 @@ inherit autotools gnome gtk-doc pkgconfig gsettings SRC_URI += "file://egg-asn1x.patch" -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" +DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" -EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" +EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9"
meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +1 -1
@@ -24,6 +24,6 @@ do_configure_append() { done } -RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug"
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +1 -1
@@ -16,7 +16,7 @@ SRCREV = "0160f6725cfb872e017f3958f108792c3b882872" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra" PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss"
meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +1 -1
@@ -31,7 +31,7 @@ SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" GNOME_COMPRESS_TYPE="bz2" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
Signature · 1 line
2.8.0.rc3
PATCH 8/8 meta-initramfs: use bb.utils.contains() instead of base_contains()
In reply to Ross Burtonbase_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
--- meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +1 -1
@@ -27,7 +27,7 @@ EXTRA_OECONF = "--prefix=${prefix} \ " # RDEPEND on systemd optionally -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" EXTRA_OEMAKE += 'libdir=${prefix}/lib'
Signature · 1 line
2.8.0.rc3