* bug#72976: LXC 4.0.12 does not build with latest glibc
@ 2024-09-02 14:03 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
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: kasper.andersson--- via Bug reports for GNU Guix @ 2024-09-02 14:03 UTC (permalink / raw)
To: 72976
[-- Attachment #1: Type: text/plain, Size: 4399 bytes --]
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 #2: Type: text/html, Size: 9234 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: bump to 6.0.1
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 ` Jakob Kirsch via Bug reports for GNU Guix
2024-09-02 21:06 ` Jakob Kirsch via Bug reports for GNU Guix
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-02 21:03 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch, kasper.andersson
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
gnu/packages/virtualization.scm | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: bump to 6.0.1
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
` (8 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-02 21:06 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch, kasper.andersson
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")
(home-page "https://linuxcontainers.org/")
(description
base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: LXC 4.0.12 does not build with latest glibc
2024-09-02 21:06 ` Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-02 21:13 ` Jakob Kirsch via Bug reports for GNU Guix
0 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-02 21:13 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch, kasper.andersson
[-- Attachment #1.1.1: Type: text/plain, Size: 2512 bytes --]
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")
> (home-page "https://linuxcontainers.org/")
> (description
>
> base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87
> --
> 2.45.2
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 5825 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: Update to 6.0.1
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-07 16:33 ` Jakob Kirsch via Bug reports for GNU Guix
2024-09-07 16:57 ` Jakob Kirsch via Bug reports for GNU Guix
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-07 16:33 UTC (permalink / raw)
To: 72976
[-- Attachment #1.1: Type: text/plain, Size: 3810 bytes --]
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(-)
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: Update to 6.0.1
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
` (2 preceding siblings ...)
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
` (6 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-07 16:57 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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(-)
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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: Update to 6.0.1
2024-09-07 16:57 ` Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-07 17:12 ` Liliana Marie Prikler
0 siblings, 0 replies; 14+ messages in thread
From: Liliana Marie Prikler @ 2024-09-07 17:12 UTC (permalink / raw)
To: Jakob Kirsch, 72976
Am Samstag, dem 07.09.2024 um 18:57 +0200 schrieb Jakob Kirsch:
> * 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.
> 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.
> (native-inputs
> (list pkg-config docbook2x))
> (inputs
> - (list gnutls libcap libseccomp libselinux))
> + (list gnutls libcap libseccomp libselinux dbus))
[inputs]: Add 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")
[arguments]: Replace "--docdir=..." with "-Ddoc-path=..."
Replace "--sysconfdir=/etc" with "-Ddistrosysconfdir=/etc".
Remove "--localstatedir=/var"
Add [all the things that are added].
> #: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.
> (synopsis "Linux container tools")
> (home-page "https://linuxcontainers.org/")
> (description
Cheers
^ permalink raw reply [flat|nested] 14+ messages in thread
* bug#72976: [PATCH] gnu: lxc: Update to 6.0.1
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
` (3 preceding siblings ...)
2024-09-07 16:57 ` Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-08 15:09 ` Jakob Kirsch via Bug reports for GNU Guix
2024-09-11 19:00 ` bug#72976: [PATCH v6] " Jakob Kirsch via Bug reports for GNU Guix
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-08 15:09 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v6] gnu: lxc: Update to 6.0.1
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
` (4 preceding siblings ...)
2024-09-08 15:09 ` Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-11 19:00 ` 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
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-11 19:00 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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: b46256b162e15420bb034a9e6d65ec46f1c03343
--
2.46.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v7] gnu: lxc: Update to 6.0.1
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
` (5 preceding siblings ...)
2024-09-11 19:00 ` bug#72976: [PATCH v6] " Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-12 22:29 ` 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
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-12 22:29 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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 <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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v8] gnu: lxc: Update to 6.0.1
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
` (6 preceding siblings ...)
2024-09-12 22:29 ` bug#72976: [PATCH v7] " Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-14 0:17 ` 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
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-14 0:17 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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(-)
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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v9] gnu: lxc: Update to 6.0.1
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
` (7 preceding siblings ...)
2024-09-14 0:17 ` bug#72976: [PATCH v8] " Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-18 19:15 ` 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
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-18 19:15 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* 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 'delete-static-init
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 eaa7a8a264..0182c5d59e 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 doesn't like this file and it's unecessary, so we'll delete it
+ (add-before 'shrink-runpath 'delete-static-init
+ (lambda _ (delete-file (string-append #$output "/sbin/init.lxc.static")))))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description
base-commit: 1b6ce1796abdf497f61f426d61339318f4f4f23d
--
2.46.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v10] gnu: lxc: Update to 6.0.1
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
` (8 preceding siblings ...)
2024-09-18 19:15 ` bug#72976: [PATCH v9] " Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-19 9:07 ` 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
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-19 9:07 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* gnu/packages/virtualization.scm (lxc): Update to 6.0.1.
[build-system]: Change to meson-build-system.
[inputs]: Add dbus.
Add apparmor.
[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 'delete-static-init
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
gnu/packages/virtualization.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index eaa7a8a264..620995b01d 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.
;;;
@@ -56,6 +57,7 @@ (define-module (gnu packages virtualization)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages apparmor)
#:use-module (gnu packages assembly)
#:use-module (gnu packages attr)
#:use-module (gnu packages autotools)
@@ -1350,7 +1352,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 +1360,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 apparmor))
(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 and it's unecessary, so we'll delete it
+ (add-before 'shrink-runpath 'delete-static-init
+ (lambda _ (delete-file (string-append #$output "/sbin/init.lxc.static")))))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description
base-commit: 610b395424c02274800d85585cb542ad66d9afea
--
2.46.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#72976: [PATCH v11] gnu: lxc: Update to 6.0.1
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
` (9 preceding siblings ...)
2024-09-19 9:07 ` bug#72976: [PATCH v10] " Jakob Kirsch via Bug reports for GNU Guix
@ 2024-09-19 9:54 ` Jakob Kirsch via Bug reports for GNU Guix
10 siblings, 0 replies; 14+ messages in thread
From: Jakob Kirsch via Bug reports for GNU Guix @ 2024-09-19 9:54 UTC (permalink / raw)
To: 72976; +Cc: Jakob Kirsch
* gnu/packages/virtualization.scm (lxc): Update to 6.0.1.
[source] Add patch lxc-static-link.patch.
[build-system]: Change to meson-build-system.
[inputs]: Add dbus.
Add apparmor.
[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.
* gnu/packages/patches/lxc-static-link.patch: Add patch.
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
---
gnu/local.mk | 1 +
gnu/packages/patches/lxc-static-link.patch | 16 +++++++++++
gnu/packages/virtualization.scm | 33 +++++++++-------------
3 files changed, 31 insertions(+), 19 deletions(-)
create mode 100644 gnu/packages/patches/lxc-static-link.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index bdc740ead6..6872a0f065 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1743,6 +1743,7 @@ dist_patch_DATA = \
%D%/packages/patches/lua-5.4-liblua-so.patch \
%D%/packages/patches/lugaru-fix-sound.patch \
%D%/packages/patches/luit-posix.patch \
+ %D%/packages/patches/lxc-static-link.patch \
%D%/packages/patches/mactelnet-remove-init.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \
diff --git a/gnu/packages/patches/lxc-static-link.patch b/gnu/packages/patches/lxc-static-link.patch
new file mode 100644
index 0000000000..d3fddcd347
--- /dev/null
+++ b/gnu/packages/patches/lxc-static-link.patch
@@ -0,0 +1,16 @@
+diff --color --recursive --text --unified a/meson.build b/meson.build
+--- a/meson.build 2024-06-27 06:43:29.000000000 +0200
++++ b/meson.build 2024-09-19 11:46:21.159619443 +0200
+@@ -435,11 +435,7 @@
+ code = '''
+ int main(int argc, char *argv[]) { return 0; };
+ '''
+- if libcap_static.found()
+- libcap_static_linkable = cc.links(code, args: '-static', dependencies: libcap_static)
+- else
+- libcap_static_linkable = false
+- endif
++ libcap_static_linkable = false
+ srcconf.set10('HAVE_STATIC_LIBCAP', libcap_static_linkable)
+ else
+ libcap_static = []
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index eaa7a8a264..2a4e6ec0b0 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.
;;;
@@ -56,6 +57,7 @@ (define-module (gnu packages virtualization)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages apparmor)
#:use-module (gnu packages assembly)
#:use-module (gnu packages attr)
#:use-module (gnu packages autotools)
@@ -1350,7 +1352,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 +1360,23 @@ (define-public lxc
version ".tar.gz"))
(sha256
(base32
- "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"))))
- (build-system gnu-build-system)
+ "1q3p3zzm338pmc97z6ly8cjginkyljxqbk1c37l2xa46vfy8zcyc"))
+ (patches (search-patches "lxc-static-link.patch"))))
+ (build-system meson-build-system)
(native-inputs
(list pkg-config docbook2x))
(inputs
- (list gnutls libcap libseccomp libselinux))
+ (list gnutls libcap libseccomp libselinux dbus apparmor))
(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")
- #: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"))))))
+ "-Ddistrosysconfdir=/etc"
+ "-Dinit-script=sysvinit"
+ "-Dinstall-state-dirs=false"
+ "-Dinstall-init-files=false"
+ "-Dspecfile=false"
+ "-Db_lto=false")))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description
base-commit: 610b395424c02274800d85585cb542ad66d9afea
--
2.46.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-09-19 9:56 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
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).