LXC 4.0.12 does not build with latest glibc

  • Open
  • quality assurance status badge
Details
3 participants
  • Jakob Kirsch
  • kasper.andersson
  • Liliana Marie Prikler
Owner
unassigned
Submitted by
kasper.andersson
Severity
normal

Debbugs page

K
K
kasper.andersson wrote on 2 Sep 07:03 -0700
(name . Bug Guix)(address . bug-guix@gnu.org)
O5n1xhG--J-9@tutanota.com
In the build log, it complains about mismatching pointer types.

In the upstream git repository, an issue was opened about a build error which looks very similar, pointing to an incompatibility with later glibc versions: https://github.com/lxc/lxc/issues/4183

I don't have the time to write and test a patch for it at this moment, but the solution looks to be updating the lxc package to a later supported version.

Here is what I believe to be the relevant part of the log:
mount_utils.c: In function ‘create_detached_idmapped_mount’:
mount_utils.c:297:29: error: passing argument 4 of ‘mount_setattr’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  297 |                             &attr, sizeof(attr));
      |                             ^~~~~
      |                             |
      |                             struct lxc_mount_attr *
In file included from mount_utils.c:9:
/gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/include/sys/mount.h:320:46: note: expected ‘struct mount_attr *’ but argument is of type ‘struct lxc_mount_attr *’
  320 |                           struct mount_attr *__uattr, size_t __usize)
      |                           ~~~~~~~~~~~~~~~~~~~^~~~~~~
mount_utils.c: In function ‘__fd_bind_mount’:
mount_utils.c:380:37: error: passing argument 4 of ‘mount_setattr’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  380 |                                     &attr, sizeof(attr));
      |                                     ^~~~~
      |                                     |
      |                                     struct lxc_mount_attr *
In file included from mount_utils.c:9:
/gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/include/sys/mount.h:320:46: note: expected ‘struct mount_attr *’ but argument is of type ‘struct lxc_mount_attr *’
  320 |                           struct mount_attr *__uattr, size_t __usize)
      |                           ~~~~~~~~~~~~~~~~~~~^~~~~~~
conf.c: In function ‘__lxc_idmapped_mounts_child’:
conf.c:2989:37: error: passing argument 4 of ‘mount_setattr’ from incompatible pointer type [-Werror=incompatible-pointer-types]
2989 |                                     &attr,
      |                                     ^~~~~
      |                                     |
      |                                     struct lxc_mount_attr *
In file included from conf.c:22:
/gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/include/sys/mount.h:320:46: note: expected ‘struct mount_attr *’ but argument is of type ‘struct lxc_mount_attr *’
  320 |                           struct mount_attr *__uattr, size_t __usize)
      |                           ~~~~~~~~~~~~~~~~~~~^~~~~~~
conf.c:3012:41: error: passing argument 4 of ‘mount_setattr’ from incompatible pointer type [-Werror=incompatible-pointer-types]
3012 |                                         &attr,
      |                                         ^~~~~
      |                                         |
      |                                         struct lxc_mount_attr *
In file included from conf.c:22:
/gnu/store/zvlp3n8iwa1svxmwv4q22pv1pb1c9pjq-glibc-2.39/include/sys/mount.h:320:46: note: expected ‘struct mount_attr *’ but argument is of type ‘struct lxc_mount_attr *’
  320 |                           struct mount_attr *__uattr, size_t __usize)
      |                           ~~~~~~~~~~~~~~~~~~~^~~~~~~

Best regards,
Kasper
Attachment: file
J
J
Jakob Kirsch wrote on 2 Sep 14:03 -0700
[PATCH] gnu: lxc: bump to 6.0.1
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
fa9309228152d87d805b867b3921d91af6c3e43c.1725310990.git.jakob.kirsch@web.de
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
gnu/packages/virtualization.scm | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)

