diff options
3 files changed, 6 insertions, 19 deletions
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc index 20c9f69b..884a0fc0 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] = "00efb9a781087668512d6a002eb9cd136e44ff8701ac6793cc13b6fdc6d9ef8f" | 23 | SRC_URI[libvirt_python.sha256sum] = "7335de498e3fdb2c96f68ee4065d44ab0404b79923d6316819a4b5f963f80125" |
| 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 c68e05b9..1f0cbad8 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,10 +25,10 @@ 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: git/meson.build | 28 | Index: libvirt-v11.4.0+git/meson.build |
| 29 | =================================================================== | 29 | =================================================================== |
| 30 | --- git.orig/meson.build | 30 | --- libvirt-v11.4.0+git.orig/meson.build |
| 31 | +++ git/meson.build | 31 | +++ libvirt-v11.4.0+git/meson.build |
| 32 | @@ -38,8 +38,8 @@ | 32 | @@ -38,8 +38,8 @@ |
| 33 | conf = configuration_data() | 33 | conf = configuration_data() |
| 34 | 34 | ||
| @@ -40,16 +40,3 @@ Index: git/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 | @@ -1830,9 +1830,9 @@ | ||
| 44 | use_storage = true | ||
| 45 | |||
| 46 | conf.set('WITH_STORAGE_FS', 1) | ||
| 47 | - conf.set_quoted('MOUNT', mount_prog.full_path()) | ||
| 48 | - conf.set_quoted('UMOUNT', umount_prog.full_path()) | ||
| 49 | - conf.set_quoted('MKFS', mkfs_prog.full_path()) | ||
| 50 | + conf.set_quoted('MOUNT', '/usr/bin/mount') | ||
| 51 | + conf.set_quoted('UMOUNT', '/usr/bin/umount') | ||
| 52 | + conf.set_quoted('MKFS', '/usr/sbin/mkfs') | ||
| 53 | endif | ||
| 54 | endif | ||
| 55 | |||
diff --git a/recipes-extended/libvirt/libvirt_git.bb b/recipes-extended/libvirt/libvirt_git.bb index 6557af17..6ef4b562 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 = "9cd06737487c8ee311f71b7288c46a5cc70a700a" | 27 | SRCREV_libvirt = "8ba3d94995cd044ca7836cb937b14cd47eb0b868" |
| 28 | 28 | ||
| 29 | LIBVIRT_VERSION = "11.1.0" | 29 | LIBVIRT_VERSION = "11.4.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 \ |
