merged. Bruce
On Sun, May 1, 2016 at 10:27 AM, Derek Straka <[email protected]> wrote: > The 'base_contains' is now deprecated and only kept as a compatibility > method. It will be removed in future releases. > > Signed-off-by: Derek Straka <[email protected]> > --- > recipes-containers/docker-registry/docker-registry_git.bb | 6 +++--- > recipes-containers/docker/docker_git.bb | 10 +++++----- > recipes-containers/lxc/lxc_2.0.0.bb | 6 +++--- > recipes-extended/images/xen-guest-image-minimal.bb | 4 ++-- > recipes-extended/libvirt/libvirt_1.3.2.bb | 8 ++++---- > recipes-kernel/linux/linux-yocto_4.1.bbappend | 4 ++-- > recipes-kernel/linux/linux-yocto_4.4.bbappend | 4 ++-- > 7 files changed, 21 insertions(+), 21 deletions(-) > > diff --git a/recipes-containers/docker-registry/docker-registry_git.bb > b/recipes-containers/docker-registry/docker-registry_git.bb > index 3d8d74b..996dfdd 100644 > --- a/recipes-containers/docker-registry/docker-registry_git.bb > +++ b/recipes-containers/docker-registry/docker-registry_git.bb > @@ -73,14 +73,14 @@ RDEPENDS_${PN} += "\ > > inherit setuptools systemd > > -SYSTEMD_PACKAGES = > "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" > -SYSTEMD_SERVICE_${PN} = > "${@base_contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" > +SYSTEMD_PACKAGES = > "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" > +SYSTEMD_SERVICE_${PN} = > "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" > > do_install_append() { > mkdir -p ${D}/etc/default/ > cp ${WORKDIR}/docker-registry.conf ${D}/etc/default/docker-registry > > - 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}/docker-registry.service > ${D}/${systemd_unitdir}/system > sed -i > "s|#WORKDIR#|${PYTHON_SITEPACKAGES_DIR}/docker_registry|" > ${D}/${systemd_unitdir}/system/docker-registry.service > diff --git a/recipes-containers/docker/docker_git.bb > b/recipes-containers/docker/docker_git.bb > index 19fdef0..c2681a2 100644 > --- a/recipes-containers/docker/docker_git.bb > +++ b/recipes-containers/docker/docker_git.bb > @@ -101,11 +101,11 @@ do_compile() { > > inherit systemd update-rc.d > > -SYSTEMD_PACKAGES = > "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" > -SYSTEMD_SERVICE_${PN} = > "${@base_contains('DISTRO_FEATURES','systemd','docker.service','',d)}" > +SYSTEMD_PACKAGES = > "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" > +SYSTEMD_SERVICE_${PN} = > "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" > > -INITSCRIPT_PACKAGES += > "${@base_contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" > -INITSCRIPT_NAME_${PN} = > "${@base_contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" > +INITSCRIPT_PACKAGES += > "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" > +INITSCRIPT_NAME_${PN} = > "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" > INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" > > do_install() { > @@ -115,7 +115,7 @@ do_install() { > cp > ${S}/bundles/${DOCKER_VERSION}/dynbinary/dockerinit-${DOCKER_VERSION} \ > ${D}/${bindir}/dockerinit > > - 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 ${S}/contrib/init/systemd/docker.* > ${D}/${systemd_unitdir}/system > # replaces one copied from above with one that uses the > local registry for a mirror > diff --git a/recipes-containers/lxc/lxc_2.0.0.bb b/recipes-containers/lxc/ > lxc_2.0.0.bb > index 34aab38..9f01edd 100644 > --- a/recipes-containers/lxc/lxc_2.0.0.bb > +++ b/recipes-containers/lxc/lxc_2.0.0.bb > @@ -38,7 +38,7 @@ S = "${WORKDIR}/${BPN}-${PV}" > > # Let's not configure for the host distro. > # > -PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', > '--enable-tests', '', d)}" > +PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', > '--enable-tests', '', d)}" > EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" > > EXTRA_OECONF += "--with-init-script=\ > @@ -48,7 +48,7 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > 'systemd', '', d)}" > EXTRA_OECONF += "--enable-log-src-basename" > > PACKAGECONFIG ??= "templates \ > - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} > \ > " > PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc > --disable-api-docs,," > PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," > @@ -109,7 +109,7 @@ do_install_append() { > for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ > sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done > > - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', > 'false', d)}; then > + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', > 'false', d)}; then > install -d ${D}${sysconfdir}/init.d > install -m 755 config/init/sysvinit/lxc* > ${D}${sysconfdir}/init.d > fi > diff --git a/recipes-extended/images/xen-guest-image-minimal.bb > b/recipes-extended/images/xen-guest-image-minimal.bb > index f13940c..ab7e92c 100644 > --- a/recipes-extended/images/xen-guest-image-minimal.bb > +++ b/recipes-extended/images/xen-guest-image-minimal.bb > @@ -7,8 +7,8 @@ IMAGE_INSTALL += " \ > ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', > 'kernel-module-xen-acpi-processor', '', d)} \ > " > > -IMAGE_INSTALL += "${@base_contains('DISTRO_FEATURES', 'x11', ' > xf86-video-fbdev', '', d)}" > -IMAGE_INSTALL += "${@base_contains('DISTRO_FEATURES', 'x11', ' > xf86-video-vesa', '', d)}" > +IMAGE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' > xf86-video-fbdev', '', d)}" > +IMAGE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' > xf86-video-vesa', '', d)}" > > LICENSE = "MIT" > > diff --git a/recipes-extended/libvirt/libvirt_1.3.2.bb > b/recipes-extended/libvirt/libvirt_1.3.2.bb > index 42066c1..be21910 100644 > --- a/recipes-extended/libvirt/libvirt_1.3.2.bb > +++ b/recipes-extended/libvirt/libvirt_1.3.2.bb > @@ -107,7 +107,7 @@ FILES_${PN}-libvirtd = " \ > /usr/lib/sysctl.d/60-libvirtd.conf \ > ${sbindir}/libvirtd \ > ${systemd_unitdir}/system/* \ > - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '', > '${libexecdir}/libvirt-guests.sh', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', > '${libexecdir}/libvirt-guests.sh', d)} \ > " > > FILES_${PN}-virsh = "${bindir}/virsh" > @@ -167,9 +167,9 @@ PRIVATE_LIBS_${PN}-ptest = " \ > # full config > PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test > \ > remote macvtap libvirtd netcf udev python ebtables \ > - ${@base_contains('DISTRO_FEATURES', 'selinux', > 'selinux audit libcap-ng', '', d)} \ > - ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl > xen-inotify', '', d)} \ > - ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', > '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', > 'selinux audit libcap-ng', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen > libxl xen-inotify', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', > 'polkit', '', d)} \ > " > > # enable,disable,depends,rdepends > diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend > b/recipes-kernel/linux/linux-yocto_4.1.bbappend > index 85e98cc..f3be89e 100644 > --- a/recipes-kernel/linux/linux-yocto_4.1.bbappend > +++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend > @@ -13,7 +13,7 @@ KERNEL_MODULE_AUTOLOAD += "kvm-amd" > KERNEL_MODULE_AUTOLOAD += "kvm-intel" > > # aufs kernel support required for xen-image-minimal > -KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' > features/aufs/aufs-enable.scc', '', d)}" > +KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', > 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" > > # xen kernel support > -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', > '', d)}" > +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' > file://xen.scc', '', d)}" > diff --git a/recipes-kernel/linux/linux-yocto_4.4.bbappend > b/recipes-kernel/linux/linux-yocto_4.4.bbappend > index 85e98cc..f3be89e 100644 > --- a/recipes-kernel/linux/linux-yocto_4.4.bbappend > +++ b/recipes-kernel/linux/linux-yocto_4.4.bbappend > @@ -13,7 +13,7 @@ KERNEL_MODULE_AUTOLOAD += "kvm-amd" > KERNEL_MODULE_AUTOLOAD += "kvm-intel" > > # aufs kernel support required for xen-image-minimal > -KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' > features/aufs/aufs-enable.scc', '', d)}" > +KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', > 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" > > # xen kernel support > -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', > '', d)}" > +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' > file://xen.scc', '', d)}" > -- > 1.9.1 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
