From patchwork Fri Jan 19 13:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 59132 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 5F2D227BBE9; Fri, 19 Jan 2024 13:56:51 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 E7C7027BBE2 for ; Fri, 19 Jan 2024 13:56:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQpM6-0003aW-VJ; Fri, 19 Jan 2024 08:56:22 -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 1rQpLp-0003Rv-Ad for guix-patches@gnu.org; Fri, 19 Jan 2024 08:56:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQpLn-0007xg-E1 for guix-patches@gnu.org; Fri, 19 Jan 2024 08:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQpLp-0001wm-Kc; Fri, 19 Jan 2024 08:56:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH v2 9/9] gnu: make-crust-package: Unite firmware and tools. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 19 Jan 2024 13:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68355 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68355@debbugs.gnu.org Cc: othacehe@gnu.org, Jean-Pierre De Jesus DIAZ , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 68355-submit@debbugs.gnu.org id=B68355.17056725487391 (code B ref 68355); Fri, 19 Jan 2024 13:56:05 +0000 Received: (at 68355) by debbugs.gnu.org; 19 Jan 2024 13:55:48 +0000 Received: from localhost ([127.0.0.1]:57885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQpLY-0001v8-3H for submit@debbugs.gnu.org; Fri, 19 Jan 2024 08:55:48 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQpLO-0001u9-HH for 68355@debbugs.gnu.org; Fri, 19 Jan 2024 08:55:39 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e9101b5f9so8464345e9.3 for <68355@debbugs.gnu.org>; Fri, 19 Jan 2024 05:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1705672530; x=1706277330; darn=debbugs.gnu.org; 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=cYSJg4kznfBeb3uXd/am6Ad44j0L2Lz8M/31qKpiDFA=; b=WKxKTTVcfgVjoI6kr/x8w/+KKTRErFA02xTULN6+bEtwlZxzm6K/zw1GrmtxC/6Xcf 5l1LuAb9yJDi22OWdvOum0CzmMuMFPzrakgacOcxnki6OQwwBDFVuIg+S0yRLZB/GUn3 RaW1YMG6nORKL3ilYUZiMRxGKmZr0X1Vz0ew1/2pJnr7G9Jt4EN6CbTZnmWyCoFwV3nn t8XBa0MTT601izok08+QJQH9u+rKOF0upq4IaEXvHWYHmbvzNt4vq1OWIuAdjdXcdjRs 5I7+gyvVwj/43cNc1e7T8HtNIgrOAZD7rszXOuZuZWo6lT2Hc2A17owGq+E1wBliG9yV hCNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705672530; x=1706277330; 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=cYSJg4kznfBeb3uXd/am6Ad44j0L2Lz8M/31qKpiDFA=; b=ogsEbk+Arj27qrfJWrRAyqCsd5fnMmcYcYPcKedH1Aocjv5I5NzwxxcqCR00MbBUz5 Q+QloW1HkhMMTjHDQmhBWSlTSTfmx5yJDyLvfN9DytqCNXloirSTTFfA1CM/74tg/MlE /Y18GDkxlfYG0DXQZCSMw7dqqrmoxskonItIp2Y5dSaFVzcRS1UJ6n8xST7hrNvUrdXQ iVUW/0KV7gXU8dI+oblaZkirXPGykk9uoQ6VRTmUPrCHPxeJKAEsUh3aXBo0ambQTvn4 imN2hkxm64igwDt1eV8O56GQarCCryqw0Vx0v2PuGm2WSIqZUSkonGSBBOUey298zv9E 1BtQ== X-Gm-Message-State: AOJu0YzkT/PNyYEx/pLk6jIscmkQa6cLA6mncIj+UQ9xNQMw6NWLGWB1 AhoO8AIo9zotmUfcW6XK5Sp6rAEWkt/cfIKJpRgT2VGuJS61pfAah23Vfso64lw1os2ChJCIZbi 1gAI= X-Google-Smtp-Source: AGHT+IEZw6ppgMnCZVqjzkfljw3lfn/fiOgw+84PwvFLfBET4e6M6h9yxdgR9xhq71hfAM35gEagkw== X-Received: by 2002:a05:600c:152:b0:40e:88b6:4eac with SMTP id w18-20020a05600c015200b0040e88b64eacmr1436701wmm.3.1705672530526; Fri, 19 Jan 2024 05:55:30 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id s8-20020a05600c45c800b0040e527602c8sm33314846wmo.9.2024.01.19.05.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 05:55:30 -0800 (PST) Date: Fri, 19 Jan 2024 14:54:48 +0100 Message-ID: <92e1321694edfd5e3522e991a11a2ba6ece12552.1705672190.git.jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4e6b129a26d38305073c392c04707498a2ddfe69.1705672190.git.jean@foundationdevices.com> References: <4e6b129a26d38305073c392c04707498a2ddfe69.1705672190.git.jean@foundationdevices.com> 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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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 (make-crust-package): Perform union of make-crust-firmware and make-crust-tools. * gnu/packages/firmware.scm (make-crust-firmware): New procedure. Change-Id: I687bb6d53aae9bd60ed988baf9d17e92f31faa7b --- gnu/packages/firmware.scm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 41fe55eb2e..828bc7402a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1197,11 +1197,12 @@ (define-public arm-trusted-firmware-imx8mq ;; Adding debug symbols causes the size to exceed limits. #~(delete "DEBUG=1" #$flags))))))) -(define make-crust-package +(define make-crust-firmware (mlambda (platform) (package (name (string-append "crust-" - (string-replace-substring platform "_" "-"))) + (string-replace-substring platform "_" "-") + "-firmware")) (version "0.6") (source (origin @@ -1296,6 +1297,29 @@ (define make-crust-tools (synopsis "Firmware for Allwinner sunxi SoCs (tools)") (inputs (list firmware))))) +(define make-crust-package + (mlambda (platform) + (let* ((firmware (make-crust-firmware platform)) + (tools (make-crust-tools platform firmware))) + (package + (inherit firmware) + (name (string-append "crust-" + (string-replace-substring platform "_" "-"))) + (source #f) + (build-system trivial-build-system) + (arguments + (list #:modules '((guix build union)) + #:builder + #~(begin + (use-modules (ice-9 match) + (guix build union)) + + (match %build-inputs + (((names . directory) ...) + (union-build #$output directory)))))) + (native-inputs '()) + (inputs (list firmware tools)))))) + (define-public crust-pinebook (make-crust-package "pinebook"))