Toggle diff (56 lines)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 398b332dd6..b1a27a6fca 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1349,7 +1349,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
@@ -1357,30 +1357,24 @@ (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")
#: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"))))))
+ (delete 'shrink-runpath))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description

base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87
--
2.45.2
J
J
Jakob Kirsch wrote on 2 Sep 14:06 -0700
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
57760fbd00770812411b6408d37c7de5e781591b.1725311213.git.jakob.kirsch@web.de
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
gnu/packages/virtualization.scm | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)

Toggle diff (64 lines)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 398b332dd6..a509feea2a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -35,6 +35,7 @@
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
;;; Copyright © 2024 jgart <jgart@dismail.de>
+;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1349,7 +1350,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
@@ -1357,30 +1358,24 @@ (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")
#: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"))))))
+ (delete 'shrink-runpath))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description

base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87
--
2.45.2
J
J
Jakob Kirsch wrote on 2 Sep 14:13 -0700
Re: LXC 4.0.12 does not build with latest glibc
(address . 72976@debbugs.gnu.org)
bf1e3d4b-dafb-49bf-bce8-fc531bd3afe0@web.de
I forgot to add myself to the copyright in the first patch but lxc
builds now
> Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
> ---
> gnu/packages/virtualization.scm | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/virtualization.scm
b/gnu/packages/virtualization.scm
> index 398b332dd6..a509feea2a 100644
> --- a/gnu/packages/virtualization.scm
> +++ b/gnu/packages/virtualization.scm
> @@ -35,6 +35,7 @@
> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
> ;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
> ;;; Copyright © 2024 jgart <jgart@dismail.de>
> +;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -1349,7 +1350,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
> @@ -1357,30 +1358,24 @@ (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")
> #: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"))))))
> + (delete 'shrink-runpath))))
> (synopsis "Linux container tools")
> (description
>
> base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87
> --
> 2.45.2
Attachment: OpenPGP_0x6AD8A2FE6B5CD0DC.asc
Attachment: OpenPGP_signature.asc
J
J
Jakob Kirsch wrote on 7 Sep 09:33 -0700
[PATCH] gnu: lxc: Update to 6.0.1
(address . 72976@debbugs.gnu.org)
2b4c245d-7367-4caa-be26-48e03156e2bb@web.de
From fd41f42177fcfe99c726a5d8dd269d489e47e7f7 Mon Sep 17 00:00:00 2001
Message-ID:
<fd41f42177fcfe99c726a5d8dd269d489e47e7f7.1725726381.git.jakob.kirsch@web.de>
From: Jakob Kirsch <jakob.kirsch@web.de>
Date: Mon, 2 Sep 2024 23:02:41 +0200
Subject: [PATCH] gnu: lxc: Update to 6.0.1
* gnu/packages/virtualization.scm (lxc): Update to 6.0.1
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
 gnu/packages/virtualization.scm | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
Toggle diff (68 lines)
diff --git a/gnu/packages/virtualization.scm
b/gnu/packages/virtualization.scm
index b076d49985..a5790482a2 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,25 @@ (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"))))))
+               (delete 'shrink-runpath))))
     (synopsis "Linux container tools")
     (home-page "https://linuxcontainers.org/")
     (description
base-commit: b2f9231cd9ff0ce326e36e258a4d14484d6e2199
--
2.45.2
Attachment: OpenPGP_signature.asc
J
J
Jakob Kirsch wrote on 7 Sep 09:57 -0700
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
fd41f42177fcfe99c726a5d8dd269d489e47e7f7.1725726381.git.jakob.kirsch@web.de
* gnu/packages/virtualization.scm (lxc): Update to 6.0.1

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

Toggle diff (65 lines)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b076d49985..a5790482a2 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,25 @@ (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"))))))
+ (delete 'shrink-runpath))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description

base-commit: b2f9231cd9ff0ce326e36e258a4d14484d6e2199
--
2.45.2
L
L
Liliana Marie Prikler wrote on 7 Sep 10:12 -0700
06db92ce060295dca7eefc2c548b0c3a926a96fa.camel@gmail.com
Am Samstag, dem 07.09.2024 um 18:57 +0200 schrieb Jakob Kirsch:
Toggle quote (1 lines)
> * gnu/packages/virtualization.scm (lxc): Update to 6.0.1
Note: The ChangeLog is still incomplete, it's missing the change to
meson-build-system, etc, discussed below. I'll indent the parts you
should add with spaces.

Toggle quote (37 lines)
> Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
> ---
>  gnu/packages/virtualization.scm | 30 +++++++++++++-----------------
>  1 file changed, 13 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/virtualization.scm
> b/gnu/packages/virtualization.scm
> index b076d49985..a5790482a2 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,25 @@ (define-public lxc
>                      version ".tar.gz"))
>                (sha256
>                 (base32
> -               
> "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"))))
> -    (build-system gnu-build-system)
> +               
> "1q3p3zzm338pmc97z6ly8cjginkyljxqbk1c37l2xa46vfy8zcyc"))))
> +    (build-system meson-build-system)
[build-system]: Change to meson-build-system.

Toggle quote (5 lines)
>      (native-inputs
>       (list pkg-config docbook2x))
>      (inputs
> -     (list gnutls libcap libseccomp libselinux))
> +     (list gnutls libcap libseccomp libselinux dbus))
[inputs]: Add dbus.

Toggle quote (14 lines)
>      (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")
[arguments]: Replace "--docdir=..." with "-Ddoc-path=..."
Replace "--sysconfdir=/etc" with "-Ddistrosysconfdir=/etc".
Remove "--localstatedir=/var"
Add [all the things that are added].
Toggle quote (14 lines)
>             #: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"))))))
> +               (delete 'shrink-runpath))))
<#:phases>: No longer replace 'install.
Delete 'shrink-runpath.
The latter isn't something you should do willy-nilly btw. Is there a
good reason to do so? It should be commented in the code.
Toggle quote (4 lines)
>      (synopsis "Linux container tools")
>      (home-page "https://linuxcontainers.org/")
>      (description

Cheers
J
J
Jakob Kirsch wrote on 8 Sep 08:09 -0700
[PATCH] gnu: lxc: Update to 6.0.1
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
30a663c17f2de556f796852bb12c6cb2c9fbbeef.1725808144.git.jakob.kirsch@web.de
* 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(-)

Toggle diff (66 lines)
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
J
J
Jakob Kirsch wrote 5 days ago
[PATCH v6] gnu: lxc: Update to 6.0.1
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
0b211fa887337186ffe67ce2584dca7a9eed171f.1726081213.git.jakob.kirsch@web.de
* 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(-)

Toggle diff (66 lines)
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: b46256b162e15420bb034a9e6d65ec46f1c03343
--
2.46.0
J
J
Jakob Kirsch wrote 4 days ago
[PATCH v7] gnu: lxc: Update to 6.0.1
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
275e58388f07a69ff54e1f4f2fc8c36a32281e14.1726180157.git.jakob.kirsch@web.de
* 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(-)

Toggle diff (67 lines)
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 <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,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
J
J
Jakob Kirsch wrote 3 days ago
[PATCH v8] gnu: lxc: Update to 6.0.1
(address . 72976@debbugs.gnu.org)(name . Jakob Kirsch)(address . jakob.kirsch@web.de)
9d974d413d49d76c07e382e0681cb36e9d37dcb7.1726273047.git.jakob.kirsch@web.de
* 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.
Add 'move-out
Add 'move-in

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

Toggle diff (69 lines)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b076d49985..eb586f2162 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,29 @@ (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 doesn't like this file, so we'll move it out of the way
+ (add-before 'shrink-runpath 'move-out
+ (lambda _ (rename-file (string-append #$output "/sbin/init.lxc.static") (string-append #$output "/init.lxc.static"))))
+ (add-after 'shrink-runpath 'move-in
+ (lambda _ (rename-file (string-append #$output "/init.lxc.static") (string-append #$output "/sbin/init.lxc.static")))))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description

base-commit: 013bda5e2c53bcf1d9093286c3658b95f5e32c09
--
2.46.0
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 72976@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 72976
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch