Merge ~paelzer/ubuntu/+source/libvirt:lp-691590-enable-attr-for-image-ownership into ubuntu/+source/libvirt:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4111/+packages

Still a quick WIP branch atm ...

[Christian Ehrhardt  (paelzer)]

Tests LGTM actually, in the test-spirit I agree let us make it available early to get the report of breakage in early :-)

prep (x86_64) : Pass 25 F/S/N 0/0/0 - RC 0 (20 min 71562 lin)
migrate (x86_64) : Pass 287 F/S/N 1/0/0 - RC 1 (77 min 217932 lin)
cross (x86_64) : Pass 52 F/S/N 0/1/3 - RC 0 (113 min 94363 lin)
misc (x86_64) : Pass 73 F/S/N 0/0/0 - RC 0 (40 min 43848 lin)

prep (s390x) : Pass 25 F/S/N 0/0/0 - RC 0 (12 min 46811 lin)
migrate (s390x) : Pass 267 F/S/N 1/5/0 - RC 1 (66 min 161138 lin)
cross (s390x) : Pass 58 F/S/N 0/1/2 - RC 0 (78 min 90803 lin)
misc (s390x) : Pass 67 F/S/N 0/0/0 - RC 0 (24 min 31813 lin)

The one fail is due to the qemu which is waiting on its MP but the tests already expect that to be present.

[Christian Ehrhardt  (paelzer)]

FYI the explicit disabling was from 6 years ago:

commit 0fa762425da7039f2d238d7c819c29cfd2ee134e
Author: Guido Günther <email address hidden>
Date: Sat May 10 13:04:10 2014 +0200

    Disable tests requiring filesystem attributes

    since they seem to fail on the buildd

    Closes: #747565

diff --git a/debian/rules b/debian/rules
index d62d674659..12c484756a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,8 @@ DEB_CONFIGURE_EXTRA_ARGS := \
        $(WITH_DTRACE) \
        $(WITH_AUDIT) \
        --without-hal \
- --without-firewalld
+ --without-firewalld \
+ --without-attr

 DEB_BUILDDIR := $(CURDIR)/debian/build
 LOGROTATE = $(basename $(basename $(notdir $(wildcard daemon/libvirtd*.logrotate.in))))

The autokgtests are running in the ticket to the PPA and at build time no issue happened.
Seems this can be enabled without an issue these days.

[Rafael David Tinoco (rafaeldtinoco)]

Simple enough for a quick +1 here.

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libvirt
 * [new tag] upload/6.0.0-0ubuntu10 -> upload/6.0.0-0ubuntu10

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_6.0.0-0ubuntu10.dsc: done.
  Uploading libvirt_6.0.0-0ubuntu10.debian.tar.xz: done.
  Uploading libvirt_6.0.0-0ubuntu10_source.buildinfo: done.
  Uploading libvirt_6.0.0-0ubuntu10_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 78a41da..3d8b2de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libvirt (6.0.0-0ubuntu10) groovy; urgency=medium
+
+  * enable attr support to store XATTR labels. Among other things
+    this allows to properly restore file ownership (LP: #691590)
+      - d/control: build depend to libattr1-dev
+      - d/rules: configure --with-attr
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 22 Jun 2020 21:30:50 +0200
+
 libvirt (6.0.0-0ubuntu9) groovy; urgency=medium
 
   * d/p/ubuntu/lp-1879325-*: avoid issues with apparmor metadata labeling
diff --git a/debian/control b/debian/control
index 0ad7d5c..3ef41f7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends:
  libdevmapper-dev [linux-any],
  uuid-dev,
  libudev-dev [linux-any],
+ libattr1-dev [linux-any],
  libpciaccess-dev,
  kmod [linux-any],
  policykit-1 (>= 0.105-4~),
diff --git a/debian/rules b/debian/rules
index ee31f98..ab8c858 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_INIT_SCRIPT    =	--with-init-script=systemd
   WITH_SYSTEMD        = --with-systemd-daemon
   WITH_FIREWALLD      = --without-firewalld
+  WITH_ATTR           = --with-attr
   WITH_AUDIT          = --with-audit
   WITH_SELINUX        = --with-selinux --with-secdriver-selinux --with-selinux-mount=/sys/fs/selinux
   WITH_APPARMOR       = --with-apparmor --with-secdriver-apparmor --with-apparmor-profiles
@@ -82,6 +83,7 @@ else
   WITH_INIT_SCRIPT    =	--with-init-script=none
   WITH_SYSTEMD        = --without-systemd-daemon
   WITH_FIREWALLD      = --without-firewalld
+  WITH_ATTR           = --without-attr
   WITH_AUDIT          = --without-audit
   WITH_SELINUX        = --without-selinux
   WITH_APPARMOR       = --without-apparmor
@@ -134,7 +136,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_AUDIT)            \
 	--without-hal            \
 	$(WITH_FIREWALLD)        \
-	--without-attr           \
+	$(WITH_ATTR)             \
 	$(WITH_NSS_PLUGIN)       \
         --with-wireshark-dissector \
         $(NULL)