[PATCH v1] ci: disable usage of libattr in Leap

Olaf Hering posted 1 patch 10 months ago
Failed in applying to current master (apply log)
ci/containers/opensuse-leap-15.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH v1] ci: disable usage of libattr in Leap
Posted by Olaf Hering 10 months ago
Commit dffeef89ef ("meson: attr_dep switch to dependency()") made
libattr.pc mandatory.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 ci/containers/opensuse-leap-15.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile
index ca11edf808..4bfbe8057f 100644
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@@ -37,7 +37,6 @@ RUN zypper update -y && \
            kmod \
            libacl-devel \
            libapparmor-devel \
-           libattr-devel \
            libblkid-devel \
            libcap-ng-devel \
            libcurl-devel \
@@ -95,3 +94,4 @@ ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
+ENV MESON_OPTS "-Dattr=disabled"
Re: [PATCH v1] ci: disable usage of libattr in Leap
Posted by Daniel P. Berrangé 10 months ago
On Mon, Jul 03, 2023 at 02:42:57PM +0200, Olaf Hering wrote:
> Commit dffeef89ef ("meson: attr_dep switch to dependency()") made
> libattr.pc mandatory.

If opensuse 15 doesn't have the libattr.pc file, then we need
to revert that commit, because that commit was accepted on the
basis that all distros we target had the .pc file.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [PATCH v1] ci: disable usage of libattr in Leap
Posted by Peter Krempa 10 months ago
On Mon, Jul 03, 2023 at 14:42:57 +0200, Olaf Hering wrote:
> Commit dffeef89ef ("meson: attr_dep switch to dependency()") made
> libattr.pc mandatory.

Could you explain why this is needed in the first place?

> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  ci/containers/opensuse-leap-15.Dockerfile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile
> index ca11edf808..4bfbe8057f 100644
> --- a/ci/containers/opensuse-leap-15.Dockerfile
> +++ b/ci/containers/opensuse-leap-15.Dockerfile
> @@ -37,7 +37,6 @@ RUN zypper update -y && \
>             kmod \
>             libacl-devel \
>             libapparmor-devel \
> -           libattr-devel \
>             libblkid-devel \
>             libcap-ng-devel \
>             libcurl-devel \

The top of this file says:

 # THIS FILE WAS AUTO-GENERATED
 #
 #  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci


You need to patch lcitool data in the libvirt-ci project if that library
for some reason is not available. Otherwise next-regen of the files
would simply revert your change.

> @@ -95,3 +94,4 @@ ENV LANG "en_US.UTF-8"
>  ENV MAKE "/usr/bin/make"
>  ENV NINJA "/usr/bin/ninja"
>  ENV PYTHON "/usr/bin/python3"
> +ENV MESON_OPTS "-Dattr=disabled"
>
Re: [PATCH v1] ci: disable usage of libattr in Leap
Posted by Olaf Hering 10 months ago
Mon, 3 Jul 2023 15:10:41 +0200 Peter Krempa <pkrempa@redhat.com>:

> Could you explain why this is needed in the first place?

Just to make it clear that attr can not be used in this environment
because it is slightly older than expected.

I missed the header of that file, sorry.


Olaf
Re: [PATCH v1] ci: disable usage of libattr in Leap
Posted by Andrea Bolognani 10 months ago
On Mon, Jul 03, 2023 at 04:00:00PM +0200, Olaf Hering wrote:
> Mon, 3 Jul 2023 15:10:41 +0200 Peter Krempa <pkrempa@redhat.com>:
> > Could you explain why this is needed in the first place?
>
> Just to make it clear that attr can not be used in this environment
> because it is slightly older than expected.
>
> I missed the header of that file, sorry.

The original change was made under the assumption that all supported
target platforms already ship 2.4.48, but as you point out and as
confirmed by [1] that's not the case for openSUSE Leap 15. The
correct way to address this inconsistency is to revert the offending
commit, not introduce workarounds elsewhere.


[1] https://repology.org/project/attr/versions
-- 
Andrea Bolognani / Red Hat / Virtualization
Re: [PATCH v1] ci: disable usage of libattr in Leap
Posted by Jim Fehlig 10 months ago
On 7/3/23 08:30, Andrea Bolognani wrote:
> On Mon, Jul 03, 2023 at 04:00:00PM +0200, Olaf Hering wrote:
>> Mon, 3 Jul 2023 15:10:41 +0200 Peter Krempa <pkrempa@redhat.com>:
>>> Could you explain why this is needed in the first place?
>>
>> Just to make it clear that attr can not be used in this environment
>> because it is slightly older than expected.
>>
>> I missed the header of that file, sorry.
> 
> The original change was made under the assumption that all supported
> target platforms already ship 2.4.48, but as you point out and as
> confirmed by [1] that's not the case for openSUSE Leap 15. The
> correct way to address this inconsistency is to revert the offending
> commit, not introduce workarounds elsewhere.

I've sent a patch to revert it

https://listman.redhat.com/archives/libvir-list/2023-July/240641.html

Regards,
Jim