From 287bcbcbb63a1dee99cb7d20e60c747a42460aa4 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 10:25:28 +0200 Subject: [PATCH 1/7] adding podman 4.1.1 --- glicid/packages/containers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm index 038cad8..32b88ae 100644 --- a/glicid/packages/containers.scm +++ b/glicid/packages/containers.scm @@ -20,7 +20,7 @@ ) ) -(define-public podman +(define-public podman-4.1.0 (package (inherit gnu:podman) (name "podman") From 7f71ddfa423d50a3134f5d52c2d83225b108ddab Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 10:34:55 +0200 Subject: [PATCH 2/7] updating shadow to 4.11.1 --- glicid/packages/admin.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/glicid/packages/admin.scm b/glicid/packages/admin.scm index 08d42b6..2f877a2 100644 --- a/glicid/packages/admin.scm +++ b/glicid/packages/admin.scm @@ -17,6 +17,21 @@ ) +(define-public shadow + (package + (inherit gnu:shadow) + (name "shadow") + (version "4.11.1") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz") + )) + (sha256 (base32 "15bwf2krh4crj4w2frkzw9pkxiwbq7h56m8wk8w5zbmjb3797w21")) + )) + ) +) + (define-public sudo (let* ((sudo-minimal gnu:sudo)) (package From 3cd1d127a3d613bb4fef9acef1cc301c98ad5582 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 11:05:53 +0200 Subject: [PATCH 3/7] adding qemu-minimal 7.0.0 --- glicid/packages/virtualization.scm | 59 +++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 2aa113f..4e4c083 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -11,28 +11,50 @@ (define-public qemu-7.0-upstream - (package + (package (inherit qemu) (name "qemu-upstream") (version "7.0.0") - - (source - (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn")) - (patches (search-patches "qemu-build-info-manual.patch" - "qemu-fix-agent-paths.patch")) - (modules '((guix build utils))) - (snippet + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn")) + (patches (search-patches + "qemu-build-info-manual.patch" + "qemu-fix-agent-paths.patch" + )) + (modules '((guix build utils))) + (snippet '(begin ;; Delete the bundled meson copy. - (delete-file-recursively "meson"))))) - + (delete-file-recursively "meson") + ) + ) + )) + ) +) +(define-public qemu-minimal-7.0-upstream + (package + (inherit qemu-minimal) + (name "qemu-minimal-upstream") + (version "7.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn")) + (patches (search-patches + "qemu-build-info-manual.patch" + "qemu-fix-agent-paths.patch" + )) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled meson copy. + (delete-file-recursively "meson") + ) + ) + )) ) ) @@ -40,6 +62,9 @@ (define qemu-latest (latest-version local-qemu qemu)) +(define local-qemu-minimal qemu-minimal-7.0-upstream) + +(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal)) (define-public qemu-with-rbd (package @@ -60,7 +85,7 @@ (define-public qemu-minimal-with-rbd (package - (inherit qemu-minimal) + (inherit qemu-minimal-latest) (name "qemu-minimal-with-rbd") (arguments (substitute-keyword-arguments `( From 946e4ec8257e4b78b5b2e00b42d203c95e809979 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 11:35:07 +0200 Subject: [PATCH 4/7] updating qemu-guest-agent to use glicid version of qemu --- glicid/services/virtualization.scm | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 glicid/services/virtualization.scm diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm new file mode 100644 index 0000000..197a9b7 --- /dev/null +++ b/glicid/services/virtualization.scm @@ -0,0 +1,61 @@ +(define-module (glicid services virtualization) + #:use-module (glicid packages virtualizartion) + #:export ( + qemu-guest-agent-configuration + qemu-guest-agent-configuration? + qemu-guest-agent-service-type + ) +) + +(define-configuration qemu-guest-agent-configuration + (qemu (file-like qemu-minimal) "QEMU package.") + (device + (string "") + "Path to device or socket used to communicate with the host. If not specified, the QEMU default path is used." + ) +) + +(define (qemu-guest-agent-shepherd-service config) + (let + ( + (qemu (qemu-guest-agent-configuration-qemu config)) + (device (qemu-guest-agent-configuration-device config)) + ) + (list + (shepherd-service + (provision '(qemu-guest-agent)) + (documentation "Run the QEMU guest agent.") + (start #~(make-forkexec-constructor + `(, + (string-append #$qemu "/bin/qemu-ga") + "-d" + "--pidfile=/var/run/qemu-ga.pid" + "--statedir=/var/run" + ,@(if #$device + (list (string-append "--path=" #$device)) + '() + ) + ) + #:pid-file "/var/run/qemu-ga.pid" + #:log-file "/var/log/qemu-ga.log") + ) + (stop #~(make-kill-destructor)) + ) + ) + ) +) + +(define qemu-guest-agent-service-type + (service-type + (name 'qemu-guest-agent) + (extensions + (list ( + service-extension + shepherd-root-service-type + qemu-guest-agent-shepherd-service + )) + ) + (default-value (qemu-guest-agent-configuration)) + (description "Run the QEMU guest agent.") + ) +) From 8fdc150020437669c1d6ed8188cf57f24e5d7c48 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 11:42:36 +0200 Subject: [PATCH 5/7] typo --- glicid/services/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm index 197a9b7..a8f2449 100644 --- a/glicid/services/virtualization.scm +++ b/glicid/services/virtualization.scm @@ -1,5 +1,5 @@ (define-module (glicid services virtualization) - #:use-module (glicid packages virtualizartion) + #:use-module (glicid packages virtualization) #:export ( qemu-guest-agent-configuration qemu-guest-agent-configuration? From 482c93d945f66329e57494b63172c4d794ff3a3c Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 12:10:03 +0200 Subject: [PATCH 6/7] updating qemu-ga --- glicid/services/virtualization.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm index a8f2449..8e423ad 100644 --- a/glicid/services/virtualization.scm +++ b/glicid/services/virtualization.scm @@ -1,4 +1,10 @@ (define-module (glicid services virtualization) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (guix) + #:use-module (guix records) + #:use-module (ice-9 match) #:use-module (glicid packages virtualization) #:export ( qemu-guest-agent-configuration From 742a9642f60ae2d6fa174aefdfac88ef4697aab1 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sat, 18 Jun 2022 13:13:43 +0200 Subject: [PATCH 7/7] removing useless service --- glicid/services/virtualization.scm | 67 ------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 glicid/services/virtualization.scm diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm deleted file mode 100644 index 8e423ad..0000000 --- a/glicid/services/virtualization.scm +++ /dev/null @@ -1,67 +0,0 @@ -(define-module (glicid services virtualization) - #:use-module (gnu services) - #:use-module (gnu services configuration) - #:use-module (gnu services shepherd) - #:use-module (guix) - #:use-module (guix records) - #:use-module (ice-9 match) - #:use-module (glicid packages virtualization) - #:export ( - qemu-guest-agent-configuration - qemu-guest-agent-configuration? - qemu-guest-agent-service-type - ) -) - -(define-configuration qemu-guest-agent-configuration - (qemu (file-like qemu-minimal) "QEMU package.") - (device - (string "") - "Path to device or socket used to communicate with the host. If not specified, the QEMU default path is used." - ) -) - -(define (qemu-guest-agent-shepherd-service config) - (let - ( - (qemu (qemu-guest-agent-configuration-qemu config)) - (device (qemu-guest-agent-configuration-device config)) - ) - (list - (shepherd-service - (provision '(qemu-guest-agent)) - (documentation "Run the QEMU guest agent.") - (start #~(make-forkexec-constructor - `(, - (string-append #$qemu "/bin/qemu-ga") - "-d" - "--pidfile=/var/run/qemu-ga.pid" - "--statedir=/var/run" - ,@(if #$device - (list (string-append "--path=" #$device)) - '() - ) - ) - #:pid-file "/var/run/qemu-ga.pid" - #:log-file "/var/log/qemu-ga.log") - ) - (stop #~(make-kill-destructor)) - ) - ) - ) -) - -(define qemu-guest-agent-service-type - (service-type - (name 'qemu-guest-agent) - (extensions - (list ( - service-extension - shepherd-root-service-type - qemu-guest-agent-shepherd-service - )) - ) - (default-value (qemu-guest-agent-configuration)) - (description "Run the QEMU guest agent.") - ) -)