devel/libvirt: update to 6.6.0
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= libvirt
|
||||
PORTVERSION= 6.5.0
|
||||
PORTVERSION= 6.6.0
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://libvirt.org/sources/ \
|
||||
ftp://libvirt.org/libvirt/
|
||||
@@ -104,7 +104,7 @@ USE_PERL5= build
|
||||
USE_LDCONFIG= yes
|
||||
INSTALL_TARGET= install-strip
|
||||
TEST_TARGET= check
|
||||
SHLIB_VER= 0.6005.0
|
||||
SHLIB_VER= 0.6006.0
|
||||
PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
|
||||
PORTDOCS= *
|
||||
SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen
|
||||
@@ -154,7 +154,7 @@ post-install:
|
||||
@${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart
|
||||
@${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
.for doc in AUTHORS ChangeLog INSTALL NEWS.rst README.rst
|
||||
.for doc in AUTHORS ChangeLog NEWS.rst README.rst
|
||||
${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
|
||||
.endfor
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1593872233
|
||||
SHA256 (libvirt-6.5.0.tar.xz) = 4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182
|
||||
SIZE (libvirt-6.5.0.tar.xz) = 9407160
|
||||
TIMESTAMP = 1596469428
|
||||
SHA256 (libvirt-6.6.0.tar.xz) = 94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9
|
||||
SIZE (libvirt-6.6.0.tar.xz) = 9305836
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
--- src/cpu/cpu_arm.c.orig 2020-07-02 18:19:46 UTC
|
||||
+++ src/cpu/cpu_arm.c
|
||||
@@ -22,7 +22,9 @@
|
||||
|
||||
#include <config.h>
|
||||
#if defined(__aarch64__)
|
||||
-# include <asm/hwcap.h>
|
||||
+# if defined(__linux__)
|
||||
+# include <asm/hwcap.h>
|
||||
+# endif
|
||||
# include <sys/auxv.h>
|
||||
#endif
|
||||
|
||||
@@ -518,11 +520,13 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data)
|
||||
int cpu_feature_index = 0;
|
||||
size_t i;
|
||||
|
||||
+#if defined(__linux__)
|
||||
if (!(getauxval(AT_HWCAP) & HWCAP_CPUID)) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("CPUID registers unavailable"));
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* read the cpuid data from MIDR_EL1 register */
|
||||
asm("mrs %0, MIDR_EL1" : "=r" (cpuid));
|
||||
@@ -533,7 +537,11 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data)
|
||||
/* parse the coresponding vendor_id bits */
|
||||
data->vendor_id = (cpuid >> 24) & 0xff;
|
||||
|
||||
+#if defined(__linux__)
|
||||
hwcaps = getauxval(AT_HWCAP);
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(u_long));
|
||||
+#endif
|
||||
VIR_DEBUG("CPU flags read from register: 0x%016lx", hwcaps);
|
||||
|
||||
features = g_new0(char *, MAX_CPU_FLAGS + 1);
|
||||
@@ -2,6 +2,7 @@ bin/virsh
|
||||
bin/virt-admin
|
||||
bin/virt-host-validate
|
||||
bin/virt-pki-validate
|
||||
%%QEMU%%bin/virt-qemu-run
|
||||
bin/virt-xml-validate
|
||||
%%BHYVE%%sbin/virtbhyved
|
||||
sbin/virtnetworkd
|
||||
@@ -15,6 +16,7 @@ man/man1/virsh.1.gz
|
||||
man/man1/virt-admin.1.gz
|
||||
man/man1/virt-host-validate.1.gz
|
||||
man/man1/virt-pki-validate.1.gz
|
||||
%%QEMU%%man/man1/virt-qemu-run.1.gz
|
||||
man/man1/virt-xml-validate.1.gz
|
||||
man/man7/virkeycode-atset1.7.gz
|
||||
man/man7/virkeycode-atset2.7.gz
|
||||
|
||||
Reference in New Issue
Block a user