[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 13 commits: Drop...

Andrea Bolognani (@abologna) gitlab at salsa.debian.org
Thu Jul 29 21:01:48 BST 2021 


Andrea Bolognani pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
137500ed by Christian Ehrhardt at 2021-07-05T10:39:29+02:00
Drop d/p/backport/apparmor-let-image-label-setting-loop-over-backing-files.patch [d51ad000 in 7.1.0]

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
d1420c0b by Christian Ehrhardt at 2021-07-05T10:39:34+02:00
Drop d/p/backport/meson-Fix-cross-building-of-dtrace-probes.patch [44b34813 in 7.1.0]

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
a4563d1a by Christian Ehrhardt at 2021-07-05T10:39:34+02:00
Drop d/p/revert/systemd-Revert-remote-Add-libvirtd-dependency-to-virt-gue.patch [32c5e432 in 7.1.0]

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
e6c16819 by Christian Ehrhardt at 2021-07-05T10:39:34+02:00
d/libvirt-clients.install: completions no more are symlinked to vsh, drop it

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
19701a66 by Christian Ehrhardt at 2021-07-05T10:39:35+02:00
not-installed: split daemon man pages are no yet installed

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
fca58816 by Christian Ehrhardt at 2021-07-05T10:39:35+02:00
d/rules: disable vstorage backend

This backend is only really meaningful to openVZ which isn't really
a thing on Debian. But since [1] the binary checks were converted from
build to runtime and due to that it now would build automatically.

[1]: https://libvirt.org/git/?p=libvirt.git;a=commit;h=6503e1a0

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
c3be22a2 by Christian Ehrhardt at 2021-07-05T14:30:08+02:00
d/libvirt0.symbols: bump symbol versions for 7.4.0

7.4 didn't add symbols but 7.1/7.2/7.3 did.

+ virDomainGetMessages at LIBVIRT_7.1.0 7.4.0-1
+ virDomainStartDirtyRateCalc at LIBVIRT_7.2.0 7.4.0-1
+ virNodeDeviceCreate at LIBVIRT_7.3.0 7.4.0-1
+ virNodeDeviceDefineXML at LIBVIRT_7.3.0 7.4.0-1
+ virNodeDeviceUndefine at LIBVIRT_7.3.0 7.4.0-1

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
0fc077f0 by Christian Ehrhardt at 2021-07-05T14:30:09+02:00
refresh d/p/debian/Set-defaults-for-zfs-tools.patch for v7.5.0

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
5bc11600 by Christian Ehrhardt at 2021-07-05T15:57:24+02:00
update d/p/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch: to detect XDR functions from glibc

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
3f6ce792 by Christian Ehrhardt at 2021-07-05T15:57:28+02:00
changelog: Create entry for 7.5.0-1

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
fd5ab24a by Christian Ehrhardt at 2021-07-05T15:57:29+02:00
d/rules: use apparmor_profiles=enabled instead of the now rejected value true

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
7f589a42 by Christian Ehrhardt at 2021-07-05T15:57:29+02:00
d/rules: enable more features explicitly

Detection is now weaker, _libvirtd / _remote are needed to build.
_test follows the upstream change b4ee29e1cb that did the same for
.spec files.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
ac145fd9 by Christian Ehrhardt at 2021-07-05T15:57:29+02:00
d/rules: disable the new Cloud Hypervisor driver

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -


11 changed files:

- debian/changelog
- debian/libvirt-clients.install
- debian/libvirt0.symbols
- debian/not-installed
- − debian/patches/backport/apparmor-let-image-label-setting-loop-over-backing-files.patch
- − debian/patches/backport/meson-Fix-cross-building-of-dtrace-probes.patch
- debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
- debian/patches/debian/Set-defaults-for-zfs-tools.patch
- − debian/patches/revert/systemd-Revert-remote-Add-libvirtd-dependency-to-virt-gue.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libvirt (7.5.0-1) UNRELEASED; urgency=medium
+
+  * Team upload
+
+ -- Christian Ehrhardt <christian.ehrhardt at canonical.com>  Tue, 29 Jun 2021 08:48:53 +0200
+
 libvirt (7.0.0-3) unstable; urgency=medium
 
   * Team upload


=====================================
debian/libvirt-clients.install
=====================================
@@ -7,7 +7,6 @@ usr/bin/virt-pki-validate
 usr/bin/virt-xml-validate
 usr/share/bash-completion/completions/virsh
 usr/share/bash-completion/completions/virt-admin
-usr/share/bash-completion/completions/vsh
 usr/share/man/man1/virsh.1
 usr/share/man/man1/virt-admin.1
 usr/share/man/man1/virt-host-validate.1


=====================================
debian/libvirt0.symbols
=====================================
@@ -126,7 +126,11 @@ libvirt.so.0 libvirt0 #MINVER#
  *@LIBVIRT_5.10.0 6.0.0~rc1
  *@LIBVIRT_6.0.0 6.0.0~rc1
  *@LIBVIRT_6.10.0 7.0.0
- *@LIBVIRT_PRIVATE_7.0.0 7.0.0
+ *@LIBVIRT_7.1.0 7.5.0
+ *@LIBVIRT_7.2.0 7.5.0
+ *@LIBVIRT_7.3.0 7.5.0
+ *@LIBVIRT_7.4.0 7.5.0
+ *@LIBVIRT_PRIVATE_7.5.0 7.5.0
 
 libvirt-qemu.so.0 libvirt0 #MINVER#
  *@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -148,4 +152,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
  *@LIBVIRT_ADMIN_1.3.0 1.2.18
  *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
  *@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_7.0.0 7.0.0
+ *@LIBVIRT_ADMIN_PRIVATE_7.4.0 7.5.0


=====================================
debian/not-installed
=====================================
@@ -103,3 +103,14 @@ usr/share/augeas/lenses/virtsecretd.aug
 usr/share/augeas/lenses/virtstoraged.aug
 usr/share/augeas/lenses/virtvboxd.aug
 usr/share/augeas/lenses/virtxend.aug
+usr/share/man/man8/virtinterfaced.8
+usr/share/man/man8/virtlxcd.8
+usr/share/man/man8/virtnetworkd.8
+usr/share/man/man8/virtnodedevd.8
+usr/share/man/man8/virtnwfilterd.8
+usr/share/man/man8/virtproxyd.8
+usr/share/man/man8/virtqemud.8
+usr/share/man/man8/virtsecretd.8
+usr/share/man/man8/virtstoraged.8
+usr/share/man/man8/virtvboxd.8
+usr/share/man/man8/virtxend.8


=====================================
debian/patches/backport/apparmor-let-image-label-setting-loop-over-backing-files.patch deleted
=====================================
@@ -1,81 +0,0 @@
-From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
-Date: Wed, 13 Jan 2021 12:32:18 +0100
-Subject: apparmor: let image label setting loop over backing files
-
-When adding a rule for an image file and that image file has a chain
-of backing files then we need to add a rule for each of those files.
-
-To get that iterate over the backing file chain the same way as
-dac/selinux already do and add a label for each.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/118
-
-Reviewed-by: Peter Krempa <pkrempa at redhat.com>
-Reviewed-by: Jim Fehlig <jfehlig at suse.com>
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
-(cherry picked from commit d51ad0008dc2df0257f69e767ab3e3c5fd1457ff)
----
- src/security/security_apparmor.c | 39 +++++++++++++++++++++++++++------------
- 1 file changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
-index 1b035cc..f547601 100644
---- a/src/security/security_apparmor.c
-+++ b/src/security/security_apparmor.c
-@@ -755,22 +755,13 @@ AppArmorRestoreInputLabel(virSecurityManagerPtr mgr,
- 
- /* Called when hotplugging */
- static int
--AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
--                              virDomainDefPtr def,
--                              virStorageSourcePtr src,
--                              virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED)
-+AppArmorSetSecurityImageLabelInternal(virSecurityManagerPtr mgr,
-+                                      virDomainDefPtr def,
-+                                      virStorageSourcePtr src)
- {
--    virSecurityLabelDefPtr secdef;
-     g_autofree char *vfioGroupDev = NULL;
-     const char *path;
- 
--    secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME);
--    if (!secdef || !secdef->relabel)
--        return 0;
--
--    if (!secdef->imagelabel)
--        return 0;
--
-     if (src->type == VIR_STORAGE_TYPE_NVME) {
-         const virStorageSourceNVMeDef *nvme = src->nvme;
- 
-@@ -796,6 +787,30 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
-     return reload_profile(mgr, def, path, true);
- }
- 
-+static int
-+AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
-+                              virDomainDefPtr def,
-+                              virStorageSourcePtr src,
-+                              virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED)
-+{
-+    virSecurityLabelDefPtr secdef;
-+    virStorageSourcePtr n;
-+
-+    secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME);
-+    if (!secdef || !secdef->relabel)
-+        return 0;
-+
-+    if (!secdef->imagelabel)
-+        return 0;
-+
-+    for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
-+        if (AppArmorSetSecurityImageLabelInternal(mgr, def, n) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
- static int
- AppArmorSecurityVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED,
-                        virDomainDefPtr def)


=====================================
debian/patches/backport/meson-Fix-cross-building-of-dtrace-probes.patch deleted
=====================================
@@ -1,80 +0,0 @@
-From: Helmut Grohne <helmut at subdivi.de>
-Date: Tue, 19 Jan 2021 00:08:23 +0100
-Subject: meson: Fix cross-building of dtrace probes
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-dtrace invokes the C compiler, so when cross-building we need
-to make sure that $CC is set in the environment and that it
-points to the cross-compiler rather than the native one.
-
-Until https://github.com/mesonbuild/meson/issues/266
-is addressed, the workaround is to call dtrace via env(1).
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980334
-
-Signed-off-by: Helmut Grohne <helmut at subdivi.de>
-Reviewed-by: Andrea Bolognani <abologna at redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>
-(cherry picked from commit 44b348134cd6724e35984a553f8d54d27aa22711)
----
- meson.build          | 1 +
- src/meson.build      | 4 ++--
- src/qemu/meson.build | 4 ++--
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index b5164f6..5607898 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2029,6 +2029,7 @@ if host_machine.system() == 'linux'
-   if dtrace_prog.found()
-     conf.set('WITH_DTRACE_PROBES', 1)
-   endif
-+  dtrace_command = [ 'env', 'CC=' + ' '.join(meson.get_compiler('c').cmd_array()), dtrace_prog ]
- endif
- 
- if not get_option('host_validate').disabled() and host_machine.system() != 'windows'
-diff --git a/src/meson.build b/src/meson.build
-index 7c47821..56e71f4 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -60,14 +60,14 @@ if conf.has('WITH_DTRACE_PROBES')
-     out_h,
-     input: infile,
-     output: out_h,
--    command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
-+    command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
-   )
- 
-   dtrace_gen_objects += custom_target(
-     out_o,
-     input: infile,
-     output: out_o,
--    command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
-+    command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
-   )
- 
-   custom_target(
-diff --git a/src/qemu/meson.build b/src/qemu/meson.build
-index 90640b0..e3065c3 100644
---- a/src/qemu/meson.build
-+++ b/src/qemu/meson.build
-@@ -56,14 +56,14 @@ if conf.has('WITH_DTRACE_PROBES')
-     out_h,
-     input: infile,
-     output: out_h,
--    command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
-+    command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
-   )
- 
-   qemu_dtrace_gen_objects += custom_target(
-     out_o,
-     input: infile,
-     output: out_o,
--    command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
-+    command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
-   )
- 
-   qemu_dtrace_gen_stp = custom_target(


=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
=====================================
@@ -36,16 +36,14 @@ this revert and follow upstream as 2.32 dropped the option to enable
  meson.build | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/meson.build b/meson.build
-index da0157b..9121ea5 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1429,8 +1429,6 @@ endif
- # use extra library as it's provided by libc directly.
+@@ -1286,7 +1286,7 @@ endif
  if host_machine.system() == 'windows'
    xdr_dep = cc.find_library('portablexdr', required: false)
--elif host_machine.system() == 'linux'
+ elif host_machine.system() == 'linux'
 -  xdr_dep = dependency('libtirpc', required: false)
++  xdr_dep = cc.find_library('c', required: false)
+ elif host_machine.system() in [ 'freebsd', 'darwin' ]
+   xdr_dep = cc.find_library('c', required: false)
  else
-   xdr_dep = declare_dependency()
- endif


=====================================
debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================
@@ -7,12 +7,10 @@ so we don't have to build-depend on a program in contrib
  meson.build | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/meson.build b/meson.build
-index 5607898..da0157b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1984,18 +1984,15 @@ if conf.has('WITH_LIBVIRTD')
-     foreach name : ['zfs', 'zpool']
+@@ -1945,18 +1945,15 @@ if conf.has('WITH_LIBVIRTD')
+     foreach name : [ 'zfs', 'zpool' ]
        set_variable(
          '@0 at _prog'.format(name),
 -        find_program(name, required: get_option('storage_zfs'), dirs: libvirt_sbin_path)
@@ -26,7 +24,7 @@ index 5607898..da0157b 100644
      if zfs_enable
        use_storage = true
        conf.set('WITH_STORAGE_ZFS', 1)
-       foreach name : ['zfs', 'zpool']
+       foreach name : [ 'zfs', 'zpool' ]
 -        conf.set_quoted(name.to_upper(), get_variable('@0 at _prog'.format(name)).path())
 +        conf.set_quoted(name.to_upper(), get_variable('@0 at _prog'.format(name)))
        endforeach


=====================================
debian/patches/revert/systemd-Revert-remote-Add-libvirtd-dependency-to-virt-gue.patch deleted
=====================================
@@ -1,19 +0,0 @@
-From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
-Date: Wed, 27 Jan 2021 07:59:37 +0100
-Subject: systemd: Revert "remote: Add libvirtd dependency to
- virt-guest-shutdown.target" as it would reintroduce bug 955216
-
-This reverts commit f035f53baa2e5dc00b8e866e594672a90b4cea78.
----
- src/remote/virt-guest-shutdown.target | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/remote/virt-guest-shutdown.target b/src/remote/virt-guest-shutdown.target
-index e2efa3e..25d4aaa 100644
---- a/src/remote/virt-guest-shutdown.target
-+++ b/src/remote/virt-guest-shutdown.target
-@@ -1,4 +1,3 @@
- [Unit]
- Description=Libvirt guests shutdown
--Requires=libvirtd.service
- Documentation=https://libvirt.org


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,3 @@
-backport/apparmor-let-image-label-setting-loop-over-backing-files.patch
-backport/meson-Fix-cross-building-of-dtrace-probes.patch
-revert/systemd-Revert-remote-Add-libvirtd-dependency-to-virt-gue.patch
 forward/Skip-vircgrouptest.patch
 forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
 forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch


=====================================
debian/rules
=====================================
@@ -49,7 +49,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
     WITH_ATTR                 = -Dattr=enabled
     WITH_AUDIT                = -Daudit=enabled
     WITH_SELINUX              = -Dselinux=enabled -Dsecdriver_selinux=enabled -Dselinux_mount=/sys/fs/selinux
-    WITH_APPARMOR             = -Dapparmor=enabled -Dsecdriver_apparmor=enabled -Dapparmor_profiles=true
+    WITH_APPARMOR             = -Dapparmor=enabled -Dsecdriver_apparmor=enabled -Dapparmor_profiles=enabled
     WITH_NSS_PLUGIN           = -Dnss=enabled
     WITH_DTRACE               = -Ddtrace=enabled
     WITH_NUMA                 = -Dnumactl=enabled -Dnumad=enabled
@@ -82,7 +82,7 @@ else
     WITH_ATTR                 = -Dattr=disabled
     WITH_AUDIT                = -Daudit=disabled
     WITH_SELINUX              = -Dselinux=disabled -Dsecdriver_selinux=disabled -Dselinux_mount=
-    WITH_APPARMOR             = -Dapparmor=disabled -Dsecdriver_apparmor=disabled -Dapparmor_profiles=false
+    WITH_APPARMOR             = -Dapparmor=disabled -Dsecdriver_apparmor=disabled -Dapparmor_profiles=disabled
     WITH_NSS_PLUGIN           = -Dnss=disabled
     WITH_DTRACE               = -Ddtrace=disabled
     WITH_NUMA                 = -Dnumactl=disabled -Dnumad=disabled
@@ -96,6 +96,10 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     -Dpackager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
     -Dpackager_version="$(DEB_RELEASE)" \
     -Ddriver_qemu=enabled \
+    -Ddriver_libvirtd=enabled \
+    -Ddriver_remote=enabled \
+    -Ddriver_test=enabled \
+    -Ddriver_ch=disabled \
     -Dqemu_user=libvirt-qemu \
     -Dqemu_group=libvirt-qemu \
     -Dqemu_moddir=/usr/lib/$(DEB_HOST_MULTIARCH)/qemu \
@@ -117,6 +121,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     -Dstorage_sheepdog=disabled \
     $(WITH_STORAGE_RBD) \
     $(WITH_STORAGE_GLUSTER) \
+    -Dstorage_vstorage=disabled \
     -Dstorage_zfs=enabled \
     $(WITH_INIT_SCRIPT) \
     $(WITH_NUMA) \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/97172caf0b8d757fbb162deda421fad3aa905fb9...ac145fd91d02779e1c8800b8cb4bacf9bee8297a

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/97172caf0b8d757fbb162deda421fad3aa905fb9...ac145fd91d02779e1c8800b8cb4bacf9bee8297a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210729/c6c9b52e/attachment-0001.htm>

More information about the Pkg-libvirt-commits mailing list