- Devel - libvirt List Archives

[libvirt] [dockerfiles PATCH] Add CentOS 8 Dockerfiles
by Andrea Bolognani 12 Dec '19

12 Dec '19

The corresponding libvirt-jenkins-ci commit is b7cd4b07a064. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. Text diff follows. buildenv-libosinfo-centos-8.zip | Bin 0 -> 578 bytes buildenv-libvirt-centos-8.zip | Bin 0 -> 781 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 buildenv-libosinfo-centos-8.zip create mode 100644 buildenv-libvirt-centos-8.zip diff --git a/buildenv-libosinfo-centos-8.zip b/buildenv-libosinfo-centos-8.zip new file mode 100644 index 0000000..e739059 --- /dev/null +++ b/buildenv-libosinfo-centos-8.zip @@ -0,0 +1,55 @@ +FROM centos:centos8 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled PowerTools -y && \ + dnf install -y epel-release && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + check-devel \ + chrony \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + gobject-introspection-devel \ + gtk-doc \ + hwdata \ + intltool \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + rpm-build \ + screen \ + strace \ + sudo \ + vala \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y + +ENV LANG "en_US.UTF-8" diff --git a/buildenv-libvirt-centos-8.zip b/buildenv-libvirt-centos-8.zip new file mode 100644 index 0000000..5410201 --- /dev/null +++ b/buildenv-libvirt-centos-8.zip @@ -0,0 +1,93 @@ +FROM centos:centos8 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled PowerTools -y && \ + dnf install -y epel-release && \ + dnf install -y \ + audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + ca-certificates \ + chrony \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + ebtables \ + fuse-devel \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iproute-tc \ + iscsi-initiator-utils \ + kmod \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + lvm2 \ + make \ + meson \ + ncurses-devel \ + net-tools \ + netcf-devel \ + nfs-utils \ + ninja-build \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + python3 \ + python3-docutils \ + python3-flake8 \ + python3-setuptools \ + qemu-img \ + radvd \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + strace \ + sudo \ + systemtap-sdt-devel \ + vim \ + xfsprogs-devel \ + yajl-devel && \ + dnf autoremove -y && \ + dnf clean all -y + +ENV LANG "en_US.UTF-8" -- 2.23.0

1 0

[libvirt] [dockerfiles PATCH] Refresh Dockerfiles after dropping Python 2 support
by Andrea Bolognani 12 Dec '19

12 Dec '19

The corresponding libvirt-jenkins-ci commit is 8c30b5e1782b. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. Text diff follows. buildenv-libosinfo-centos-7.zip | Bin 575 -> 572 bytes buildenv-libvirt-centos-7.zip | Bin 765 -> 761 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip index c9dd791..b91f3aa 100644 --- a/buildenv-libosinfo-centos-7.zip +++ b/buildenv-libosinfo-centos-7.zip @@ -36,7 +36,6 @@ RUN yum update -y && \ patch \ perl \ pkgconfig \ - python2-setuptools \ python3 \ python3-pip \ python3-setuptools \ diff --git a/buildenv-libvirt-centos-7.zip b/buildenv-libvirt-centos-7.zip index 5fc4f71..4e9c3db 100644 --- a/buildenv-libvirt-centos-7.zip +++ b/buildenv-libvirt-centos-7.zip @@ -67,7 +67,6 @@ RUN yum update -y && \ perl \ pkgconfig \ polkit \ - python2-setuptools \ python3 \ python3-pip \ python3-setuptools \ -- 2.23.0

1 0

[libvirt] [jenkins-ci PATCH] Run the virt-manager test suite on FreeBSD
by Andrea Bolognani 11 Dec '19

11 Dec '19

