From patchwork Sun Aug 14 21:44:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 41679 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 CC68C27BBEA; Sun, 14 Aug 2022 22:45:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8C4527BBE9 for ; Sun, 14 Aug 2022 22:45:31 +0100 (BST) Received: from localhost ([::1]:45074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNLQJ-0003pq-2R for patchwork@mira.cbaines.net; Sun, 14 Aug 2022 17:45:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNLPq-0003pK-Iz for guix-patches@gnu.org; Sun, 14 Aug 2022 17:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50259) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNLPq-0004N5-7b for guix-patches@gnu.org; Sun, 14 Aug 2022 17:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNLPq-00059v-4E for guix-patches@gnu.org; Sun, 14 Aug 2022 17:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46278] [PATCH v2] Add fwupd References: <20210203231419.26724-3-lle-bout@zaclys.net> In-Reply-To: <20210203231419.26724-3-lle-bout@zaclys.net> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Aug 2022 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46278 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "46278@debbugs.gnu.org" <46278@debbugs.gnu.org> Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 46278-submit@debbugs.gnu.org id=B46278.166051346219770 (code B ref 46278); Sun, 14 Aug 2022 21:45:02 +0000 Received: (at 46278) by debbugs.gnu.org; 14 Aug 2022 21:44:22 +0000 Received: from localhost ([127.0.0.1]:40008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNLPB-00058n-BE for submit@debbugs.gnu.org; Sun, 14 Aug 2022 17:44:22 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:35557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNLP8-00058Y-QL for 46278@debbugs.gnu.org; Sun, 14 Aug 2022 17:44:20 -0400 Date: Sun, 14 Aug 2022 21:44:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1660513451; x=1660772651; bh=VFDW2MsTcFPRZcdoM4OUHMwLWfAUBUIk59soanPgN7g=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=nyOZN1w16jO3Q/O0iU0/jHB3VKuNZo1MQdbA61qUNGy5LOKxvXmEzoxbSmM/oL3c6 6hLfJT6nMjBJQfCcHi4q3sToBTSxH2wEYgcZRh1BeG6ZrufPNtrhVwUjM61fXQmkBs x+McTJ7JIPvqMl6ZJVI3ryW507Jeeu2Z+n1FOFNl31jKpytvt7gQncFV5dfqxHL0PO HQx3izqgcUOTkQKBPzUZKoVpket/zYNndCBnW0W0SJ7tu7aaFs+G/yj6dd5J8pRMPy /wGfz+HX6wl2UtSpxGuprEHFXShxQlBi5U0bBSrrs+forc+PY7ZW/+JsOsARiZRpGu H55wm+f13ifkQ== Message-ID: Feedback-ID: 14143818:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, here's updated patch for fwupd. I attempted to add also Gnome GUI but for some reason the pkgconfig in meson is not detecting the fwupd even though that when ran manually it finds it. Here's the error: Found pkg-config: /gnu/store/2b3blhwbag1ial0dhxw7wh4zjxl0cqpk-pkg-config-0.29.2/bin/pkg-config (0.29.2) Run-time dependency gtk4 found: YES 4.6.6 Run-time dependency gio-2.0 found: YES 2.70.2 Did not find CMake 'cmake' Found CMake: NO Run-time dependency fwupd found: NO (tried pkgconfig and cmake) Looking for a fallback subproject for the dependency fwupd ../source/meson.build:81:0: ERROR: Git program not found, cannot download fwupd.wrap via git. A full log can be found at /tmp/guix-build-gnome-firmware-42.2.drv-0/build/meson-logs/meson-log.txterror: in phase 'configure': uncaught exception: And here's the search result (I sourced the environment first): /tmp/guix-build-gnome-firmware-42.2.drv-0/source$ pkg-config --list-all | grep fwupd fwupdplugin fwupdplugin - library for plugins to use to interact with fwupd daemonfwupd fwupd - fwupd is a system daemon for installing device firmware FIY Same error happens when I attempt to build the libaccounts-qt for KDE updates.[1][2] [1] https://gitlab.com/accounts-sso/libaccounts-qt/-/issues/5 [2] https://issues.guix.gnu.org/50862#38 From d5bb4d798b40d91119d54077514d70234f6f3818 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 4 Jan 2022 06:58:51 +0100 Subject: [PATCH v2 1/2] gnu: Add fwupd. * gnu/packages/firmware.scm (fwupd): New variable. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a258af30bf..a29f3d2b6a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -36,21 +36,43 @@ (define-module (gnu packages firmware) #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) #:use-module (gnu packages assembly) + #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages cmake) - #:use-module (gnu packages curl) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) + #:use-module (gnu packages curl) + #:use-module (gnu packages efi) + #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages gtk) + #:use-module (gnu packages hardware) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages man) + #:use-module (gnu packages mingw) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) (define-public ath9k-htc-firmware (package @@ -168,6 +190,89 @@ (define-public b43-tools driver.") (license license:gpl2)))) +(define-public fwupd + (package + (name "fwupd") + (version "1.8.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fwupd/fwupd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02jf052qj1nl47ppqrgz3s9qapq4pajgkf6lbj5rxr5sshlrw44n")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "--wrap-mode=nofallback" + "-Dsystemd=false" + (string-append "-Defi_os_dir=" + #$gnu-efi "/lib") + "-Defi_binary=false" + (string-append "-Dudevdir=" + #$output "/lib/udev") + "--localstatedir=/var" + (string-append "--libexecdir=" + #$output "/libexec") + "-Dsupported_build=true") + #:glib-or-gtk? #t ;To wrap binaries and/or compile schemas + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'make-source-writable + (lambda _ + (for-each make-file-writable + (find-files ".")) + (substitute* "src/fu-self-test.c" + (("/bin/sh") + (which "sh"))))) + (add-before 'build 'setup-home + (lambda _ + (setenv "HOME" "/tmp"))) + (add-before 'install 'no-polkit-magic + (lambda _ + (setenv "PKEXEC_UID" "something")))))) + (native-inputs (list gobject-introspection + python-pygobject + python-pillow + python-pycairo + python + pkg-config + vala + gtk-doc + which + umockdev + `(,glib "bin") + help2man + gettext-minimal)) + (inputs (list bash-completion + glib + libgudev + libxmlb + gusb + sqlite + libarchive + libjcat + json-glib + curl + polkit + eudev + gcab + gnutls + libelf + tpm2-tss + cairo + efivar + pango + protobuf-c + mingw-w64-tools + libsmbios + gnu-efi)) + (home-page "https://fwupd.org/") + (synopsis "A simple daemon to allow session software to update firmware") + (description "This package aims to make updating firmware on Linux +automatic, safe and reliable.") + (license license:lgpl2.1+))) + (define-public openfwwf-firmware (package (name "openfwwf-firmware") -- 2.37.0