mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
app-emulation/libvirt: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15 Closes: https://github.com/gentoo/gentoo/pull/27426 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
committed by
Conrad Kostecki
parent
32e16a2445
commit
4c5a5e6037
@@ -1,13 +0,0 @@
|
||||
diff --git a/tools/nss/meson.build b/tools/nss/meson.build
|
||||
index 198936f3d42e1827d0f03ff3b27a198bdc4fa59c..f77309ebcab8063c515ae2bf95dbff542238a2ee 100644
|
||||
--- a/tools/nss/meson.build
|
||||
+++ b/tools/nss/meson.build
|
||||
@@ -59,7 +59,7 @@ nss_libvirt_guest_syms = '@0@@1@'.format(
|
||||
meson.current_source_dir() / nss_guest_sym_file,
|
||||
)
|
||||
|
||||
-nss_libvirt_lib = shared_module(
|
||||
+nss_libvirt_lib = shared_library(
|
||||
'nss_libvirt',
|
||||
name_prefix: nss_prefix,
|
||||
name_suffix: 'so.@0@'.format(nss_so_ver),
|
||||
@@ -1,32 +0,0 @@
|
||||
From c80a05cd7d5f17ee16a2bc2546981863451fcab7 Mon Sep 17 00:00:00 2001
|
||||
From: "System user; portage" <portage@kestrel.43-1.org>
|
||||
Date: Wed, 8 Dec 2021 15:07:06 -0600
|
||||
Subject: [PATCH] Revert "lxc: controller: Fix container launch on cgroup v1"
|
||||
|
||||
This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94.
|
||||
---
|
||||
src/lxc/lxc_controller.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
|
||||
index 444f728af4..8953e0c904 100644
|
||||
--- a/src/lxc/lxc_controller.c
|
||||
+++ b/src/lxc/lxc_controller.c
|
||||
@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl)
|
||||
nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1);
|
||||
|
||||
if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def,
|
||||
- getpid(),
|
||||
+ ctrl->initpid,
|
||||
ctrl->nnicindexes,
|
||||
ctrl->nicindexes)))
|
||||
goto cleanup;
|
||||
|
||||
- if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0)
|
||||
+ if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* Add all qemu-nbd tasks to the cgroup */
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
https://bugs.gentoo.org/863446
|
||||
https://github.com/libvirt/libvirt/commit/9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90
|
||||
https://github.com/libvirt/libvirt/commit/c0d9adf220dc0d223330a7bac37b174132d330ba
|
||||
|
||||
From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Mon, 1 Aug 2022 15:20:38 -0400
|
||||
Subject: [PATCH] lxc: containter: fix build with glibc 2.36
|
||||
|
||||
With glibc 2.36, sys/mount.h and linux/mount.h conflict:
|
||||
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
|
||||
|
||||
lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
|
||||
linux/mount.h.
|
||||
|
||||
linux/fs.h isn't required here though. glibc sys/mount.h has had
|
||||
MS_MOVE since 2.12 in 2010
|
||||
|
||||
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
--- a/src/lxc/lxc_container.c
|
||||
+++ b/src/lxc/lxc_container.c
|
||||
@@ -33,9 +33,6 @@
|
||||
/* Yes, we want linux private one, for _syscall2() macro */
|
||||
#include <linux/unistd.h>
|
||||
|
||||
-/* For MS_MOVE */
|
||||
-#include <linux/fs.h>
|
||||
-
|
||||
#if WITH_CAPNG
|
||||
# include <cap-ng.h>
|
||||
#endif
|
||||
|
||||
From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Mon, 1 Aug 2022 15:24:01 -0400
|
||||
Subject: [PATCH] virfile: Fix build with glibc 2.36
|
||||
|
||||
With glibc 2.36, sys/mount.h and linux/mount.h conflict:
|
||||
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
|
||||
|
||||
virfile.c imports sys/mount.h and linux/fs.h, which pulls in
|
||||
linux/mount.h.
|
||||
|
||||
Manually define the constants we need from linux/fs.h, like was
|
||||
done in llvm:
|
||||
|
||||
https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
|
||||
|
||||
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
--- a/src/util/virfile.c
|
||||
+++ b/src/util/virfile.c
|
||||
@@ -71,7 +71,11 @@
|
||||
# endif
|
||||
# include <sys/ioctl.h>
|
||||
# include <linux/cdrom.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_SETFLAGS _IOW('f', 2, long)
|
||||
+# define FS_NOCOW_FL 0x00800000
|
||||
#endif
|
||||
|
||||
#if WITH_LIBATTR
|
||||
|
||||
Reference in New Issue
Block a user