The bug affecting python3-libxml2 has been fixed in FreeBSD, and virt-manager itself has recently tweaked its test suite so that it works correctly on that platform as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/build/projects/virt-manager.yml | 6 +++--- jenkins/projects/virt-manager.yaml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index 9184a74..9286931 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -23,9 +23,6 @@ $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX - include: '{{ playbook_base }}/jobs/python-distutils-check-job.yml' vars: - # libxml2's Python 3 bindings don't work properly on FreeBSD, - # so skip the test suite there for the time being. See - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - libvirt-debian-9 - libvirt-debian-10 @@ -33,6 +30,9 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 + - libvirt-freebsd-current - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml index 4524831..b027f21 100644 --- a/jenkins/projects/virt-manager.yaml +++ b/jenkins/projects/virt-manager.yaml @@ -22,15 +22,14 @@ $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX - python-distutils-check-job: parent_jobs: 'virt-manager-build' - # libxml2's Python 3 bindings don't work properly on FreeBSD, - # so skip the test suite there for the time being. See - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 - python-distutils-rpm-job: parent_jobs: 'virt-manager-check' machines: -- 2.23.0

2 1

[libvirt] [PATCH] docs: ensure outputfile is deleted if rst2html/rst2man fail
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

This avoids leaving a zero length or partially generated output file on errors. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index eb8de80b9c..9a1f7a6117 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -259,21 +259,21 @@ man8_MANS = $(manpages8_rst:%.rst=%.8) grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } %.7: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } %.8: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } manpages/virkeycode-%.rst: $(top_srcdir)/src/keycodemapdb/data/keymaps.csv \ $(top_srcdir)/src/keycodemapdb/tools/keymap-gen Makefile.am @@ -414,11 +414,11 @@ manpages/%.html.in: manpages/%.rst grep -v '^:Manual ' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2HTML) > $@ + $(RST2HTML) > $@ || { rm $@ && exit 1; } %.html.in: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(RST2HTML) $< > $@ + $(RST2HTML) $< > $@ || { rm $@ && exit 1; } %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ $(acl_generated) -- 2.23.0

2 3

[libvirt] [PATCH] doc: vtpm only support secrets by UUID at this point
by marcandre.lureau＠redhat.com 11 Dec '19

11 Dec '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Support by usage name can be considered separately (with a 'usage' attribute?). Cc: Stefan Berger <stefanb(a)linux.ibm.com> Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/formatsecret.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index 8d0630a7c3..8f5383cf64 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -334,8 +334,8 @@ Secret value set of the vTPM. The <code><usage type='vtpm'></code> element must contain a single <code>name</code> element that specifies a usage name - for the secret. The vTPM secret can then be used by UUID or by - this usage name via the <code><encryption></code> element of + for the secret. The vTPM secret can then be used by UUID + via the <code><encryption></code> element of a <a href="formatdomain.html#elementsTpm">tpm</a> when using an emulator. <span class="since">Since 5.6.0</span>. The following is an example -- 2.24.0.308.g228f53135a

4 3

[libvirt] [PATCH] travis: Update name for Ubuntu 18.04 image
by Andrea Bolognani 11 Dec '19

11 Dec '19

The corresponding libvirt-jenkins-ci commit is f289e64a5fd9. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b47f54553e..44ff5e9898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - services: - docker env: - - IMAGE="ubuntu-18" + - IMAGE="ubuntu-1804" - MAKE_ARGS="syntax-check distcheck" script: - make -C ci/ ci-build@$IMAGE CI_MAKE_ARGS="$MAKE_ARGS" -- 2.23.0

1 0

[libvirt] [PATCH] qemu: keep capabilities when running QEMU as root
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

