diff options
3 files changed, 11 insertions, 12 deletions
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc index 471d33d6..9b5ab1a5 100644 --- a/recipes-extended/libvirt/libvirt-python.inc +++ b/recipes-extended/libvirt/libvirt-python.inc | |||
| @@ -20,7 +20,7 @@ INSANE_SKIP:${PN}-dbg += "buildpaths" | |||
| 20 | 20 | ||
| 21 | SRC_URI += "http://libvirt.org/sources/python/${BPN}-python-${LIBVIRT_VERSION}.tar.gz;name=libvirt_python;subdir=${BP}" | 21 | SRC_URI += "http://libvirt.org/sources/python/${BPN}-python-${LIBVIRT_VERSION}.tar.gz;name=libvirt_python;subdir=${BP}" |
| 22 | 22 | ||
| 23 | SRC_URI[libvirt_python.sha256sum] = "785023500f58d3e8e829af98647d43eee97e517aacc9d9e7ded43594ea52d032" | 23 | SRC_URI[libvirt_python.sha256sum] = "cee825a53c6438c5bc84b4250b35493a8e504d5d8075d3d2069ffaf7090846f8" |
| 24 | 24 | ||
| 25 | export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" | 25 | export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" |
| 26 | export LIBVIRT_CFLAGS = "-I${S}/include" | 26 | export LIBVIRT_CFLAGS = "-I${S}/include" |
diff --git a/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch index d9bcef0b..c68e05b9 100644 --- a/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch +++ b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch | |||
| @@ -25,11 +25,11 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | |||
| 25 | meson.build | 10 +++++----- | 25 | meson.build | 10 +++++----- |
| 26 | 1 file changed, 5 insertions(+), 5 deletions(-) | 26 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 27 | 27 | ||
| 28 | Index: libvirt-9.2.0/meson.build | 28 | Index: git/meson.build |
| 29 | =================================================================== | 29 | =================================================================== |
| 30 | --- libvirt-9.2.0.orig/meson.build | 30 | --- git.orig/meson.build |
| 31 | +++ libvirt-9.2.0/meson.build | 31 | +++ git/meson.build |
| 32 | @@ -26,8 +26,8 @@ | 32 | @@ -38,8 +38,8 @@ |
| 33 | conf = configuration_data() | 33 | conf = configuration_data() |
| 34 | 34 | ||
| 35 | conf.set('_GNU_SOURCE', 1) | 35 | conf.set('_GNU_SOURCE', 1) |
| @@ -40,7 +40,7 @@ Index: libvirt-9.2.0/meson.build | |||
| 40 | conf.set_quoted('PACKAGE', meson.project_name()) | 40 | conf.set_quoted('PACKAGE', meson.project_name()) |
| 41 | conf.set_quoted('PACKAGE_NAME', meson.project_name()) | 41 | conf.set_quoted('PACKAGE_NAME', meson.project_name()) |
| 42 | conf.set_quoted('PACKAGE_VERSION', meson.project_version()) | 42 | conf.set_quoted('PACKAGE_VERSION', meson.project_version()) |
| 43 | @@ -1770,9 +1770,9 @@ | 43 | @@ -1830,9 +1830,9 @@ |
| 44 | use_storage = true | 44 | use_storage = true |
| 45 | 45 | ||
| 46 | conf.set('WITH_STORAGE_FS', 1) | 46 | conf.set('WITH_STORAGE_FS', 1) |
| @@ -50,6 +50,6 @@ Index: libvirt-9.2.0/meson.build | |||
| 50 | + conf.set_quoted('MOUNT', '/usr/bin/mount') | 50 | + conf.set_quoted('MOUNT', '/usr/bin/mount') |
| 51 | + conf.set_quoted('UMOUNT', '/usr/bin/umount') | 51 | + conf.set_quoted('UMOUNT', '/usr/bin/umount') |
| 52 | + conf.set_quoted('MKFS', '/usr/sbin/mkfs') | 52 | + conf.set_quoted('MKFS', '/usr/sbin/mkfs') |
| 53 | endif | ||
| 54 | endif | ||
| 53 | 55 | ||
| 54 | showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path) | ||
| 55 | showmount_path = '' | ||
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb index f22ad0ea..432b5da8 100644 --- a/recipes-extended/libvirt/libvirt_git.bb +++ b/recipes-extended/libvirt/libvirt_git.bb | |||
| @@ -24,9 +24,9 @@ RDEPENDS:libvirt-libvirtd:append:aarch64 = " dmidecode" | |||
| 24 | #connman blocks the 53 port and libvirtd can't start its DNS service | 24 | #connman blocks the 53 port and libvirtd can't start its DNS service |
| 25 | RCONFLICTS:${PN}_libvirtd = "connman" | 25 | RCONFLICTS:${PN}_libvirtd = "connman" |
| 26 | 26 | ||
| 27 | SRCREV_libvirt = "e5232f6fd691668decd5be1b3a76cdbd3666d032" | 27 | SRCREV_libvirt = "14fc6812df37cf03e5adce979d89f9e1c7dd38f9" |
| 28 | 28 | ||
| 29 | LIBVIRT_VERSION = "10.5.0" | 29 | LIBVIRT_VERSION = "11.0.0" |
| 30 | PV = "v${LIBVIRT_VERSION}+git" | 30 | PV = "v${LIBVIRT_VERSION}+git" |
| 31 | 31 | ||
| 32 | SRC_URI = "gitsm://github.com/libvirt/libvirt.git;name=libvirt;protocol=https;branch=master \ | 32 | SRC_URI = "gitsm://github.com/libvirt/libvirt.git;name=libvirt;protocol=https;branch=master \ |
| @@ -129,7 +129,7 @@ SYSTEMD_SERVICE:${PN}-libvirtd = " \ | |||
| 129 | #PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd" | 129 | #PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd" |
| 130 | 130 | ||
| 131 | # full config | 131 | # full config |
| 132 | PACKAGECONFIG ??= "gnutls qemu yajl openvz vmware vbox esx lxc test remote \ | 132 | PACKAGECONFIG ??= "gnutls qemu openvz vmware vbox esx lxc test remote \ |
| 133 | libvirtd netcf udev python fuse firewalld libpcap \ | 133 | libvirtd netcf udev python fuse firewalld libpcap \ |
| 134 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ | 134 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ |
| 135 | ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \ | 135 | ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \ |
| @@ -150,7 +150,6 @@ PACKAGECONFIG:remove:armeb = "numactl" | |||
| 150 | # | 150 | # |
| 151 | PACKAGECONFIG[gnutls] = ",,,gnutls-bin" | 151 | PACKAGECONFIG[gnutls] = ",,,gnutls-bin" |
| 152 | PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu," | 152 | PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu," |
| 153 | PACKAGECONFIG[yajl] = "-Dyajl=enabled,-Dyajl=disabled,yajl,yajl" | ||
| 154 | PACKAGECONFIG[libxl] = "-Ddriver_libxl=enabled,-Ddriver_libxl=disabled,xen," | 153 | PACKAGECONFIG[libxl] = "-Ddriver_libxl=enabled,-Ddriver_libxl=disabled,xen," |
| 155 | PACKAGECONFIG[openvz] = "-Ddriver_openvz=enabled,-Ddriver_openvz=disabled,," | 154 | PACKAGECONFIG[openvz] = "-Ddriver_openvz=enabled,-Ddriver_openvz=disabled,," |
| 156 | PACKAGECONFIG[vmware] = "-Ddriver_vmware=enabled,-Ddriver_vmware=disabled,," | 155 | PACKAGECONFIG[vmware] = "-Ddriver_vmware=enabled,-Ddriver_vmware=disabled,," |
