unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Jakob Kirsch via Bug reports for GNU Guix <bug-guix@gnu.org>
To: 72976@debbugs.gnu.org
Cc: Jakob Kirsch <jakob.kirsch@web.de>
Subject: bug#72976: [PATCH] gnu: lxc: Update to 6.0.1
Date: Sun,  8 Sep 2024 17:09:19 +0200	[thread overview]
Message-ID: <30a663c17f2de556f796852bb12c6cb2c9fbbeef.1725808144.git.jakob.kirsch@web.de> (raw)
In-Reply-To: <O5n1xhG--J-9@tutanota.com>

* 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.
Delete 'shrink-runpath.

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

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b076d49985..c891a49a2c 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
 ;;; Copyright © 2024 jgart <jgart@dismail.de>
 ;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
 ;;;
 ;;; 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,26 @@ (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"))))))
+               ; Build fails at this stage for some reason
+               (delete 'shrink-runpath))))
     (synopsis "Linux container tools")
     (home-page "https://linuxcontainers.org/")
     (description

base-commit: 056910ec864cb7cf3225a0c27679d94405db7dcd
--
2.45.2





  parent reply	other threads:[~2024-09-08 15:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-02 14:03 bug#72976: LXC 4.0.12 does not build with latest glibc kasper.andersson--- via Bug reports for GNU Guix
2024-09-02 21:03 ` bug#72976: [PATCH] gnu: lxc: bump to 6.0.1 Jakob Kirsch via Bug reports for GNU Guix
2024-09-02 21:06 ` Jakob Kirsch via Bug reports for GNU Guix
2024-09-02 21:13   ` bug#72976: LXC 4.0.12 does not build with latest glibc Jakob Kirsch via Bug reports for GNU Guix
2024-09-07 16:33 ` bug#72976: [PATCH] gnu: lxc: Update to 6.0.1 Jakob Kirsch via Bug reports for GNU Guix
2024-09-07 16:57 ` Jakob Kirsch via Bug reports for GNU Guix
2024-09-07 17:12   ` Liliana Marie Prikler
2024-09-08 15:09 ` Jakob Kirsch via Bug reports for GNU Guix [this message]
2024-09-11 19:00 ` bug#72976: [PATCH v6] " Jakob Kirsch via Bug reports for GNU Guix
2024-09-12 22:29 ` bug#72976: [PATCH v7] " Jakob Kirsch via Bug reports for GNU Guix
2024-09-14  0:17 ` bug#72976: [PATCH v8] " Jakob Kirsch via Bug reports for GNU Guix
2024-09-18 19:15 ` bug#72976: [PATCH v9] " Jakob Kirsch via Bug reports for GNU Guix
2024-09-19  9:07 ` bug#72976: [PATCH v10] " Jakob Kirsch via Bug reports for GNU Guix
2024-09-19  9:54 ` bug#72976: [PATCH v11] " Jakob Kirsch via Bug reports for GNU Guix

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=30a663c17f2de556f796852bb12c6cb2c9fbbeef.1725808144.git.jakob.kirsch@web.de \
    --to=bug-guix@gnu.org \
    --cc=72976@debbugs.gnu.org \
    --cc=jakob.kirsch@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).