When QEMU uid/gid is set to non-root this is pointless as if we just used a regular setuid/setgid call, the process will have all its capabilities cleared anyway by the kernel. When QEMU uid/gid is set to root, this is almost (always?) never what people actually want. People make QEMU run as root in order to access some privileged resource that libvirt doesn't support yet and this often requires capabilities. As a result they have to go find the qemu.conf param to turn this off. This is not viable for libguestfs - they want to control everything via the XML security label to request running as root regardless of the qemu.conf settings for user/group. Clearing capabilities was implemented originally because there was a proposal in Fedora to change permissions such that root, with no capabilities would not be able to compromise the system. ie a locked down root account. This never went anywhere though, and as a result clearing capabilities when running as root does not really get us any security benefit AFAICT. The root user can easily do something like create a cronjob, which will then faithfully be run with full capabilities, trivially bypassing the restriction we place. IOW, our clearing of capabilities is both useless from a security POV, and breaks valid use cases when people need to run as root. This removes the clear_emulator_capabilities configuration option from qemu.conf, and always runs QEMU with capabilities when root. The behaviour when non-root is unchanged. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/drvqemu.html.in | 46 +++++++++++------------------- src/qemu/libvirtd_qemu.aug | 8 +++++- src/qemu/qemu.conf | 11 ------- src/qemu/qemu_conf.c | 4 --- src/qemu/qemu_conf.h | 1 - src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_process.c | 5 ---- src/qemu/test_libvirtd_qemu.aug.in | 1 - 8 files changed, 25 insertions(+), 54 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 294117ee1f..8beb28655c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -187,41 +187,29 @@ chmod o+x /path/to/directory </li> </ul> - <h3><a id="securitycap">Linux process capabilities</a></h3> - <p> - The libvirt QEMU driver has a build time option allowing it to use - the <a href="http://people.redhat.com/sgrubb/libcap-ng/index.html">libcap-ng</a> - library to manage process capabilities. If this build option is - enabled, then the QEMU driver will use this to ensure that all - process capabilities are dropped before executing a QEMU virtual - machine. Process capabilities are what gives the 'root' account - its high power, in particular the CAP_DAC_OVERRIDE capability - is what allows a process running as 'root' to access files owned - by any user. + The libvirt maintainers <strong>strongly recommend against</strong> + running QEMU as the root user/group. This should not be required + in most supported usage scenarios, as libvirt will generally do the + right thing to grant QEMU access to files it is permitted to + use when it is running non-root. </p> + <h3><a id="securitycap">Linux process capabilities</a></h3> + <p> - If the QEMU driver is configured to run virtual machines as non-root, - then they will already lose all their process capabilities at time - of startup. The Linux capability feature is thus aimed primarily at - the scenario where the QEMU processes are running as root. In this - case, before launching a QEMU virtual machine, libvirtd will use - libcap-ng APIs to drop all process capabilities. It is important - for administrators to note that this implies the QEMU process will - <strong>only</strong> be able to access files owned by root, and - not files owned by any other user. + In versions of libvirt prior to 6.0.0, even if QEMU was configured + to run as the root user / group, libvirt would strip all process + capabilities. This meant that QEMU could only read/write files + owned by root, or with open permissions. In reality, stripping + capabilities did not have any security benefit, as it was trivial + to get commands to run in another context with full capabilities, + for example, by creating a cronjob. </p> - <p> - Thus, if a vendor / distributor has configured their libvirt package - to run as 'qemu' by default, a number of changes will be required - before an administrator can change a host to run guests as root. - In particular it will be necessary to change ownership on the - directories <code>/var/run/libvirt/qemu/</code>, - <code>/var/lib/libvirt/qemu/</code> and - <code>/var/cache/libvirt/qemu/</code> back to root, in addition - to changing the <code>/etc/libvirt/qemu.conf</code> settings. + Thus since 6.0.0, if QEMU is running as root, it will keep all + process capabilities. Behaviour when QEMU is running non-root + is unchanged, it still has no capabilities. </p> <h3><a id="securityselinux">SELinux basic confinement</a></h3> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 7d7844dc09..86bea2a32a 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -86,7 +86,6 @@ module Libvirtd_qemu = | bool_entry "auto_start_bypass_cache" let process_entry = str_entry "hugetlbfs_mount" - | bool_entry "clear_emulator_capabilities" | str_entry "bridge_helper" | str_entry "pr_helper" | str_entry "slirp_helper" @@ -129,6 +128,12 @@ module Libvirtd_qemu = let swtpm_entry = str_entry "swtpm_user" | str_entry "swtpm_group" + (* Entries that used to exist in the config which are now + * deleted. We keep on parsing them so we don't break + * ability to parse old configs after upgrade + *) + let obsolete_entry = bool_entry "clear_emulator_capabilities" + let capability_filters_entry = str_array_entry "capability_filters" (* Each entry in the config is one of the following ... *) @@ -153,6 +158,7 @@ module Libvirtd_qemu = | nbd_entry | swtpm_entry | capability_filters_entry + | obsolete_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 7a056b037e..b6805ffc41 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -583,17 +583,6 @@ #bridge_helper = "/usr/libexec/qemu-bridge-helper" - -# If clear_emulator_capabilities is enabled, libvirt will drop all -# privileged capabilities of the QEMU/KVM emulator. This is enabled by -# default. -# -# Warning: Disabling this option means that a compromised guest can -# exploit the privileges and possibly do damage to the host. -# -#clear_emulator_capabilities = 1 - - # If enabled, libvirt will have QEMU set its process name to # "qemu:VM_NAME", where VM_NAME is the name of the VM. The QEMU # process will appear as "qemu:VM_NAME" in process listings and diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 30637b21ac..0e14d60bc9 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -234,8 +234,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->prHelperName = g_strdup(QEMU_PR_HELPER); cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); - cfg->clearEmulatorCapabilities = true; - cfg->securityDefaultConfined = true; cfg->securityRequireConfined = false; @@ -602,8 +600,6 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, } } - if (virConfGetValueBool(conf, "clear_emulator_capabilities", &cfg->clearEmulatorCapabilities) < 0) - return -1; if (virConfGetValueString(conf, "bridge_helper", &cfg->bridgeHelperName) < 0) return -1; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 95b33a1093..a641bbd983 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -161,7 +161,6 @@ struct _virQEMUDriverConfig { bool relaxedACS; bool vncAllowHostAudio; bool nogfxAllowHostAudio; - bool clearEmulatorCapabilities; bool setProcessName; unsigned int maxProcesses; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 470d342afc..0dadca4894 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9345,8 +9345,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, bool custom_hypervisor_feat = false; if (virQEMUDriverIsPrivileged(driver) && - (!cfg->clearEmulatorCapabilities || - cfg->user == 0 || + (cfg->user == 0 || cfg->group == 0)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, logCtxt); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 75ee3893c6..979ea36f0f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6811,11 +6811,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuDomainCreateNamespace(driver, vm) < 0) goto cleanup; - VIR_DEBUG("Clear emulator capabilities: %d", - cfg->clearEmulatorCapabilities); - if (cfg->clearEmulatorCapabilities) - virCommandClearCaps(cmd); - VIR_DEBUG("Setting up raw IO"); if (qemuProcessSetupRawIO(driver, vm, cmd) < 0) goto cleanup; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index b9cf8d6688..dd90edf687 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -72,7 +72,6 @@ module Test_libvirtd_qemu = { "auto_start_bypass_cache" = "0" } { "hugetlbfs_mount" = "/dev/hugepages" } { "bridge_helper" = "/usr/libexec/qemu-bridge-helper" } -{ "clear_emulator_capabilities" = "1" } { "set_process_name" = "1" } { "max_processes" = "0" } { "max_files" = "0" } -- 2.21.0

