From patchwork Tue Jan 9 23:14:42 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: 58720 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 C62A827BBE9; Tue, 9 Jan 2024 23:16:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 993B527BBE2 for ; Tue, 9 Jan 2024 23:16:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKD-0001xD-DG; Tue, 09 Jan 2024 18:16:01 -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 1rNLKA-0001vb-S0 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:59 -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 1rNLKA-0001ht-HU for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKH-0000OE-JJ; Tue, 09 Jan 2024 18:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 8/8] 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: Tue, 09 Jan 2024 23:16: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: Jean-Pierre De Jesus DIAZ , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by submit@debbugs.gnu.org id=B.17048421641350 (code B ref -1); Tue, 09 Jan 2024 23:16:05 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:16:04 +0000 Received: from localhost ([127.0.0.1]:41291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLKF-0000Ku-5o for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:16:03 -0500 Received: from lists.gnu.org ([2001:470:142::17]:47252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLKD-00009X-Bl for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:16:01 -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 1rNLK0-0001rM-Vh for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:49 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJz-0001Yd-9u for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:48 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e55c885d7so1021615e9.0 for ; Tue, 09 Jan 2024 15:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842146; x=1705446946; darn=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=RoRXV4ICaPbPJ56/l3TS9Ck2/vvGJF8pbZ26A7Htqro=; b=eP8ITAOCyiOUjXA4rD/7crVzq9ilDcZmic5a42b3bMGQGKD8mxFiucfzQxQUGM2bbk wYmpxdWGkRZFW6CCy6t6/femXJYiieh7Zx1jNcEW07W2aG3fnEVQf7YFWQwOKp2ln199 gUfa4i4NFDsw5y6frvdktymn+H/+cj39ZHmOemjGiBGtAO3EnH/P04y4yrTQ4UIywdqF ohPuGFaNsqdQCkIi/+g/2i9YbIFnqEK7nrCdEi10J+oY9w7L2EWOP/kAj5Hw4GMkcQXv OHcmW5thJ1BTLXOOLyBcCaBrGkN1aEWWuyNFxSs4dhtu4sS94+QkA17KySzhPOK0lC14 CscA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842146; x=1705446946; 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=RoRXV4ICaPbPJ56/l3TS9Ck2/vvGJF8pbZ26A7Htqro=; b=N5farwAkpiGQC4rkN+7VVU0ViW2QHhM/e0zskcwNgz5B+kjJrNIgJprEUnXOkNOXw2 YgE9S3SMkuPYiKi4l2mm4RvPbLm3ZvfNGtGRA5x9rfJY4YOWB/zeZaQ1UlzaIFtkDJRn e3ll4RkjGVDQZ7mSOTYEKLBLXgsb6bdr8d/fGIVjuA024fbBxYmcV1ajviwDI6ZrqnBk 5Xu8z9bZpLhjsihXbM00JxFc09QKVtFyQFTsigY9shosnuV0Pw5vqFQyouYI1abqpdAY pjH/EHQ8SCn96CcqOr6E8az837JXxdl2D8mnb1/8SG1NUGprDz+sjseXwPTBdipgSAFB nglg== X-Gm-Message-State: AOJu0Yyxv4YSQGE9+9lCt4r75WW65H2u9lC+2H9L06UaXDtvkv8OoTLn QoESpmyH/Y9vZOqPdbdgJGpL23ECqWMOqKcEewf6y+xLcVuQqg== X-Google-Smtp-Source: AGHT+IGwM2QmAal9P92fs6uwBC9Ecpc/V5cb2rf//WXEayDfVna10X761zrJ/h//SGGP35oFxNO0mA== X-Received: by 2002:a05:600c:314a:b0:40e:28ae:99fd with SMTP id h10-20020a05600c314a00b0040e28ae99fdmr24346wmo.177.1704842145826; Tue, 09 Jan 2024 15:15:45 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id p16-20020a05600c469000b0040e39cbf2a4sm56833wmo.42.2024.01.09.15.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:45 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:42 +0100 Message-ID: <14de180628dedfa8a21d08a0243a76c12b6f7f06.1704841447.git.jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 c3deab5224..71444f190d 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1190,11 +1190,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 @@ -1287,6 +1288,29 @@ (define make-crust-tools (synopsis "System control processor firmware for Allwinner sunxi boards (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"))