From 43beec19f4f3e632a10c44127d0ff94b0a1c3214 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 11:49:05 +0200 Subject: gnu: looking-glass-client: Disable CPU-specific optimizations. * gnu/packages/virtualization.scm (looking-glass-client)[source](modules, snippet): New fields. --- gnu/packages/virtualization.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fd442bde4b..a3504882a2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -817,7 +817,17 @@ (define-public looking-glass-client (file-name (git-file-name name version)) (sha256 (base32 - "02bq46ndmzq9cihazzn7xq1x7q5nzm7iw4l9lqzihxcxp9famkhw")))) + "02bq46ndmzq9cihazzn7xq1x7q5nzm7iw4l9lqzihxcxp9famkhw")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Do not create binaries optimized for the CPU of the build machine, + ;; for reproducibility and compatibility. TODO: in the next version + ;; of looking glass, this is exposed as a CMake configure option. + (substitute* "client/CMakeLists.txt" + (("-march=native") + "")) + #t)))) (build-system cmake-build-system) (inputs `(("fontconfig" ,fontconfig) ("glu" ,glu) -- cgit v1.2.3 From e8156383c6c1e8105ebe378fc625311782f3ea0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Oct 2019 16:03:18 +0100 Subject: gnu: skopeo: Update to 0.1.40. * gnu/packages/virtualization.scm (skopeo): Update to 0.1.40. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a3504882a2..c2f46985f0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -975,7 +975,7 @@ (define-public umoci (define-public skopeo (package (name "skopeo") - (version "0.1.39") + (version "0.1.40") (source (origin (method git-fetch) (uri (git-reference @@ -984,7 +984,7 @@ (define-public skopeo (file-name (git-file-name name version)) (sha256 (base32 - "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi")))) + "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From aa1f0896fb15a0bdcc5474839c8afdbb2520d603 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Sat, 2 Nov 2019 00:31:44 +0100 Subject: gnu: libvirt: Update to 5.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/local.mk (dist_patch_DATA): Add new patch file. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: New patch, submitted to upstream for upstream bug 1760233. * gnu/packages/virtualization.scm (libvirt): Update version to 5.8.0. Include patch. Avoid execution of failing tests qemuxml2argvtest and qemuhotplugtest. Replace python by python-wrapper to avoid warnings on patch-shebangs phase. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + .../patches/libvirt-create-machine-cgroup.patch | 48 ++++++++++++++++++++++ gnu/packages/virtualization.scm | 10 +++-- 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 468bf02ca0..ec3974a8aa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1005,6 +1005,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch new file mode 100644 index 0000000000..585ac237e1 --- /dev/null +++ b/gnu/packages/patches/libvirt-create-machine-cgroup.patch @@ -0,0 +1,48 @@ +From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + +Date: Fri, 1 Nov 2019 17:29:00 +0100 +Subject: [PATCH] vircgroup: Ensure /machine group is associated with its + parent. + +Call first virCgroupNew on the parent group virCgroupNewPartition if +it is available on before the creation of the child group. This +ensures that the creation of a first level group on the unified +architecture, as the check at virCgroupV2ParseControllersFile as the +parent file is there. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 +--- + src/util/vircgroup.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index b46f20abfd..33c61f2d45 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) + goto cleanup; + +- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) +- goto cleanup; +- + if (STRNEQ(newPath, "/")) { + char *tmp; + parentPath = g_strdup(newPath); +@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; ++ } + ++ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) ++ goto cleanup; ++ ++ if (parent) { + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + } +-- +2.23.0 + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c2f46985f0..7266f6606d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -400,14 +400,16 @@ (define-public lxc (define-public libvirt (package (name "libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "1d5rmcx5fgb024hw8chbiv886n3jal5wp2yajjk5l4qh9s9gkx35")))) + (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (patches + (search-patches "libvirt-create-machine-cgroup.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -439,6 +441,8 @@ (define-public libvirt (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails "virnetsockettest" ; tries to network "virshtest"))) ; fails (substitute* "tests/Makefile.in" @@ -480,7 +484,7 @@ (define-public libvirt ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python))) + ("python" ,python-wrapper))) (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit v1.2.3 From 0e00c1c417abd10aed0b5daceb53f2f2016ecd5e Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Sat, 2 Nov 2019 00:44:09 +0100 Subject: gnu: python-libvirt: Update to 5.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (python-libvirt): Update version to 5.8.0, update hash and remove obsolete comment. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7266f6606d..19614b0ac3 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -538,15 +538,14 @@ (define-public libvirt-glib (define-public python-libvirt (package (name "python-libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) - ;; The latest version hosted on PyPI at 5.6.0 release time was 5.5.0. (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "11i440aibykxw22fzyavmrvn67s8rmnijw5bag0yx9r8jpnkzwad")))) + (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 845bf4f477494886476251f40e6ec0702b379897 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Sat, 2 Nov 2019 00:45:48 +0100 Subject: gnu: virt-manager: Update to 2.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (virt-manager): Update to version 2.2.1. Point to the correct file in fix-setup and fix-default-uri phases. Add fix-qemu-img-reference phase. Add gtksourceview as an input. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 19614b0ac3..f113eee5f7 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -577,7 +577,7 @@ (define-public python2-libvirt (define-public virt-manager (package (name "virt-manager") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -585,7 +585,7 @@ (define-public virt-manager version ".tar.gz")) (sha256 (base32 - "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command @@ -603,13 +603,19 @@ (define-public virt-manager (modify-phases %standard-phases (add-after 'unpack 'fix-setup (lambda* (#:key outputs #:allow-other-keys) - (substitute* "virtcli/cliconfig.py" + (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) + (add-after 'unpack 'fix-qemu-img-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "virtconv/formats.py" + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) + #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. - (substitute* "virtManager/connect.py" + (substitute* "virtManager/createconn.py" (("/usr(/bin/qemu-system)" _ suffix) (string-append (assoc-ref inputs "qemu") suffix))) #t)) @@ -640,6 +646,7 @@ (define-public virt-manager `(("dconf" ,dconf) ("gtk+" ,gtk+) ("gtk-vnc" ,gtk-vnc) + ("gtksourceview" ,gtksourceview) ("libvirt" ,libvirt) ("libvirt-glib" ,libvirt-glib) ("libosinfo" ,libosinfo) -- cgit v1.2.3 From 172e121d01f676d532a9a1f9e977f4ddb9b3dc01 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Fri, 8 Nov 2019 02:13:38 +0100 Subject: gnu: qemu: Add upstream patch for failing test. Fixes . Reported by Danny Milosavljevic . * gnu/packages/virtualization.scm (qemu)[patches]: Add upstream patch to fix tests on linux-libre >= 5.3. Signed-off-by: Marius Bakke --- gnu/packages/virtualization.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f113eee5f7..ca27c14a47 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -114,7 +114,16 @@ (define-public qemu version ".tar.xz")) (sha256 (base32 - "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")))) + "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")) + (patches + (list + ;; Fix an ordering issue with recent kernels, see + ;; . + (qemu-patch + "bf9e0313c27d8e6ecd7f7de3d63e1cb25d8f6311" + "qemu-tests-make-filemonitor-test-more-robust.patch" + (base32 + "1242wqpr8id3cn88pzbig3sqh4znml0g0h2mwdmdyhp81blq7s7n")))))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: -- cgit v1.2.3 From 7be834d53e177687ef3d4e19674ab22e6a731c11 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Nov 2019 21:14:09 +0200 Subject: gnu: qmpbackup: Don't use unstable tarball. * gnu/packages/virtualization.scm (qmpbackup)[source]: Download using git-fetch. --- gnu/packages/virtualization.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ca27c14a47..9b89517bb1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -806,13 +806,14 @@ (define-public qmpbackup (name "qmpbackup") (version "0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/abbbi/qmpbackup/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/abbbi/qmpbackup.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10k9mnb1yrg4gw1rvz4kw4dxc4aajl8gnjrpm3axqkg63qmxj3qn")) - (file-name (string-append name "-" version ".tar.gz")))) + "0swhp5byz44brhyis1a39p11fyn9q84xz5q6v2fah29r7d71kmmx")))) (build-system python-build-system) (arguments `(#:python ,python-2)) -- cgit v1.2.3