From patchwork Wed Feb 12 16:37:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20229 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2992727BBE4; Wed, 12 Feb 2020 16:38:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DDF6C17B7C for ; Wed, 12 Feb 2020 16:38:09 +0000 (GMT) Received: from localhost ([::1]:40216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1d-0000Rb-Ch for patchwork@mira.cbaines.net; Wed, 12 Feb 2020 11:38:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36082) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1W-0000RK-St for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1v1V-0006Uz-OG for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1v1V-0006Uv-LM for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j1v1V-0004lq-Ii for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39579] [PATCH 1/3] gnu: osinfo-db-tools: Add osinfo-db-tools. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2020 16:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39579 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39579@debbugs.gnu.org Received: via spool by 39579-submit@debbugs.gnu.org id=B39579.158152544318272 (code B ref 39579); Wed, 12 Feb 2020 16:38:01 +0000 Received: (at 39579) by debbugs.gnu.org; 12 Feb 2020 16:37:23 +0000 Received: from localhost ([127.0.0.1]:58977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0q-0004kS-2L for submit@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:23 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:55139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0n-0004kJ-L5 for 39579@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:18 -0500 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A29F66000A for <39579@debbugs.gnu.org>; Wed, 12 Feb 2020 16:37:15 +0000 (UTC) From: Brice Waegeneire Date: Wed, 12 Feb 2020 17:37:09 +0100 Message-Id: <20200212163711.17468-1-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212163046.15761-1-brice@waegenei.re> References: <20200212163046.15761-1-brice@waegenei.re> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (osinfo-db-tools): New variable. --- gnu/packages/virtualization.scm | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3670b396a5..57d433599a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guy Fleury Iteriteka +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -1382,3 +1384,41 @@ which is a hypervisor.") ;; TODO: Some files are licensed differently. List those. (license license:gpl2) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")))) + +(define-public osinfo-db-tools + (package + (name "osinfo-db-tools") + (version "1.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-tools-" + version ".tar.xz")) + + (sha256 + (base32 + "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out"))))) + (inputs + `(("libsoup" ,libsoup) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("json-glib" ,json-glib) + ("libarchive" ,libarchive) + ("gobject-introspection" ,gobject-introspection))) + (native-inputs + `(("perl" ,perl) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ;; Tests + ("python" ,python) + ("pytest" ,python-pytest) + ("requests" ,python-requests) + )) + (home-page "https://gitlab.com/libosinfo/osinfo-db-tools") + (synopsis "Tools for managing the osinfo database") + (description "This package contains a set of tools to assist administrators and +developers in managing the database.") + (license license:lgpl2.0+))) From patchwork Wed Feb 12 16:37:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20230 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 700C027BBE4; Wed, 12 Feb 2020 16:38:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3CCBE17B7C for ; Wed, 12 Feb 2020 16:38:10 +0000 (GMT) Received: from localhost ([::1]:40218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1d-0000Rn-Nk for patchwork@mira.cbaines.net; Wed, 12 Feb 2020 11:38:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36088) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1X-0000RM-9X for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1v1W-0006VH-41 for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1v1W-0006VD-1D for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j1v1V-0004ly-W8 for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39579] [PATCH 2/3] gnu: osinfo-db: Add osinfo-db. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2020 16:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39579 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39579@debbugs.gnu.org Received: via spool by 39579-submit@debbugs.gnu.org id=B39579.158152544418278 (code B ref 39579); Wed, 12 Feb 2020 16:38:01 +0000 Received: (at 39579) by debbugs.gnu.org; 12 Feb 2020 16:37:24 +0000 Received: from localhost ([127.0.0.1]:58980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0t-0004kf-Oz for submit@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:24 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:54501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0r-0004kU-JK for 39579@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:22 -0500 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id CBD661C0011 for <39579@debbugs.gnu.org>; Wed, 12 Feb 2020 16:37:19 +0000 (UTC) From: Brice Waegeneire Date: Wed, 12 Feb 2020 17:37:10 +0100 Message-Id: <20200212163711.17468-2-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212163046.15761-1-brice@waegenei.re> References: <20200212163046.15761-1-brice@waegenei.re> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (osinfo-db): New variable. --- gnu/packages/virtualization.scm | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 57d433599a..3769ece889 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -92,6 +92,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -1422,3 +1423,39 @@ which is a hypervisor.") (description "This package contains a set of tools to assist administrators and developers in managing the database.") (license license:lgpl2.0+))) + +(define-public osinfo-db + (package + (name "osinfo-db") + (version "20200203") + (source (origin + (method url-fetch) + (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" + version ".tar.xz")) + (sha256 + (base32 + "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (osinfo-dir (string-append out "/share/osinfo")) + (source (assoc-ref %build-inputs "source"))) + (set-path-environment-variable + "PATH" '("bin") + (list (assoc-ref %build-inputs "osinfo-db-tools"))) + (mkdir-p osinfo-dir) + (invoke "osinfo-db-import" "--dir" osinfo-dir source) + #t)))) + (native-inputs + `(("intltool" ,intltool) + ("osinfo-db-tools" ,osinfo-db-tools))) + (home-page "https://gitlab.com/libosinfo/osinfo-db") + (synopsis "Database of information about operating systems") + (description "Osinfo-db provides the database files for use with the +libosinfo library. It provides information about guest operating systems for +use with virtualization provisioning tools") + (license license:lgpl2.0+))) From patchwork Wed Feb 12 16:37:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20231 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB58E27BBE4; Wed, 12 Feb 2020 16:38:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B380817B7C for ; Wed, 12 Feb 2020 16:38:11 +0000 (GMT) Received: from localhost ([::1]:40224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1f-0000Vd-9d for patchwork@mira.cbaines.net; Wed, 12 Feb 2020 11:38:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36091) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1v1X-0000RN-F2 for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1v1W-0006VR-Gt for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1v1W-0006VL-Dy for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j1v1W-0004m5-CW for guix-patches@gnu.org; Wed, 12 Feb 2020 11:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39579] [PATCH 3/3] gnu: virt-manager: Include operating systems list. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2020 16:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39579 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39579@debbugs.gnu.org Received: via spool by 39579-submit@debbugs.gnu.org id=B39579.158152544618292 (code B ref 39579); Wed, 12 Feb 2020 16:38:02 +0000 Received: (at 39579) by debbugs.gnu.org; 12 Feb 2020 16:37:26 +0000 Received: from localhost ([127.0.0.1]:58983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0w-0004ky-2l for submit@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:26 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:52493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1v0u-0004ke-6T for 39579@debbugs.gnu.org; Wed, 12 Feb 2020 11:37:24 -0500 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 4CDC71C0010 for <39579@debbugs.gnu.org>; Wed, 12 Feb 2020 16:37:23 +0000 (UTC) From: Brice Waegeneire Date: Wed, 12 Feb 2020 17:37:11 +0100 Message-Id: <20200212163711.17468-3-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212163046.15761-1-brice@waegenei.re> References: <20200212163046.15761-1-brice@waegenei.re> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (virt-manager)[inputs]: Add osinfo-db. [arguments]: Add phase patch. --- gnu/packages/virtualization.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3769ece889..222d59d8bc 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -328,12 +328,22 @@ server and embedded PowerPC, and S390 guests.") (list (string-append "-Dwith-usb-ids-path=" (assoc-ref %build-inputs "usb.ids")) (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))))) + (assoc-ref %build-inputs "pci.ids"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" (assoc-ref inputs "osinfo-db") + "/share/osinfo\";"))) + #t))))) (inputs `(("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("gobject-introspection" ,gobject-introspection))) + ("gobject-introspection" ,gobject-introspection) + ("osinfo-db" ,osinfo-db))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gtk-doc" ,gtk-doc)