libvirt/trunk/glibc-2.36-lxc-fix.patch

   1 From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
   2 From: Cole Robinson <crobinso@redhat.com>
   3 Date: Mon, 1 Aug 2022 15:20:38 -0400
   4 Subject: [PATCH] lxc: containter: fix build with glibc 2.36
   5
   6 With glibc 2.36, sys/mount.h and linux/mount.h conflict:
   7 https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
   8
   9 lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
  10 linux/mount.h.
  11
  12 linux/fs.h isn't required here though. glibc sys/mount.h has had
  13 MS_MOVE since 2.12 in 2010
  14
  15 Reviewed-by: Erik Skultety <eskultet@redhat.com>
  16 Signed-off-by: Cole Robinson <crobinso@redhat.com>
  17 ---
  18  src/lxc/lxc_container.c | 3 ---
  19  1 file changed, 3 deletions(-)
  20
  21 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
  22 index b5278831da..a5401c2186 100644
  23 --- a/src/lxc/lxc_container.c
  24 +++ b/src/lxc/lxc_container.c
  25 @@ -33,9 +33,6 @@
  26  /* Yes, we want linux private one, for _syscall2() macro */
  27  #include <linux/unistd.h>
  28
  29 -/* For MS_MOVE */
  30 -#include <linux/fs.h>
  31 -
  32  #if WITH_CAPNG
  33  # include <cap-ng.h>
  34  #endif
  35 --
  36 GitLab
  37