2 3

[libvirt] [jenkins-ci PATCH v2 0/3] Enable building of the VZ driver on CentOS 7
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

The VZ driver in libvirt periodically gets broken by refactoring in libvirt. This is not noticed either before or after merge because none of our CI tests nor common developer build hosts includ the deps needed for the VZ driver. The OpenVZ project, however, does provide builds of the required packages for RHEL-7. We can use these packages in our CentOS 7 CI VMs to enable build testing of the VZ driver. This closes the only hole we have in driver build coverage for CI. Changed in v2: - Enable GPG verification - Use older repo avoid temporary deps problem - Setup repos in dockerfile too. Daniel P. Berrangé (3): guests: add openvz repository on CentOS 7 guests: define mapping for the libprlsdk package guests: add libprlsdk package to libvirt project guests/lcitool | 22 ++++++++++++++++ guests/playbooks/update/tasks/base.yml | 25 +++++++++++++++++++ guests/playbooks/update/templates/openvz.key | 20 +++++++++++++++ .../playbooks/update/templates/openvz.repo.j2 | 9 +++++++ guests/vars/mappings.yml | 4 +++ guests/vars/projects/libvirt.yml | 1 + 6 files changed, 81 insertions(+) create mode 100644 guests/playbooks/update/templates/openvz.key create mode 100644 guests/playbooks/update/templates/openvz.repo.j2 -- 2.23.0

