Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2023-10-19 22:46:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new.1945 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Thu Oct 19 22:46:53 2023 rev:386 rq:1118744 version:9.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2023-10-04
22:30:38.445883089 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new.1945/libvirt.changes
2023-10-19 22:49:13.926594293 +0200
@@ -1,0 +2,11 @@
+Wed Oct 18 22:30:10 UTC 2023 - James Fehlig <jfeh...@suse.com>
+
+- supportconfig: Adapt plugin to modern supportconfig
+
+-------------------------------------------------------------------
+Tue Oct 17 22:54:48 UTC 2023 - James Fehlig <jfeh...@suse.com>
+
+- spec: Disable use of libnbd/nbdkit
+ bsc#1216274
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.4Q3xqf/_old 2023-10-19 22:49:14.882628968 +0200
+++ /var/tmp/diff_new_pack.4Q3xqf/_new 2023-10-19 22:49:14.886629113 +0200
@@ -52,6 +52,7 @@
%define with_numad 0%{!?_without_numad:0}
%define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
%define with_libssh 0%{!?_without_libssh:0}
+%define with_nbdkit 0%{!?_without_nbdkit:0}
# Set the OS / architecture specific special cases
@@ -206,8 +207,10 @@
BuildRequires: cyrus-sasl-devel
BuildRequires: ebtables
BuildRequires: iptables
-BuildRequires: libnbd-devel
BuildRequires: polkit >= 0.112
+%if %{with_nbdkit}
+BuildRequires: libnbd-devel
+%endif
# For mount/umount in FS driver
BuildRequires: util-linux
# For LVM drivers
@@ -601,9 +604,11 @@
%if %{with_numad}
Suggests: numad
%endif
+%if %{with_nbdkit}
Recommends: nbdkit
Recommends: nbdkit-curl-plugin
Recommends: nbdkit-ssh-plugin
+%endif
%description daemon-driver-qemu
The qemu driver plugin for the libvirtd daemon, providing
@@ -816,10 +821,8 @@
%build
%if %{with_qemu}
%define arg_qemu -Ddriver_qemu=enabled
- %define arg_libnbd -Dlibnbd=enabled
%else
%define arg_qemu -Ddriver_qemu=disabled
- %define arg_libnbd -Dlibnbd=disabled
%endif
%if %{with_openvz}
%define arg_openvz -Ddriver_openvz=enabled
@@ -903,6 +906,11 @@
%else
%define arg_numad -Dnumad=disabled
%endif
+%if %{with_nbdkit}
+ %define arg_nbdkit -Dnbdkit=enabled
+%else
+ %define arg_nbdkit -Dnbdkit=disabled
+%endif
%if %{with_apparmor}
%define arg_apparmor -Dapparmor=enabled -Dsecdriver_apparmor=enabled
%define arg_apparmor_profiles -Dapparmor_profiles=enabled
@@ -1013,6 +1021,7 @@
-Dstorage_vstorage=disabled \
%{?arg_numactl} \
%{?arg_numad} \
+ %{?arg_nbdkit} \
-Dcapng=enabled \
-Dfuse=enabled \
-Dnetcf=disabled \
@@ -1025,7 +1034,6 @@
-Dyajl=enabled \
%{?arg_sanlock} \
-Dlibpcap=enabled \
- %{?arg_libnbd} \
-Dlibnl=enabled \
-Daudit=enabled \
-Ddtrace=enabled \
++++++ libvirt-9.8.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-9.8.0.tar.xz
/work/SRC/openSUSE:Factory/.libvirt.new.1945/libvirt-9.8.0.tar.xz differ: char
15, line 1
++++++ libvirt-supportconfig ++++++
--- /var/tmp/diff_new_pack.4Q3xqf/_old 2023-10-19 22:49:14.962631870 +0200
+++ /var/tmp/diff_new_pack.4Q3xqf/_new 2023-10-19 22:49:14.966632015 +0200
@@ -5,7 +5,8 @@
# about libvirt
#############################################################
-RCFILE="/usr/lib/supportconfig/resources/scplugin.rc"
+RCFILE="/usr/lib/supportconfig/resources/supportconfig.rc"
+OF="output-libvirt.txt"
# conf files for all daemons reside in /etc/libvirt/. VM conf files
# and log files reside in hypervisor-specific locations.
@@ -16,7 +17,7 @@
if [ -s $RCFILE ]; then
if ! source $RCFILE; then
- echo "ERROR: Initializing resource file: $RCFILE" >&2
+ log_write $OF "ERROR: Initializing resource file: $RCFILE"
exit 1
fi
fi
@@ -25,33 +26,11 @@
thisrpm="$1"
if rpm -q "$thisrpm" >/dev/null 2>&1; then
- return 0
+ return 0
fi
return 1
}
-rpm_verify() {
- thisrpm="$1"
- local ret=0
-
- echo
- echo "#==[ Validating RPM ]=================================#"
- if rpm -q "$thisrpm" >/dev/null 2>&1; then
- echo "# rpm -V $thisrpm"
-
- if rpm -V "$thisrpm"; then
- echo "Status: Passed"
- else
- echo "Status: WARNING"
- fi
- else
- echo "package $thisrpm is not installed"
- ret=1
- fi
- echo
- return $ret
-}
-
if rpm_installed libvirt-daemon-driver-libxl; then
test -d /etc/libvirt/libxl &&
PERSISTENT_VM_CONF_FILES="$PERSISTENT_VM_CONF_FILES $(find -L
/etc/libvirt/libxl/ -type f | sort)"
test -d /run/libvirt/libxl && ACTIVE_VM_CONF_FILES="$ACTIVE_VM_CONF_FILES
$(find -L /run/libvirt/libxl/ -type f | sort)"
@@ -70,53 +49,48 @@
if rpm_installed libvirt-client && virsh capabilities > /dev/null 2>&1; then
- plugin_command "virsh version"
- plugin_command "virsh capabilities"
- plugin_command "virsh domcapabilities"
- plugin_command "virsh nodeinfo"
- plugin_command "virsh nodedev-list"
+ log_cmd $OF "virsh version"
+ log_cmd $OF "virsh capabilities"
+ log_cmd $OF "virsh domcapabilities"
+ log_cmd $OF "virsh nodeinfo"
+ log_cmd $OF "virsh nodedev-list"
# print all known domains on default URI
- plugin_command "virsh list --all"
- echo
+ log_cmd $OF "virsh list --all"
# dump configuration info of active domains on default URI
for DOM in $(virsh list --name)
do
- plugin_command "virsh dumpxml $DOM"
- plugin_command "virsh vcpuinfo $DOM"
- plugin_command "virsh dominfo $DOM"
- plugin_command "virsh domjobinfo $DOM"
- plugin_command "virsh dommemstat $DOM"
- plugin_command "virsh snapshot-list $DOM"
- echo
+ log_cmd $OF "virsh dumpxml $DOM"
+ log_cmd $OF "virsh vcpuinfo $DOM"
+ log_cmd $OF "virsh dominfo $DOM"
+ log_cmd $OF "virsh domjobinfo $DOM"
+ log_cmd $OF "virsh dommemstat $DOM"
+ log_cmd $OF "virsh snapshot-list $DOM"
done
# dump configuration info of inactive domains on default URI
for DOM in $(virsh list --name --inactive)
do
- plugin_command "virsh dumpxml $DOM"
- plugin_command "virsh snapshot-list $DOM"
- echo
+ log_cmd $OF "virsh dumpxml $DOM"
+ log_cmd $OF "virsh snapshot-list $DOM"
done
# dump active networks, interfaces and storage pools
- plugin_command "virsh net-list"
- plugin_command "virsh iface-list"
- plugin_command "virsh pool-list"
+ log_cmd $OF "virsh net-list"
+ log_cmd $OF "virsh iface-list"
+ log_cmd $OF "virsh pool-list"
fi
# dump libvirtd-related conf files
-pconf_files "$DAEMON_CONF_FILES"
+conf_files $OF "$DAEMON_CONF_FILES"
# dump persistent VM-related conf files
-pconf_files "$PERSISTENT_VM_CONF_FILES"
+conf_files $OF "$PERSISTENT_VM_CONF_FILES"
# dump active VM-related conf files
-pconf_files "$ACTIVE_VM_CONF_FILES"
+conf_files $OF "$ACTIVE_VM_CONF_FILES"
# dump hook conf files
test -d /etc/libvirt/hooks && FILES="$(find -L /etc/libvirt/hooks/ -type f |
sort)"
-pconf_files "$FILES"
+conf_files $OF "$FILES"
# dump all log files
-plog_files 0 "$DAEMON_LOG_FILES"
-
-echo "Done"
+log_files $OF 0 "$DAEMON_LOG_FILES"
