From patchwork Wed Mar 8 12:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47784 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 9CC3D16E3C; Wed, 8 Mar 2023 12:15:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 68F7A16E31 for ; Wed, 8 Mar 2023 12:15:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshM-0005xV-ML; Wed, 08 Mar 2023 07:15:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZshE-0005sj-I9 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZshE-0008Ss-94 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshE-0007uC-4f for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 7/7] gnu: Add asahi-fwextract. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61959 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61959@debbugs.gnu.org Cc: Roman Scherer Received: via spool by 61959-submit@debbugs.gnu.org id=B61959.167827765730256 (code B ref 61959); Wed, 08 Mar 2023 12:15:04 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:17 +0000 Received: from localhost ([127.0.0.1]:47987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgS-0007rt-SF for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:17 -0500 Received: from mail-ed1-f46.google.com ([209.85.208.46]:33406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgL-0007qH-82 for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:09 -0500 Received: by mail-ed1-f46.google.com with SMTP id a25so65099125edb.0 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lR/2YDPsu/Hni8jrBGZ7aUJigZG2n8K9V/iF2ycg7BI=; b=3hzdkcE7Q+dfW7n4rcssPKAeYTAevRigh0vyunmbxlZo9tO6KVFF3P8Z7+XGrZGrs2 /DA9Hbq7cUrsMFaBENs8CayoTNGgyIsmZUncZNWiF8txoeC/cQkqfYVJ5UIgDYlDEfg4 6MaYo/YI/vQcslx3DXOkeY/JyTfhqkUEclrwvfq9u05QH8fEfv85QSryAaDGwlSFbVEn hM9JYHJWxxbuJMgqXZjmNTongj1OkuKq5iwnet78r7hPLWPeZ7ubBgt13fIMezwK1san L78HpQMXyi1T6mnCrrEvdK+/UHi10XOFg2oNVJN+w8TENItjvK6zo9TXbauEcEmpn86M U9JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lR/2YDPsu/Hni8jrBGZ7aUJigZG2n8K9V/iF2ycg7BI=; b=Zryy5SRmWPlvYYtW/xXmfb1qvXMMcemKneez5+FzPH6qG0bYoqHrRkvU60W5CfDKp+ 4fWT5qjj4aj2lXD/ugmbjcQu3Rw5tz8A5qgtP9ePfRc7iVGKOp3kZwoaKsPWT3bOfUFH /tQu0pw8ImoRJtASgNFZ7MYh/h22xI96VDLgqXNNI3PLlXdBk5n705ysbSqev48jWqe3 tklm/38Gzuv/BEHvUulfCXNfHlWM0+4ak77N+SoXekIjnUHJM6koY1aR8B3umuhKw3R3 d88a6nVkNbasVB56mgdkujIHw4XlZcrWWLUCf+hllzdIkId0iOFTOr+VDpcMQ7GWaISz HEuw== X-Gm-Message-State: AO0yUKXQF5wzy4HLyjdHAzNUtUwwDSae5zd0M3lTkyG2WXcEPjMq5Hny FxZICUhwAriH848KJmlCuq1mRseluY15gl9+0Ic= X-Google-Smtp-Source: AK7set+fknhli1wbEfQPKf5NgTOEfrAO0CY19mFXxUpneyuOk2AjBB/bwoTCawFG5xvF2rkrscNGdg== X-Received: by 2002:a17:906:2f0c:b0:878:61d8:d7c2 with SMTP id v12-20020a1709062f0c00b0087861d8d7c2mr17629954eji.39.1678277643407; Wed, 08 Mar 2023 04:14:03 -0800 (PST) Received: from localhost.localdomain ([2a01:598:b1a6:a6ef:9056:798a:7775:63bc]) by smtp.gmail.com with ESMTPSA id q2-20020a50cc82000000b004acbda55f6bsm8024473edi.27.2023.03.08.04.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:03 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:50 +0100 Message-Id: <162674841f20639847efd335ebfb4d530446440d.1678277362.git.roman@burningswell.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (asahi-fwextract): New variable. --- gnu/packages/firmware.scm | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a876aa727a..0d52349240 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -34,6 +34,7 @@ (define-module (gnu packages firmware) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -77,6 +78,47 @@ (define-module (gnu packages firmware) #:use-module (gnu packages xml) #:use-module (ice-9 match)) +(define-public asahi-fwextract + (let ((commit "0ac64c9ce1c460f4576162a82d239d7e8688a79e")) + (package + (name "asahi-fwextract") + (version (git-version "0.5.3" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AsahiLinux/asahi-installer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kj9ycy3f34fzm9bnirlcw9zm2sgipwrqzphdg5k099rbjbc7zmj")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "vendor") + (with-output-to-file "entry_points.txt" + (lambda () + (format #t "[console_scripts]\n") + (format #t "asahi-fwextract = asahi_firmware.update:main"))))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'create-entrypoints 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/asahi-fwextract") + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "lzfse") "/lib")))))))))) + (inputs (list lzfse)) + (home-page "https://github.com/AsahiLinux/asahi-installer") + (synopsis "Asahi Linux firmware extractor") + (description "The Asahi Linux firmware extractor transform the firmware archive +provided by the Asahi Linux installer into a manifest and CPIO and TAR +archives that are compatible with the Linux kernel.") + (license license:expat)))) + (define-public ath9k-htc-firmware (package (name "ath9k-htc-firmware")