2 7

[libvirt] [dockerfiles PATCH] Rename Ubuntu Dockerfiles
by Andrea Bolognani 11 Dec '19

11 Dec '19

The corresponding libvirt-jenkins-ci commit is f289e64a5fd9. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. ...ntu-16.zip => buildenv-libosinfo-ubuntu-1604.zip | Bin ...ntu-18.zip => buildenv-libosinfo-ubuntu-1804.zip | Bin ...buntu-16.zip => buildenv-libvirt-ubuntu-1604.zip | Bin ...buntu-18.zip => buildenv-libvirt-ubuntu-1804.zip | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename buildenv-libosinfo-ubuntu-16.zip => buildenv-libosinfo-ubuntu-1604.zip (100%) rename buildenv-libosinfo-ubuntu-18.zip => buildenv-libosinfo-ubuntu-1804.zip (100%) rename buildenv-libvirt-ubuntu-16.zip => buildenv-libvirt-ubuntu-1604.zip (100%) rename buildenv-libvirt-ubuntu-18.zip => buildenv-libvirt-ubuntu-1804.zip (100%) diff --git a/buildenv-libosinfo-ubuntu-16.zip b/buildenv-libosinfo-ubuntu-1604.zip similarity index 100% rename from buildenv-libosinfo-ubuntu-16.zip rename to buildenv-libosinfo-ubuntu-1604.zip diff --git a/buildenv-libosinfo-ubuntu-18.zip b/buildenv-libosinfo-ubuntu-1804.zip similarity index 100% rename from buildenv-libosinfo-ubuntu-18.zip rename to buildenv-libosinfo-ubuntu-1804.zip diff --git a/buildenv-libvirt-ubuntu-16.zip b/buildenv-libvirt-ubuntu-1604.zip similarity index 100% rename from buildenv-libvirt-ubuntu-16.zip rename to buildenv-libvirt-ubuntu-1604.zip diff --git a/buildenv-libvirt-ubuntu-18.zip b/buildenv-libvirt-ubuntu-1804.zip similarity index 100% rename from buildenv-libvirt-ubuntu-18.zip rename to buildenv-libvirt-ubuntu-1804.zip -- 2.23.0

1 0

[libvirt] [PATCH] spec: fix indentation fix
by Ján Tomko 11 Dec '19

11 Dec '19

The RPM tags must not be indented. Fixes: 6b8ab20f9b9b1a9383bd2cb9a075f57beb196c1c Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- libvirt.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Pushed as a build breaker fix. diff --git a/libvirt.spec.in b/libvirt.spec.in index 4d75fbecaf..bd08222527 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -336,11 +336,11 @@ BuildRequires: device-mapper-devel BuildRequires: xfsprogs-devel %if %{with_storage_rbd} %if 0%{?fedora} || 0%{?rhel} > 7 - BuildRequires: librados-devel - BuildRequires: librbd-devel +BuildRequires: librados-devel +BuildRequires: librbd-devel %else - BuildRequires: librados2-devel - BuildRequires: librbd1-devel +BuildRequires: librados2-devel +BuildRequires: librbd1-devel %endif %endif %if %{with_storage_gluster} -- 2.21.0

1 0