Unverified Commit 24273bff authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

lxcfs: 6.0.6 -> 7.0.0 

Changelog: https://github.com/lxc/lxcfs/releases/tag/v7.0.0
Announcement: https://discuss.linuxcontainers.org/t/lxcfs-7-0-lts-has-been-released/26607
parent 0eb887ff

pkgs/by-name/lx/lxcfs/package.nix

+2 −5
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "lxcfs";

  version = "6.0.6";

  version = "7.0.0";



  src = fetchFromGitHub {

    owner = "lxc";

    repo = "lxcfs";

    tag = "v${finalAttrs.version}";

    hash = "sha256-lEXXbYDxnOi4Xa/fO1Uy/aVLjVfzYeZm6qzR4XBMBsY=";

    hash = "sha256-xONV9Ss71id2Bwb2BFNqaaP+8vK6540sThs1MCw4gok=";

  };



  patches = [
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: { 


    # skip installing systemd files

    ./skip-init.patch



    # fix pidfd checks and include

    ./pidfd.patch

  ];



  nativeBuildInputs = [

pkgs/by-name/lx/lxcfs/pidfd.patch

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
diff --git a/meson.build b/meson.build

index a0289ad..211b01b 100644

--- a/meson.build

+++ b/meson.build

@@ -134,11 +134,13 @@ foreach ident: [

      '''#include <stdlib.h>

         #include <unistd.h>

         #include <signal.h>

+        #include <sys/pidfd.h>

         #include <sys/wait.h>'''],

     ['pidfd_open',

      '''#include <stdlib.h>

         #include <unistd.h>

         #include <signal.h>

+        #include <sys/pidfd.h>

         #include <sys/wait.h>'''],

 ]

     have = cc.has_function(ident[0], prefix: ident[1], args: '-D_GNU_SOURCE')

diff --git a/src/bindings.c b/src/bindings.c

index 13259c1..e760330 100644

--- a/src/bindings.c

+++ b/src/bindings.c

@@ -1,5 +1,6 @@

 /* SPDX-License-Identifier: LGPL-2.1+ */

 

+#include <sys/pidfd.h>

 #include "config.h"

 

 #include <dirent.h>