rpms/libvirt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use upstreamed 'glibc fix' commits

Browse Source 
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2022-08-04 15:57:34 -04:00
parent 417e4c9cf7
commit 535bbcdd91
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0001-lxc-containter-fix-build-with-glibc-2.36.patch
View File

@ -1,4 +1,4 @@
From de63f9ca622e25df97ca926d7e409d074499fcf6 Mon Sep 17 00:00:00 2001 From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com> From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 1 Aug 2022 15:20:38 -0400 Date: Mon, 1 Aug 2022 15:20:38 -0400
Subject: [PATCH] lxc: containter: fix build with glibc 2.36 Subject: [PATCH] lxc: containter: fix build with glibc 2.36
@ -13,6 +13,7 @@ linux/mount.h.
linux/fs.h isn't required here though. glibc sys/mount.h has had linux/fs.h isn't required here though. glibc sys/mount.h has had
MS_MOVE since 2.12 in 2010 MS_MOVE since 2.12 in 2010
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
--- ---
src/lxc/lxc_container.c | 3 --- src/lxc/lxc_container.c | 3 ---

15
0002-virfile-Fix-build-with-glibc-2.36.patch
View File

@ -1,4 +1,4 @@
From 3b6a3cfd76832efd504bb3e868675e0f27e16c3a Mon Sep 17 00:00:00 2001 From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com> From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 1 Aug 2022 15:24:01 -0400 Date: Mon, 1 Aug 2022 15:24:01 -0400
Subject: [PATCH] virfile: Fix build with glibc 2.36 Subject: [PATCH] virfile: Fix build with glibc 2.36
@ -15,22 +15,25 @@ done in llvm:
https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
--- ---
src/util/virfile.c | 4 +++- src/util/virfile.c | 6 +++++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c diff --git a/src/util/virfile.c b/src/util/virfile.c
index 99da058db3..65d6d2a701 100644 index 99da058db3..ce541b8946 100644
--- a/src/util/virfile.c --- a/src/util/virfile.c
+++ b/src/util/virfile.c +++ b/src/util/virfile.c
@@ -71,7 +71,9 @@ @@ -71,7 +71,11 @@
# endif # endif
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <linux/cdrom.h> # include <linux/cdrom.h>
-# include <linux/fs.h> -# include <linux/fs.h>
+/* These come from linux/fs.h, but that header conflicts with
+ * sys/mount.h on glibc 2.36+ */
+# define FS_IOC_GETFLAGS _IOR('f', 1, long) +# define FS_IOC_GETFLAGS _IOR('f', 1, long)
+# define FS_IOC_SETFLAGS _IOR('f', 2, long) +# define FS_IOC_SETFLAGS _IOW('f', 2, long)
+# define FS_NOCOW_FL 0x00800000 +# define FS_NOCOW_FL 0x00800000
#endif #endif

5
libvirt.spec
View File

@ -231,7 +231,7 @@
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
Name: libvirt Name: libvirt
Version: 8.6.0 Version: 8.6.0
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://libvirt.org/ URL: https://libvirt.org/
@ -2131,6 +2131,9 @@ exit 0
%changelog %changelog
* Thu Aug 04 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-2
- Use upstream 'glibc fix' commits
* Mon Aug 01 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-1 * Mon Aug 01 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-1
- Update to version 8.6.0 - Update to version 8.6.0