diff options
-rw-r--r-- | recipes-containers/docker-registry/docker-registry_git.bb | 6 | ||||
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 10 | ||||
-rw-r--r-- | recipes-containers/lxc/lxc_2.0.0.bb | 6 | ||||
-rw-r--r-- | recipes-extended/images/xen-guest-image-minimal.bb | 4 | ||||
-rw-r--r-- | recipes-extended/libvirt/libvirt_1.3.2.bb | 8 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_4.1.bbappend | 4 | ||||
-rw-r--r-- | 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 3d8d74b9..996dfddc 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} += "\ | |||
73 | 73 | ||
74 | inherit setuptools systemd | 74 | inherit setuptools systemd |
75 | 75 | ||
76 | SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 76 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
77 | SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" | 77 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" |
78 | 78 | ||
79 | do_install_append() { | 79 | do_install_append() { |
80 | mkdir -p ${D}/etc/default/ | 80 | mkdir -p ${D}/etc/default/ |
81 | cp ${WORKDIR}/docker-registry.conf ${D}/etc/default/docker-registry | 81 | cp ${WORKDIR}/docker-registry.conf ${D}/etc/default/docker-registry |
82 | 82 | ||
83 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 83 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
84 | install -d ${D}${systemd_unitdir}/system | 84 | install -d ${D}${systemd_unitdir}/system |
85 | install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system | 85 | install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system |
86 | sed -i "s|#WORKDIR#|${PYTHON_SITEPACKAGES_DIR}/docker_registry|" ${D}/${systemd_unitdir}/system/docker-registry.service | 86 | 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 f232d3d8..81af82d0 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -100,18 +100,18 @@ do_compile() { | |||
100 | 100 | ||
101 | inherit systemd update-rc.d | 101 | inherit systemd update-rc.d |
102 | 102 | ||
103 | SYSTEMD_PACKAGES = "${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 103 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
104 | SYSTEMD_SERVICE_${PN} = "${@base_contains('DISTRO_FEATURES','systemd','docker.service','',d)}" | 104 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" |
105 | 105 | ||
106 | INITSCRIPT_PACKAGES += "${@base_contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" | 106 | INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" |
107 | INITSCRIPT_NAME_${PN} = "${@base_contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" | 107 | INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" |
108 | INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 108 | INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
109 | 109 | ||
110 | do_install() { | 110 | do_install() { |
111 | mkdir -p ${D}/${bindir} | 111 | mkdir -p ${D}/${bindir} |
112 | cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker | 112 | cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker |
113 | 113 | ||
114 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 114 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
115 | install -d ${D}${systemd_unitdir}/system | 115 | install -d ${D}${systemd_unitdir}/system |
116 | install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system | 116 | install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system |
117 | # replaces one copied from above with one that uses the local registry for a mirror | 117 | # 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 34aab38a..9f01edde 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}" | |||
38 | 38 | ||
39 | # Let's not configure for the host distro. | 39 | # Let's not configure for the host distro. |
40 | # | 40 | # |
41 | PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" | 41 | PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '', d)}" |
42 | EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" | 42 | EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}" |
43 | 43 | ||
44 | EXTRA_OECONF += "--with-init-script=\ | 44 | EXTRA_OECONF += "--with-init-script=\ |
@@ -48,7 +48,7 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | |||
48 | EXTRA_OECONF += "--enable-log-src-basename" | 48 | EXTRA_OECONF += "--enable-log-src-basename" |
49 | 49 | ||
50 | PACKAGECONFIG ??= "templates \ | 50 | PACKAGECONFIG ??= "templates \ |
51 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
52 | " | 52 | " |
53 | PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," | 53 | PACKAGECONFIG[doc] = "--enable-doc --enable-api-docs,--disable-doc --disable-api-docs,," |
54 | PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," | 54 | PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,," |
@@ -109,7 +109,7 @@ do_install_append() { | |||
109 | for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ | 109 | for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \ |
110 | sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done | 110 | sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done |
111 | 111 | ||
112 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 112 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
113 | install -d ${D}${sysconfdir}/init.d | 113 | install -d ${D}${sysconfdir}/init.d |
114 | install -m 755 config/init/sysvinit/lxc* ${D}${sysconfdir}/init.d | 114 | install -m 755 config/init/sysvinit/lxc* ${D}${sysconfdir}/init.d |
115 | fi | 115 | fi |
diff --git a/recipes-extended/images/xen-guest-image-minimal.bb b/recipes-extended/images/xen-guest-image-minimal.bb index f13940ce..ab7e92c3 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 += " \ | |||
7 | ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ | 7 | ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ |
8 | " | 8 | " |
9 | 9 | ||
10 | IMAGE_INSTALL += "${@base_contains('DISTRO_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}" | 10 | IMAGE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}" |
11 | IMAGE_INSTALL += "${@base_contains('DISTRO_FEATURES', 'x11', ' xf86-video-vesa', '', d)}" | 11 | IMAGE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' xf86-video-vesa', '', d)}" |
12 | 12 | ||
13 | LICENSE = "MIT" | 13 | LICENSE = "MIT" |
14 | 14 | ||
diff --git a/recipes-extended/libvirt/libvirt_1.3.2.bb b/recipes-extended/libvirt/libvirt_1.3.2.bb index 42066c1f..be219103 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 = " \ | |||
107 | /usr/lib/sysctl.d/60-libvirtd.conf \ | 107 | /usr/lib/sysctl.d/60-libvirtd.conf \ |
108 | ${sbindir}/libvirtd \ | 108 | ${sbindir}/libvirtd \ |
109 | ${systemd_unitdir}/system/* \ | 109 | ${systemd_unitdir}/system/* \ |
110 | ${@base_contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ | 110 | ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ |
111 | " | 111 | " |
112 | 112 | ||
113 | FILES_${PN}-virsh = "${bindir}/virsh" | 113 | FILES_${PN}-virsh = "${bindir}/virsh" |
@@ -167,9 +167,9 @@ PRIVATE_LIBS_${PN}-ptest = " \ | |||
167 | # full config | 167 | # full config |
168 | PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ | 168 | PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ |
169 | remote macvtap libvirtd netcf udev python ebtables \ | 169 | remote macvtap libvirtd netcf udev python ebtables \ |
170 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ | 170 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ |
171 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ | 171 | ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ |
172 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ | 172 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ |
173 | " | 173 | " |
174 | 174 | ||
175 | # enable,disable,depends,rdepends | 175 | # 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 85e98cc6..f3be89ed 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" | |||
13 | KERNEL_MODULE_AUTOLOAD += "kvm-intel" | 13 | KERNEL_MODULE_AUTOLOAD += "kvm-intel" |
14 | 14 | ||
15 | # aufs kernel support required for xen-image-minimal | 15 | # aufs kernel support required for xen-image-minimal |
16 | KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" | 16 | KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" |
17 | 17 | ||
18 | # xen kernel support | 18 | # xen kernel support |
19 | SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" | 19 | 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 85e98cc6..f3be89ed 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" | |||
13 | KERNEL_MODULE_AUTOLOAD += "kvm-intel" | 13 | KERNEL_MODULE_AUTOLOAD += "kvm-intel" |
14 | 14 | ||
15 | # aufs kernel support required for xen-image-minimal | 15 | # aufs kernel support required for xen-image-minimal |
16 | KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" | 16 | KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" |
17 | 17 | ||
18 | # xen kernel support | 18 | # xen kernel support |
19 | SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" | 19 | SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" |