Subject: [PATCH v7] gnu: lxc: Update to 6.0.1

From: Jakob Kirsch <[email-masked]>
Date: Fri, 13 Sep 2024 00:29:22 +0200

* gnu/packages/virtualization.scm (lxc): Update to 6.0.1.
[build-system]: Change to meson-build-system.
[inputs]: Add dbus.
[arguments]: Replace "--docdir=..." with "-Ddoc-path=...".
Replace "--sysconfdir=/etc" with "-Ddistrosysconfdir=/etc".
Remove "--localstatedir=/var".
Add "-Dinit-script=sysvinit".
Add "-Dinstall-state-dirs=false".
Add "-Dinstall-init-files=false".
Add "-Dspecfile=false".
Add "-Db_lto=false".
<#:phases>: No longer replace 'install.
<#:phases>: Delete 'shrink-runpath

Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
 gnu/packages/virtualization.scm | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b076d49985..3985c118c0 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2024 Raven Hallsby <[email-masked]>
 ;;; Copyright © 2024 jgart <[email-masked]>
 ;;; Copyright © 2024 Ashish SHUKLA <[email-masked]>
+;;; Copyright © 2024 Jakob Kirsch <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1350,7 +1351,7 @@ (define-public libosinfo
 (define-public lxc
   (package
     (name "lxc")
-    (version "4.0.12")
+    (version "6.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1358,30 +1359,27 @@ (define-public lxc
                     version ".tar.gz"))
               (sha256
                (base32
-                "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"))))
-    (build-system gnu-build-system)
+                "1q3p3zzm338pmc97z6ly8cjginkyljxqbk1c37l2xa46vfy8zcyc"))))
+    (build-system meson-build-system)
     (native-inputs
      (list pkg-config docbook2x))
     (inputs
-     (list gnutls libcap libseccomp libselinux))
+     (list gnutls libcap libseccomp libselinux dbus))
     (arguments
      (list #:configure-flags
-           #~(list (string-append "--docdir=" #$output "/share/doc/"
+           #~(list (string-append "-Ddoc-path=" #$output "/share/doc/"
                                   #$name "-" #$version)
-                   "--sysconfdir=/etc"
-                   "--localstatedir=/var")
+                   "-Ddistrosysconfdir=/etc"
+                   "-Dinit-script=sysvinit"
+                   "-Dinstall-state-dirs=false"
+                   "-Dinstall-init-files=false"
+                   "-Dspecfile=false"
+                   "-Db_lto=false")
            #:phases
            #~(modify-phases %standard-phases
-               (replace 'install
-                 (lambda _
-                   (invoke "make" "install"
-                           (string-append "bashcompdir=" #$output
-                                          "/etc/bash_completion.d")
-                           ;; Don't install files into /var and /etc.
-                           "LXCPATH=/tmp/var/lib/lxc"
-                           "localstatedir=/tmp/var"
-                           "sysconfdir=/tmp/etc"
-                           "sysconfigdir=/tmp/etc/default"))))))
+               ;; shrink-runpath crashes and only one directory is stripped out anyway
+               ;; so there isn't much saving
+               (delete 'shrink-runpath))))
     (synopsis "Linux container tools")
     (home-page "https://linuxcontainers.org/")
     (description

base-commit: 17bf4b1e80293864be329f553fb672c72a53e7fc
--
2.46.0