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 v11] gnu: lxc: Update to 6.0.1
Date: Thu, 19 Sep 2024 11:54:55 +0200 [thread overview]
Message-ID: <9ab8b1ca3abeba34f9acdc18b04a53122fe54809.1726739677.git.jakob.kirsch@web.de> (raw)
In-Reply-To: <O5n1xhG--J-9@tutanota.com>
* 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
prev parent reply other threads:[~2024-09-19 9:56 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
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 ` Jakob Kirsch via Bug reports for GNU Guix [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ab8b1ca3abeba34f9acdc18b04a53122fe54809.1726739677.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.