diff --git a/Add-loongarch-cpu-support.patch b/Add-loongarch-cpu-support.patch index 8d440fe79b0bc8106b9a1f992f7f1a29fc220443..525021753d206f847121e93e5c871eb747746938 100644 --- a/Add-loongarch-cpu-support.patch +++ b/Add-loongarch-cpu-support.patch @@ -34,9 +34,9 @@ index b122f02..ad74296 100644 src/cpu/cpu_map.c src/cpu/cpu_ppc64.c +src/cpu/cpu_loongarch.c + src/cpu/cpu_riscv64.c src/cpu/cpu_s390.c src/cpu/cpu_x86.c - src/datatypes.c diff --git a/src/conf/schemas/basictypes.rng b/src/conf/schemas/basictypes.rng index 2d6f1a2..053206d 100644 --- a/src/conf/schemas/basictypes.rng @@ -985,9 +985,9 @@ index 81b1b27..2ace17c 100644 +#define ARCH_IS_LOONGARCH(arch) ((arch) == VIR_ARCH_LOONGARCH64) + - typedef enum { - VIR_ARCH_LITTLE_ENDIAN, - VIR_ARCH_BIG_ENDIAN, + #define ARCH_IS_SH4(arch) ((arch) == VIR_ARCH_SH4 ||\ + (arch) == VIR_ARCH_SH4EB) + -- 2.27.0 diff --git a/Fix-the-compile-error.patch b/Fix-the-compile-error.patch deleted file mode 100644 index 9eceb754e88a96b9049b9e543d8ff2539e77e02d..0000000000000000000000000000000000000000 --- a/Fix-the-compile-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ec37c1993a9f1e752a5ce2f57275757a2e60a300 Mon Sep 17 00:00:00 2001 -From: xianglai li -Date: Mon, 23 Oct 2023 02:01:58 +0000 -Subject: [PATCH] Fix the compile error - -Fix compilation issues caused by changes to libssh2 -structure LIBSSH2_USERAUTH_KBDINT_PROMPT. - -Signed-off-by: xianglai li ---- - src/rpc/virnetsshsession.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c -index f848058..6045ccb 100644 ---- a/src/rpc/virnetsshsession.c -+++ b/src/rpc/virnetsshsession.c -@@ -217,7 +217,7 @@ virNetSSHKbIntCb(const char *name G_GNUC_UNUSED, - /* fill data structures for auth callback */ - for (i = 0; i < num_prompts; i++) { - char *prompt; -- prompt = g_strdup(prompts[i].text); -+ prompt = g_strdup((char *)prompts[i].text); - askcred[i].prompt = prompt; - - /* remove colon and trailing spaces from prompts, as default behavior --- -2.40.1 - diff --git a/libvirt-9.3.0.tar.xz b/libvirt-9.9.0.tar.xz similarity index 53% rename from libvirt-9.3.0.tar.xz rename to libvirt-9.9.0.tar.xz index b0037d5a4213faa1c651450671294ceec9fff299..0160e3eee50505f1e01e70c4ff6c5c7ab997be3b 100644 Binary files a/libvirt-9.3.0.tar.xz and b/libvirt-9.9.0.tar.xz differ diff --git a/libvirt.spec b/libvirt.spec index 40419c79515ede3dc8d76c906549416857ea6c10..ec2fe9afcfc67860a3b8f0f905f42bec3c557010 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %define arches_qemu_kvm x86_64 aarch64 loongarch64 @@ -151,7 +151,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 9.3.0 +Version: 9.9.0 Release: %{anolis_release}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -166,7 +166,6 @@ Patch0001: Add-loongarch-cpu-model-and-vendor-info.patch Patch0002: Config-some-capabilities-for-loongarch-virt-machine.patch Patch0003: Implement-the-method-of-getting-host-info-for-loonga.patch Patch0004: Add-bios-path-for-loongarch.patch -Patch0005: Fix-the-compile-error.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -205,41 +204,47 @@ BuildRequires: git BuildRequires: perl-interpreter BuildRequires: python3 %if %{with_libxl} -BuildRequires: xen-devel -%endif -BuildRequires: glib2-devel >= 2.56 -BuildRequires: libxml2-devel +BuildRequires: pkgconfig(xenlight) >= 4.9.0 +BuildRequires: pkgconfig(xenstore) +BuildRequires: pkgconfig(xentoollog) +BuildRequires: pkgconfig(xlutil) +%endif +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.56.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.1 BuildRequires: libxslt -BuildRequires: readline-devel -BuildRequires: bash-completion >= 2.0 +BuildRequires: pkgconfig(readline) >= 7.0 +BuildRequires: pkgconfig(bash-completion) BuildRequires: gettext -BuildRequires: libtasn1-devel -BuildRequires: gnutls-devel +BuildRequires: pkgconfig(gnutls) >= 3.6.0 BuildRequires: libattr-devel # For pool-build probing for existing pools -BuildRequires: libblkid-devel >= 2.17 +BuildRequires: pkgconfig(blkid) >= 2.17 # for augparse, optionally used in testing BuildRequires: augeas BuildRequires: systemd-devel >= 185 +BuildRequires: pkgconfig(libudev) >= 219 BuildRequires: systemd-rpm-macros -BuildRequires: libpciaccess-devel >= 0.10.9 -BuildRequires: yajl-devel +BuildRequires: pkgconfig(pciaccess) >= 0.10.0 +BuildRequires: pkgconfig(yajl) >= 2.0.3 %if %{with_sanlock} -BuildRequires: sanlock-devel >= 2.4 +BuildRequires: pkgconfig(libsanlock_client) %endif -BuildRequires: libpcap-devel >= 1.5.0 -BuildRequires: libnl3-devel -BuildRequires: libselinux-devel +BuildRequires: pkgconfig(libpcap) >= 1.5.0 +BuildRequires: pkgconfig(libnl-3.0) >= 3.0 +BuildRequires: pkgconfig(libnl-route-3.0) >= 3.0 +BuildRequires: pkgconfig(libselinux) BuildRequires: iptables BuildRequires: ebtables BuildRequires: module-init-tools -BuildRequires: cyrus-sasl-devel +BuildRequires: pkgconfig(libsasl2) >= 2.1.26 BuildRequires: polkit >= 0.112 # For mount/umount in FS driver BuildRequires: util-linux %if %{with_qemu} # For managing ACLs -BuildRequires: libacl-devel +BuildRequires: pkgconfig(libacl) # From QEMU RPMs BuildRequires: /usr/bin/qemu-img %endif @@ -249,41 +254,40 @@ BuildRequires: lvm2 BuildRequires: iscsi-initiator-utils %if %{with_storage_iscsi_direct} # For pool type=iscsi-direct -BuildRequires: libiscsi-devel +BuildRequires: pkgconfig(libiscsi) >= 1.18.0 %endif # For disk driver -BuildRequires: parted-devel +BuildRequires: pkgconfig(libparted) >= 1.8.0 # For Multipath support -BuildRequires: device-mapper-devel +BuildRequires: pkgconfig(devmapper) >= 1.0.0 %if %{with_storage_rbd} BuildRequires: librados-devel BuildRequires: librbd-devel %endif %if %{with_storage_gluster} -BuildRequires: glusterfs-api-devel >= 3.4.1 -BuildRequires: glusterfs-devel >= 3.4.1 +BuildRequires: pkgconfig(glusterfs-api) >= 3.4.1 %endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel %endif -BuildRequires: libcap-ng-devel >= 0.5.0 +BuildRequires: pkgconfig(libcap-ng) %if %{with_fuse} -BuildRequires: fuse-devel >= 2.8.6 +BuildRequires: pkgconfig(fuse3) >= 3.1.0 %endif %if %{with_libssh2} -BuildRequires: libssh2-devel >= 1.3.0 +BuildRequires: pkgconfig(libssh2) >= 1.3 %endif %if %{with_netcf} -BuildRequires: netcf-devel >= 0.2.2 +BuildRequires: pkgconfig(netcf) >= 0.1.8 %endif %if %{with_esx} -BuildRequires: libcurl-devel +BuildRequires: pkgconfig(libcurl) >= 7.19.1 %endif %if %{with_hyperv} -BuildRequires: libwsman-devel >= 2.6.3 +BuildRequires: pkgconfig(openwsman) >= 2.6.3 %endif -BuildRequires: audit-libs-devel +BuildRequires: pkgconfig(audit) # we need /usr/sbin/dtrace BuildRequires: systemtap-sdt-devel # For mount/umount in FS driver @@ -297,13 +301,13 @@ BuildRequires: scrub BuildRequires: numad %endif %if %{with_wireshark} -BuildRequires: wireshark-devel +BuildRequires: pkgconfig(wireshark) >= 2.6.0 %endif %if %{with_libssh} -BuildRequires: libssh-devel >= 0.8.1 +BuildRequires: pkgconfig(libssh) >= 0.8.1 %endif BuildRequires: rpcgen -BuildRequires: libtirpc-devel +BuildRequires: pkgconfig(libtirpc) # Needed for the firewalld_reload macro %if %{with_firewalld_zone} BuildRequires: firewalld-filesystem @@ -1073,6 +1077,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Ddriver_libvirtd=enabled \ -Ddriver_remote=enabled \ -Ddriver_test=enabled \ + -Dnbdkit=disabled \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ @@ -1135,8 +1140,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %meson_build %install -rm -fr %{buildroot} - export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) %meson_install @@ -2140,6 +2143,9 @@ exit 0 %changelog +* Thu Nov 02 2023 Funda Wang - 9.9.0-1 +- New version 9.9.0 + * Mon Aug 28 2023 lixianglai - 9.3.0-2 - Add loongarch support for libvirt