diff options
| author | Roy Li <rongqing.li@windriver.com> | 2015-09-16 12:26:37 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-09-16 16:10:10 -0400 |
| commit | a27d411aefbf38e070adebac539c4981c2360b4d (patch) | |
| tree | 31fd32f9aba4f85dd09435501e115c8c0f915aa0 /recipes-extended/libvirt/libvirt_1.2.17.bb | |
| parent | 84b521fe4a5de8ef5c5fa50b5e923cfcce7263d6 (diff) | |
| download | meta-virtualization-a27d411aefbf38e070adebac539c4981c2360b4d.tar.gz | |
libvirt: upgrade 1.2.17 -> 1.2.19
The release notes is http://libvirt.org/news.html
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-extended/libvirt/libvirt_1.2.17.bb')
| -rw-r--r-- | recipes-extended/libvirt/libvirt_1.2.17.bb | 272 |
1 files changed, 0 insertions, 272 deletions
diff --git a/recipes-extended/libvirt/libvirt_1.2.17.bb b/recipes-extended/libvirt/libvirt_1.2.17.bb deleted file mode 100644 index 06cb51b3..00000000 --- a/recipes-extended/libvirt/libvirt_1.2.17.bb +++ /dev/null | |||
| @@ -1,272 +0,0 @@ | |||
| 1 | DESCRIPTION = "A toolkit to interact with the virtualization capabilities of recent versions of Linux." | ||
| 2 | HOMEPAGE = "http://libvirt.org" | ||
| 3 | LICENSE = "LGPLv2.1+" | ||
| 4 | LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
| 6 | file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" | ||
| 7 | SECTION = "console/tools" | ||
| 8 | PR = "r1" | ||
| 9 | |||
| 10 | DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux e2fsprogs pm-utils \ | ||
| 11 | iptables dnsmasq readline libtasn1 libxslt-native" | ||
| 12 | |||
| 13 | # libvirt-guests.sh needs gettext.sh | ||
| 14 | # | ||
| 15 | RDEPENDS_${PN} = "gettext-runtime" | ||
| 16 | |||
| 17 | RDEPENDS_${PN}-ptest += "make gawk" | ||
| 18 | |||
| 19 | RDEPENDS_libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq netcat-openbsd" | ||
| 20 | RDEPENDS_libvirt-libvirtd_append_x86-64 = " dmidecode" | ||
| 21 | RDEPENDS_libvirt-libvirtd_append_x86 = " dmidecode" | ||
| 22 | |||
| 23 | #connman blocks the 53 port and libvirtd can't start its DNS service | ||
| 24 | RCONFLICTS_${PN}_libvirtd = "connman" | ||
| 25 | |||
| 26 | SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \ | ||
| 27 | file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \ | ||
| 28 | file://libvirtd.sh \ | ||
| 29 | file://libvirtd.conf \ | ||
| 30 | file://runptest.patch \ | ||
| 31 | file://run-ptest \ | ||
| 32 | file://tests-allow-separated-src-and-build-dirs.patch \ | ||
| 33 | file://libvirt-use-pkg-config-to-locate-libcap.patch \ | ||
| 34 | file://0001-to-fix-build-error.patch \ | ||
| 35 | file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \ | ||
| 36 | " | ||
| 37 | |||
| 38 | SRC_URI[libvirt.md5sum] = "a1f49050223be3cbd7678c32b1ee2756" | ||
| 39 | SRC_URI[libvirt.sha256sum] = "e07eaf20b0590fae05ba3b53ad4dac3e5fbd771437563cc78b692f23ddd02fad" | ||
| 40 | |||
| 41 | inherit autotools gettext update-rc.d pkgconfig ptest systemd | ||
| 42 | |||
| 43 | CACHED_CONFIGUREVARS += "\ | ||
| 44 | ac_cv_path_XMLLINT=/usr/bin/xmllint \ | ||
| 45 | ac_cv_path_XMLCATLOG=/usr/bin/xmlcatalog \ | ||
| 46 | ac_cv_path_AUGPARSE=/usr/bin/augparse \ | ||
| 47 | ac_cv_path_DNSMASQ=/usr/bin/dnsmasq \ | ||
| 48 | ac_cv_path_BRCTL=/usr/sbin/brctl \ | ||
| 49 | ac_cv_path_TC=/sbin/tc \ | ||
| 50 | ac_cv_path_UDEVADM=/sbin/udevadm \ | ||
| 51 | ac_cv_path_MODPROBE=/sbin/modprobe \ | ||
| 52 | ac_cv_path_IP_PATH=/bin/ip \ | ||
| 53 | ac_cv_path_IPTABLES_PATH=/usr/sbin/iptables \ | ||
| 54 | ac_cv_path_IP6TABLES_PATH=/usr/sbin/ip6tables \ | ||
| 55 | ac_cv_path_MOUNT=/bin/mount \ | ||
| 56 | ac_cv_path_UMOUNT=/bin/umount \ | ||
| 57 | ac_cv_path_MKFS=/usr/sbin/mkfs \ | ||
| 58 | ac_cv_path_SHOWMOUNT=/usr/sbin/showmount \ | ||
| 59 | ac_cv_path_PVCREATE=/usr/sbin/pvcreate \ | ||
| 60 | ac_cv_path_VGCREATE=/usr/sbin/vgcreate \ | ||
| 61 | ac_cv_path_LVCREATE=/usr/sbin/lvcreate \ | ||
| 62 | ac_cv_path_PVREMOVE=/usr/sbin/pvremove \ | ||
| 63 | ac_cv_path_VGREMOVE=/usr/sbin/vgremove \ | ||
| 64 | ac_cv_path_LVREMOVE=/usr/sbin/lvremove \ | ||
| 65 | ac_cv_path_LVCHANGE=/usr/sbin/lvchange \ | ||
| 66 | ac_cv_path_VGCHANGE=/usr/sbin/vgchange \ | ||
| 67 | ac_cv_path_VGSCAN=/usr/sbin/vgscan \ | ||
| 68 | ac_cv_path_PVS=/usr/sbin/pvs \ | ||
| 69 | ac_cv_path_VGS=/usr/sbin/vgs \ | ||
| 70 | ac_cv_path_LVS=/usr/sbin/lvs \ | ||
| 71 | ac_cv_path_PARTED=/usr/sbin/parted \ | ||
| 72 | ac_cv_path_DMSETUP=/usr/sbin/dmsetup" | ||
| 73 | |||
| 74 | # Ensure that libvirt uses polkit rather than policykit, whether the host has | ||
| 75 | # pkcheck installed or not, and ensure the path is correct per our config. | ||
| 76 | CACHED_CONFIGUREVARS += "ac_cv_path_PKCHECK_PATH=${bindir}/pkcheck" | ||
| 77 | |||
| 78 | # Some other possible paths we are not yet setting | ||
| 79 | #ac_cv_path_RPCGEN= | ||
| 80 | #ac_cv_path_XSLTPROC= | ||
| 81 | #ac_cv_path_RADVD= | ||
| 82 | #ac_cv_path_UDEVSETTLE= | ||
| 83 | #ac_cv_path_EBTABLES_PATH= | ||
| 84 | #ac_cv_path_PKG_CONFIG= | ||
| 85 | #ac_cv_path_ac_pt_PKG_CONFIG | ||
| 86 | #ac_cv_path_POLKIT_AUTH= | ||
| 87 | #ac_cv_path_DTRACE= | ||
| 88 | #ac_cv_path_ISCSIADM= | ||
| 89 | #ac_cv_path_MSGFMT= | ||
| 90 | #ac_cv_path_GMSGFMT= | ||
| 91 | #ac_cv_path_XGETTEXT= | ||
| 92 | #ac_cv_path_MSGMERGE= | ||
| 93 | #ac_cv_path_SCRUB= | ||
| 94 | #ac_cv_path_PYTHON= | ||
| 95 | |||
| 96 | ALLOW_EMPTY_${PN} = "1" | ||
| 97 | |||
| 98 | PACKAGES =+ "${PN}-libvirtd ${PN}-virsh" | ||
| 99 | |||
| 100 | ALLOW_EMPTY_${PN}-libvirtd = "1" | ||
| 101 | |||
| 102 | FILES_${PN}-libvirtd = " \ | ||
| 103 | ${sysconfdir}/init.d \ | ||
| 104 | ${sysconfdir}/sysctl.d \ | ||
| 105 | ${sysconfdir}/logrotate.d \ | ||
| 106 | ${sysconfdir}/libvirt/libvirtd.conf \ | ||
| 107 | /usr/lib/sysctl.d/60-libvirtd.conf \ | ||
| 108 | ${sbindir}/libvirtd \ | ||
| 109 | ${systemd_unitdir}/system/* \ | ||
| 110 | ${@base_contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \ | ||
| 111 | " | ||
| 112 | |||
| 113 | FILES_${PN}-virsh = "${bindir}/virsh" | ||
| 114 | FILES_${PN} += "${libdir}/libvirt/connection-driver \ | ||
| 115 | ${datadir}/augeas \ | ||
| 116 | ${datadir}/polkit-1" | ||
| 117 | |||
| 118 | FILES_${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug" | ||
| 119 | FILES_${PN}-staticdev += "${libdir}/*.a ${libdir}/libvirt/connection-driver/*.a ${libdir}/libvirt/lock-driver/*.a" | ||
| 120 | |||
| 121 | CONFFILES_${PN} += "${sysconfdir}/libvirt/libvirt.conf \ | ||
| 122 | ${sysconfdir}/libvirt/lxc.conf \ | ||
| 123 | ${sysconfdir}/libvirt/qemu-lockd.conf \ | ||
| 124 | ${sysconfdir}/libvirt/qemu.conf \ | ||
| 125 | ${sysconfdir}/libvirt/virt-login-shell.conf \ | ||
| 126 | ${sysconfdir}/libvirt/virtlockd.conf" | ||
| 127 | |||
| 128 | CONFFILES_${PN}-libvirtd = "${sysconfdir}/logrotate.d/libvirt ${sysconfdir}/logrotate.d/libvirt.lxc \ | ||
| 129 | ${sysconfdir}/logrotate.d/libvirt.qemu ${sysconfdir}/logrotate.d/libvirt.uml \ | ||
| 130 | ${sysconfdir}/libvirt/libvirtd.conf \ | ||
| 131 | /usr/lib/sysctl.d/libvirtd.conf" | ||
| 132 | |||
| 133 | INITSCRIPT_PACKAGES = "${PN}-libvirtd" | ||
| 134 | INITSCRIPT_NAME_${PN}-libvirtd = "libvirtd" | ||
| 135 | INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72" | ||
| 136 | |||
| 137 | SYSTEMD_PACKAGES = "${PN}-libvirtd" | ||
| 138 | SYSTEMD_SERVICE_${PN}-libvirtd = " \ | ||
| 139 | libvirtd.socket \ | ||
| 140 | libvirtd.service \ | ||
| 141 | virtlockd.service \ | ||
| 142 | libvirt-guests.service \ | ||
| 143 | virtlockd.socket \ | ||
| 144 | " | ||
| 145 | |||
| 146 | |||
| 147 | PRIVATE_LIBS_${PN}-ptest = " \ | ||
| 148 | libvirt-lxc.so.0 \ | ||
| 149 | libvirt.so.0 \ | ||
| 150 | libvirt-qemu.so.0 \ | ||
| 151 | lockd.so \ | ||
| 152 | libvirt_driver_secret.so \ | ||
| 153 | libvirt_driver_nodedev.so \ | ||
| 154 | libvirt_driver_vbox.so \ | ||
| 155 | libvirt_driver_interface.so \ | ||
| 156 | libvirt_driver_uml.so \ | ||
| 157 | libvirt_driver_network.so \ | ||
| 158 | libvirt_driver_nwfilter.so \ | ||
| 159 | libvirt_driver_qemu.so \ | ||
| 160 | libvirt_driver_storage.so \ | ||
| 161 | libvirt_driver_lxc.so \ | ||
| 162 | " | ||
| 163 | |||
| 164 | # xen-minimal config | ||
| 165 | #PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd" | ||
| 166 | |||
| 167 | # full config | ||
| 168 | PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ | ||
| 169 | remote macvtap libvirtd netcf udev python ebtables \ | ||
| 170 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ | ||
| 171 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ | ||
| 172 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ | ||
| 173 | " | ||
| 174 | |||
| 175 | # enable,disable,depends,rdepends | ||
| 176 | # | ||
| 177 | PACKAGECONFIG[qemu] = "--with-qemu,--without-qemu,qemu," | ||
| 178 | PACKAGECONFIG[yajl] = "--with-yajl,--without-yajl,yajl,yajl" | ||
| 179 | PACKAGECONFIG[xen] = "--with-xen,--without-xen,xen," | ||
| 180 | PACKAGECONFIG[xenapi] = "--with-xenapi,--without-xenapi,," | ||
| 181 | PACKAGECONFIG[libxl] = "--with-libxl=${STAGING_DIR_TARGET}/lib,--without-libxl,libxl," | ||
| 182 | PACKAGECONFIG[xen-inotify] = "--with-xen-inotify,--without-xen-inotify,xen," | ||
| 183 | PACKAGECONFIG[uml] = "--with-uml, --without-uml,," | ||
| 184 | PACKAGECONFIG[openvz] = "--with-openvz,--without-openvz,," | ||
| 185 | PACKAGECONFIG[vmware] = "--with-vmware,--without-vmware,," | ||
| 186 | PACKAGECONFIG[phyp] = "--with-phyp,--without-phyp,," | ||
| 187 | PACKAGECONFIG[vbox] = "--with-vbox,--without-vbox,," | ||
| 188 | PACKAGECONFIG[esx] = "--with-esx,--without-esx,," | ||
| 189 | PACKAGECONFIG[hyperv] = "--with-hyperv,--without-hyperv,," | ||
| 190 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit,polkit" | ||
| 191 | PACKAGECONFIG[lxc] = "--with-lxc,--without-lxc, lxc," | ||
| 192 | PACKAGECONFIG[test] = "--with-test=yes,--with-test=no,," | ||
| 193 | PACKAGECONFIG[remote] = "--with-remote,--without-remote,," | ||
| 194 | PACKAGECONFIG[macvtap] = "--with-macvtap=yes,--with-macvtap=no,libnl,libnl" | ||
| 195 | PACKAGECONFIG[libvirtd] = "--with-libvirtd,--without-libvirtd,," | ||
| 196 | PACKAGECONFIG[netcf] = "--with-netcf,--without-netcf,netcf,netcf" | ||
| 197 | PACKAGECONFIG[dtrace] = "--with-dtrace,--without-dtrace,," | ||
| 198 | PACKAGECONFIG[udev] = "--with-udev --with-pciaccess,--without-udev,udev libpciaccess," | ||
| 199 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," | ||
| 200 | PACKAGECONFIG[ebtables] = "ac_cv_path_EBTABLES_PATH=/sbin/ebtables,ac_cv_path_EBTABLES_PATH=,ebtables,ebtables" | ||
| 201 | PACKAGECONFIG[python] = ",,python," | ||
| 202 | PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl,cyrus-sasl" | ||
| 203 | PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iproute2,iproute2" | ||
| 204 | PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl," | ||
| 205 | PACKAGECONFIG[fuse] = "--with-fuse,--without-fuse,fuse," | ||
| 206 | PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," | ||
| 207 | PACKAGECONFIG[libcap-ng] = "--with-capng,--without-capng,libcap-ng," | ||
| 208 | |||
| 209 | # Enable the Python tool support | ||
| 210 | require libvirt-python.inc | ||
| 211 | |||
| 212 | do_install_append() { | ||
| 213 | install -d ${D}/etc/init.d | ||
| 214 | install -d ${D}/etc/libvirt | ||
| 215 | |||
| 216 | install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd | ||
| 217 | install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf | ||
| 218 | |||
| 219 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | ||
| 220 | # This will wind up in the libvirtd package, but will NOT be invoked by default. | ||
| 221 | # | ||
| 222 | mv ${D}/${libexecdir}/libvirt-guests.sh ${D}/${sysconfdir}/init.d | ||
| 223 | fi | ||
| 224 | |||
| 225 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
| 226 | # This variable is used by libvirtd.service to start libvirtd in the right mode | ||
| 227 | sed -i '/#LIBVIRTD_ARGS="--listen"/a LIBVIRTD_ARGS="--listen --daemon"' ${D}/${sysconfdir}/sysconfig/libvirtd | ||
| 228 | fi | ||
| 229 | |||
| 230 | # The /var/run/libvirt directories created by the Makefile | ||
| 231 | # are wiped out in volatile, we need to create these at boot. | ||
| 232 | rm -rf ${D}${localstatedir}/run | ||
| 233 | install -d ${D}${sysconfdir}/default/volatiles | ||
| 234 | echo "d root root 0755 ${localstatedir}/run/libvirt none" \ | ||
| 235 | > ${D}${sysconfdir}/default/volatiles/99_libvirt | ||
| 236 | echo "d root root 0755 ${localstatedir}/run/libvirt/lockd none" \ | ||
| 237 | >> ${D}${sysconfdir}/default/volatiles/99_libvirt | ||
| 238 | echo "d root root 0755 ${localstatedir}/run/libvirt/lxc none" \ | ||
| 239 | >> ${D}${sysconfdir}/default/volatiles/99_libvirt | ||
| 240 | echo "d root root 0755 ${localstatedir}/run/libvirt/network none" \ | ||
| 241 | >> ${D}${sysconfdir}/default/volatiles/99_libvirt | ||
| 242 | echo "d root root 0755 ${localstatedir}/run/libvirt/qemu none" \ | ||
| 243 | >> ${D}${sysconfdir}/default/volatiles/99_libvirt | ||
| 244 | |||
| 245 | # Add hook support for libvirt | ||
| 246 | mkdir -p ${D}/etc/libvirt/hooks | ||
| 247 | } | ||
| 248 | |||
| 249 | EXTRA_OECONF += " \ | ||
| 250 | --with-init-script=systemd \ | ||
| 251 | " | ||
| 252 | |||
| 253 | EXTRA_OEMAKE = "BUILD_DIR=${B} DEST_DIR=${D}${PTEST_PATH} PTEST_DIR=${PTEST_PATH}" | ||
| 254 | |||
| 255 | do_compile_ptest() { | ||
| 256 | oe_runmake -C tests buildtest-TESTS | ||
| 257 | } | ||
| 258 | |||
| 259 | do_install_ptest() { | ||
| 260 | oe_runmake -C tests install-ptest | ||
| 261 | } | ||
| 262 | |||
| 263 | pkg_postinst_libvirt() { | ||
| 264 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then | ||
| 265 | /etc/init.d/populate-volatile.sh update | ||
| 266 | fi | ||
| 267 | } | ||
| 268 | |||
| 269 | python () { | ||
| 270 | if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | ||
| 271 | d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") | ||
| 272 | } | ||
