From patchwork Tue Jan 9 23:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 58717 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 A235E27BBE2; Tue, 9 Jan 2024 23:16:32 +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 8A8B127BBE9 for ; Tue, 9 Jan 2024 23:16:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKB-0001wG-Lk; Tue, 09 Jan 2024 18:15:59 -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 1rNLK9-0001tf-Gx for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:57 -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 1rNLK8-0001er-IW; Tue, 09 Jan 2024 18:15:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKD-0000IM-Nx; Tue, 09 Jan 2024 18:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 1/8] guix: Add ork1-elf platform. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 23:16:01 +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 , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.170484212729900 (code B ref -1); Tue, 09 Jan 2024 23:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:27 +0000 Received: from localhost ([127.0.0.1]:41266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJf-0007ks-1U for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJd-0007Uo-Lw for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:26 -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 1rNLJN-0001fb-Ij for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:11 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJK-0001L2-DW for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:08 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e552dfa5dso3304325e9.1 for ; Tue, 09 Jan 2024 15:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842104; x=1705446904; 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=Pt8UrefskboeY2WvhYQthpOOyC0y0xpia5XfzuKfppo=; b=dSIzMnKEFY1HCAQweWYqr1UC3U+fS6w3WzrEnTRFmaKx7bLiHHqEgo4IujNVuLu5x0 hzsExgo2GaleNyWh3GR8J4/VNqF7cl0x4xltIXKeCR+RdjlZN/EoaKAgw3QN7lh7j3By TeJyNcBAsPTWTo0erTe1/IOru+3MuC/oknsmi1etcy3VcH8TCnTtfIVXmS9MhBwmwXqf mT+RX4vorsFE9yTeiH2ZUiT81iSfI6B8nn7qeHu8BTVle7hcH7fCAB/fWUcEgRqKrj3P 9SSncaEWiDom7AxcSonxwZmxc/UBC0G/dhjjhU1dmMNLG41PXsmkTcPgZrminGLUvD+k 4oXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842104; x=1705446904; 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=Pt8UrefskboeY2WvhYQthpOOyC0y0xpia5XfzuKfppo=; b=U8jReAX93N260Do/Go449aWfOdGBu2Gg4VCAr/DPPE+xCC3TaWDLgmEm1+syiccCYX 2/ir0ME4AUyavPWZ/27ycdSBHbOpj/38pCMcn0XCvWracivUqaBDl1N6mN5QowLi45w3 cDc54kLTwU4joJ2l+gaFby11xiLe8urDd5ZxNJdEEFqWGz0L1s9AKy8O1r98dHe7mHz/ EZ26oXy3KipwfQHrXWaNEzDs0GNPH4quw4/MSU4yzrKSSddnaVD/w2/fUruwcegpvfXE 8V5wYvHSWmd5HScp9KVxvpwU+CBgSUJc6kjuli4UJd419WTnpbdQKsmXxE3dyvtpvwBz vhPA== X-Gm-Message-State: AOJu0YzIPwAC5qGt9k+49dEGAeSrbumD4qi1MemC86HsRT5eSOaqilhg SmT9EblwEjjSDT/ZzpO9+FM5WWVLvfDqFMmC7PMQn11ZCuU6uA== X-Google-Smtp-Source: AGHT+IFxVmTLp0bqvibw7NX/fhREzukYU3VEkHLFBazeELPejA0NbBketZLK4OJcnG6sf4SLOYYgEQ== X-Received: by 2002:a05:600c:141:b0:40e:4db4:9c4a with SMTP id w1-20020a05600c014100b0040e4db49c4amr39404wmm.50.1704842104271; Tue, 09 Jan 2024 15:15:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:03 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:35 +0100 Message-ID: <577f930d63230d1308c15c10d6cbc50afe973a40.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::32a; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x32a.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 * Makefile.am (MODULES): Add guix/platforms/or1k.scm. * doc/guix.texi: Document or1k-elf platform. * guix/platforms/or1k.scm (or1k-elf): New variable. Change-Id: I3f71a0fa97f1ebd2bbdbf6cd00a93b477a123648 --- Makefile.am | 1 + doc/guix.texi | 6 ++++++ guix/platforms/or1k.scm | 28 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 guix/platforms/or1k.scm diff --git a/Makefile.am b/Makefile.am index b64dcaa77c..deee38232f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/platforms/arm.scm \ guix/platforms/avr.scm \ guix/platforms/mips.scm \ + guix/platforms/or1k.scm \ guix/platforms/powerpc.scm \ guix/platforms/riscv.scm \ guix/platforms/x86.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 395545bed7..8b32722d64 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16902,6 +16902,7 @@ Cross-Compilation - i686-linux-gnu - i686-w64-mingw32 - mips64el-linux-gnu + - or1k-elf - powerpc-linux-gnu - powerpc64le-linux-gnu - riscv64-linux-gnu @@ -46093,6 +46094,11 @@ Supported Platforms from AVR Libc. @end defvar +@defvar or1k-elf +Platform targeting OpenRISC 1000 CPU without an operating system and without a +C standard library. +@end defvar + @node System Images @chapter Creating System Images diff --git a/guix/platforms/or1k.scm b/guix/platforms/or1k.scm new file mode 100644 index 0000000000..bf983085c5 --- /dev/null +++ b/guix/platforms/or1k.scm @@ -0,0 +1,28 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Foundation Devices, Inc. +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms or1k) + #:use-module (guix platform) + #:use-module (guix records) + #:export (or1k-elf)) + +(define or1k-elf + (platform + (target "or1k-elf") + (system #f) + (glibc-dynamic-linker #f))) From patchwork Tue Jan 9 23:14:36 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: 58713 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 BF20C27BBEA; Tue, 9 Jan 2024 23:16:16 +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=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 C19E627BBE9 for ; Tue, 9 Jan 2024 23:16:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKB-0001wT-Sv; Tue, 09 Jan 2024 18:15:59 -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 1rNLK9-0001tQ-2q for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:57 -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 1rNLK7-0001e2-7Y; Tue, 09 Jan 2024 18:15:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKE-0000JK-94; Tue, 09 Jan 2024 18:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 2/8] gnu: cross-gcc-toolchain: Use fixed name. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 23:16:02 +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 , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by submit@debbugs.gnu.org id=B.170484214231579 (code B ref -1); Tue, 09 Jan 2024 23:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:42 +0000 Received: from localhost ([127.0.0.1]:41269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJt-0008CT-L3 for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:42 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJr-0007yg-PV for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:40 -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 1rNLJY-0001lq-QQ for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:21 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJW-0001N1-My for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:20 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40e55c885d7so1018515e9.0 for ; Tue, 09 Jan 2024 15:15:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842116; x=1705446916; 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=5l170BZEe7cgvYP9DlUbRJ4JbbY6gOQA9MEEx1tOr+Q=; b=cJVL4cFlMZdmgVir49J3ulP4riWsMiHprD1Hu0ST8InSzul9v2jCtbmSxL6iryIxvt QUth6+R8QRXimqu9Oh+7qj9wgwhTS807zHJTFK6MZryKHhHKImUE0y3OxZAw/KgL5Anu nEf9s2VbmDgmFIxj9w05L7EGufGBM6W36wNsxQHGv114msQkAP0osKvHdYQNH3fwBR+Q Oaoss/gM4ycLQuGWG/Y9h3gZUxA8+F8lN8PgCat9RcT8QQWUKU2/3u/MLemE6DDfKjRu ky+b72MDFuY5RohhI5/EKP3MlRT0n0rdhXpGXvfvHp/h6CaAdiD7NluFU4PwNrV2UdsF 2acw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842116; x=1705446916; 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=5l170BZEe7cgvYP9DlUbRJ4JbbY6gOQA9MEEx1tOr+Q=; b=YtzQuzbcKfXlslOiDJjX8+b8JMWGhnCRVvGw0GEYP4+I96iwTYSYuWFrtDy+uuCY3Y jA+wko6dD9TbamSGbmGhTAjczjlK4llJT9l/9Pi4qcDn4TeKZcsHFlNQhsfpwQk5o4v4 fMGCo7zPocfYkhnUznK3I47BFTRadITweYZewwvTe5RZ9csPNN6wWwKhMEDMe2pLUALj YgLI8e8MW7j59gzL6DtMcuIexw76LkpTgE01I8IUwABLltibMpIBeQ/cwYN0WSByMJeq Lssv6/FhQF7hQA//B816whjk0EQKJ73yClZAMLD2qZWnUqH21wMJhJfxLirN5Fc8kVSA /WBg== X-Gm-Message-State: AOJu0Ywq6z3lP1WMtpBVXpNWuGzK14t9ZESW3bhoC9UMs35+v9xO3eaz XiH4t02D0hepqjLJCNvlJbMA793zHz7Ket4zVSFV27MfC9XNfA== X-Google-Smtp-Source: AGHT+IFluZL6hyEFeNtPEFCIzU9D3yXXaAVBgOiIjgrPB4wtBoGrpSEdt4wmAKHlKXJgRC8JxcT6RQ== X-Received: by 2002:a7b:c053:0:b0:40e:47c1:eb62 with SMTP id u19-20020a7bc053000000b0040e47c1eb62mr32225wmc.46.1704842116454; Tue, 09 Jan 2024 15:15:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:16 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:36 +0100 Message-ID: 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::32e; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x32e.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/cross-base.scm (cross-gcc-toolchain) : Always use gcc-cross- prefix regardless of TARGET having a C standard library or not. Change-Id: I5cbe89c61e5bd324a385db17c27131ea5ef75669 --- gnu/packages/cross-base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 6ee7b315d8..6abf07be17 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -745,7 +745,9 @@ (define* (cross-gcc-toolchain/implementation target "Returns PACKAGE that contains a cross-compilation tool chain for TARGET with XBINUTILS, XGCC and LIBC (if exists for TARGET)." (package - (name (string-append (package-name xgcc) "-toolchain")) + ;; Using PACKAGE-NAME of XGCC is avoided here as there are platforms that still + ;; need a toolchain but don't have a libc. + (name (string-append "gcc-cross-" target "-toolchain")) (version (package-version xgcc)) (source #f) (build-system trivial-build-system) From patchwork Tue Jan 9 23:14:37 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: 58719 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 56D6427BBEA; Tue, 9 Jan 2024 23:16:44 +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,TVD_SPACE_RATIO, URIBL_BLOCKED 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 07E4B27BBE2 for ; Tue, 9 Jan 2024 23:16:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKC-0001wX-3x; Tue, 09 Jan 2024 18:16:00 -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 1rNLK8-0001tP-TV for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:58 -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 1rNLK7-0001eD-LD for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKE-0000KD-MX for guix-patches@gnu.org; Tue, 09 Jan 2024 18:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 3/8] gnu: Add gcc-cross-or1k-elf-toolchain. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 23:16:02 +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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170484214732170 (code B ref -1); Tue, 09 Jan 2024 23:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:47 +0000 Received: from localhost ([127.0.0.1]:41272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJz-0008ME-44 for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:47 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLJx-00089X-Nt for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:46 -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 1rNLJi-0001od-Rg for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:32 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJg-0001O0-W6 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:30 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e54b2e437so3705295e9.2 for ; Tue, 09 Jan 2024 15:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842124; x=1705446924; 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=JaAxOmZB+YPbAcjSRUe0Q8GlZao/R0fSc7jkFqZ9B5Y=; b=O1WaOHH8aeyi17f2I7Lc731J7fIkjIqtAY6Tsg2VNoFRpIxvNX2W8ADH8RKnLTQaU/ nOulJnW4pnb/0VRwfBQ0+y9aVz7wudgo0kvnSDjfKvjIiAVRiuGipwEmesHnzftPwbwd tDPMuNkyH+tzuoGvB1Z9RwM85X/2Pz963lzrDgav7BGEczX7fOLBmmBTdm00Esygrq19 Eqy/tFXAsep/C4u5YXHWrLQNO+/9VWnJ5OM+7xgeNa+gccYbNMFAUlGWg4SFuBRtPb4y qmeZYYcyxh1Rew8eEQteQ8NNd96YMuD41oLiT0HCMiPgotTYa9AQs2VeYMCT9vSCN4h8 HIMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842124; x=1705446924; 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=JaAxOmZB+YPbAcjSRUe0Q8GlZao/R0fSc7jkFqZ9B5Y=; b=DQryjTw+WXJQfjhHYOQ9goq0w86+wq2vEDCCDEHF79OpjbLrzgMYlZHkv10masPhUL AlfIRnyrzvu154t+zHnf743NM3nAaIoS+qrrTj5CRVXvmB7o81mr6GLLRREWvugvFp+t cKQiK9Au7ZFXoK/IBCtewu2chmE8A0shUHGlkGYGFUgxXvOqXThE1HTfWU7cbO9VHT+C iXd89OnuHiRLpkd1AjLgQQFkpDv/7a2IUGtkbRiEMP8bMuoNhv2hT8S03B0OZb5bxG9z eMUPj8KxGui/oL7KRnQaXzJVLMTwQTJCRx1WvjK1X7pf0Xo/wBtvIX5l4W/yFi1kOmUs Zc/g== X-Gm-Message-State: AOJu0YxBGXIwQ/DKQKppyCS8j6dIzMqQjooJ9nGwRLPlPO8omvHMKyDF hJ3h4yEoA2lprm21XLqq3/RlmM1rMKaOyYn1McayOy+ZL9Npqw== X-Google-Smtp-Source: AGHT+IE3aunlm2/65Vk9FJ8UZaYev3l3/I08CbJcryf/3/6QyyEIC7E6Sxz2+qkvTImlsj9SeYRPRQ== X-Received: by 2002:a7b:ce85:0:b0:40e:4dc1:fbc0 with SMTP id q5-20020a7bce85000000b0040e4dc1fbc0mr29218wmj.60.1704842124705; Tue, 09 Jan 2024 15:15:24 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:24 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:37 +0100 Message-ID: <0d9f8aafd0d1358ff306e6325c72bf8a94bdd084.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::32a; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x32a.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, TVD_SPACE_RATIO=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/cross-toolchain.scm (gcc-cross-or1k-elf-toolchain): New variable. Change-Id: Iaf7ed60dbbe116a5efbad8e94be9b2dee51faf15 --- gnu/packages/cross-toolchain.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index ab071e1005..5072462cbb 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -38,5 +38,8 @@ (define-public gcc-cross-avr-toolchain (define-public gcc-cross-i686-w64-mingw32-toolchain (cross-gcc-toolchain "i686-w64-mingw32")) +(define-public gcc-cross-or1k-elf-toolchain + (cross-gcc-toolchain "or1k-elf")) + (define-public gcc-cross-x86_64-w64-mingw32-toolchain (cross-gcc-toolchain "x86_64-w64-mingw32")) From patchwork Tue Jan 9 23:14:38 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: 58715 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 B5BDC27BBE2; Tue, 9 Jan 2024 23:16:26 +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 072DA27BBEB for ; Tue, 9 Jan 2024 23:16:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKA-0001u9-3y; Tue, 09 Jan 2024 18:15:58 -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 1rNLK8-0001tO-M1 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:56 -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 1rNLK8-0001eh-Di for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKF-0000Kz-8m; Tue, 09 Jan 2024 18:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 4/8] gnu: make-crust-package: Memoize. 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:03 +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.170484215232601 (code B ref -1); Tue, 09 Jan 2024 23:16:03 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:52 +0000 Received: from localhost ([127.0.0.1]:41275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK2-0008SF-MW for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:51 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK0-0008FU-8q for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:48 -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 1rNLJm-0001qF-Db for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:34 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJi-0001Ox-I4 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:34 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e5508ecb9so4784925e9.3 for ; Tue, 09 Jan 2024 15:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842129; x=1705446929; 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=oWOWZy7g5CVBPcwIqtvr8bdGu5K1fvb0F3n7Exh3MUs=; b=ee88E5O/qWteO+qeH6Y/CvnWxuloA7RASu5iFGBMJm8cQiK3ZjJ1m0xHAUSWSouWta kS6DQdO8iIOUDf5JFpAWPBVhKzmBEjY4Zh4R/u8DUrfeQMtVkg2Tpp4ziihEn51Aoxq7 KP8XMWRy3F9QIY/d7h5Uqes7TTeAJsoUXqsNKJOWtnFiDBgfqk/G8RPdZOZ3ilqxrc+O eGcHvyPfT8eT8OxrK1mopvrhAxdGTtzq2Ixzjoog6mynxSkyHDq1YIqEA7NLUMG+7njq 4vTwdhAgf0Qm8cMdJtEwGiK1JDPhOr91PRah6nrKx7GOJBS164fenhpAyckdEJlVOdiZ klrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842129; x=1705446929; 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=oWOWZy7g5CVBPcwIqtvr8bdGu5K1fvb0F3n7Exh3MUs=; b=I/v4ly2O3A/dTfBIWIKT9M+x8Lezv7dXDvrd39W8HJYZS1BYvs2Y6TBnekzXP6beyq XzcpZymBKruy8DDdVu/r79vDazHC9xbYH+G42LTDRAc2GIs6CZ8DhARNvgJSMVwaOuet grim5QWrzuUnM6mR1EfJ3b5arWumwtnTlLHLBqiz3WiTT7bnJQGCsCHcS+mMfZHYmTDy 82F+UZXEyisninBBLPqwpEGdMh2NuLQDjGs3/c0prR3IXXtJIjmOHYaNZRvWjkDBH/ys ypSN2qBF0eEha6Q07fdvsz5eQfy1xKJExlVU2Nthbr2FfhNq3uTpgCpbvT5e30IflZcN 7a9g== X-Gm-Message-State: AOJu0YxCbfdHrP9VMonjG1GHkPYuZcNnwSV+s3tK/DIWyGColL6walCf M/LDOs/U8Xv3GcocwM8OjJgWBAnm7OyXMmXmMjKDe3T8aipC/A== X-Google-Smtp-Source: AGHT+IEhoEGh3bknBopeCfqi1Vc99/e+K/p4lTkJD+bM0MnbcSlQ39cUTAoHf/p6G6HIcEguWbH/BQ== X-Received: by 2002:a05:600c:358b:b0:40e:50e7:db2c with SMTP id p11-20020a05600c358b00b0040e50e7db2cmr26626wmq.177.1704842128577; Tue, 09 Jan 2024 15:15:28 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:28 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:38 +0100 Message-ID: <03b0bc119e7bf279aef49b05078faa08a2534945.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::333; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x333.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): Use mlambda. Change-Id: I2d916b96bc650f3731a69505e086cf8f8f470809 --- gnu/packages/firmware.scm | 153 +++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 76 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e691bf33da..5567bcfe45 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1190,81 +1190,82 @@ (define-public arm-trusted-firmware-imx8mq ;; Adding debug symbols causes the size to exceed limits. #~(delete "DEBUG=1" #$flags))))))) -(define (make-crust-package platform) - (package - (name (string-append "crust-" - (string-replace-substring platform "_" "-"))) - (version "0.5") - (source - (origin - (method git-fetch) - (uri (git-reference - ;; There are only GitHub generated release snapshots. - (url "https://github.com/crust-firmware/crust") - (commit (string-append "v" version)))) - (file-name (git-file-name "crust" version)) - (sha256 - (base32 - "0xgbbhifg3miwd3yp6jq9kp7nqgz5gzy00w95vba45j8jk5vjvvz")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ;no test suite - #:make-flags - (let ((triplet-without-vendor - (and (%current-target-system) - ;; TODO: Is there a use case for allowing this? - (not (target-avr?)) - (match (string-split (nix-system->gnu-triplet - (%current-target-system)) #\-) - ((arch vendor os ..1) - (string-join `(,arch ,@os) "-")))))) - #~(list "CROSS_COMPILE=or1k-elf-" - "V=1" - #$@(if triplet-without-vendor - ;; We are cross-compiling the tools, intended to be - ;; executable for the target system. - (list (string-append "HOSTAR=" triplet-without-vendor - "-ar") - (string-append "HOSTCC=" triplet-without-vendor - "-gcc")) - ;; Not cross-compiling. - (list "HOSTAR=ar" - "HOSTCC=gcc")) - "LEX=flex")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-build-tests - (lambda _ - ;; Attempting to build the tools test binary on a non-aarch64 - ;; architecture fails with: "No cache cleaning implementation - ;; available for this architecture". Avoid building it (see: - ;; https://github.com/crust-firmware/crust/issues/182). - (substitute* "tools/Makefile" - (("tools-y \\+= test") "")))) - (delete 'configure) - (add-before 'build 'defconfig - (lambda* (#:key make-flags #:allow-other-keys) - (let ((config-name (string-append #$platform "_defconfig"))) - (apply invoke "make" (cons config-name make-flags))))) - (replace 'install - (lambda _ - (for-each (lambda (file) - (install-file file (string-append #$output - "/libexec"))) - (find-files "." "(scp\\.bin|\\.config)$")) - (install-file "build/tools/load" - (string-append #$output "/bin"))))))) - ;; The firmware is cross-compiled using a "bare bones" compiler (no libc). - ;; Use our own tool chain for that. - (native-inputs - (list bison - (cross-gcc "or1k-elf") - (cross-binutils "or1k-elf") - flex)) - (home-page "https://github.com/crust-firmware/crust") - (synopsis "System control processor firmware for Allwinner sunxi boards") - (description "Crust improves battery life and thermal performance by +(define make-crust-package + (mlambda (platform) + (package + (name (string-append "crust-" + (string-replace-substring platform "_" "-"))) + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; There are only GitHub generated release snapshots. + (url "https://github.com/crust-firmware/crust") + (commit (string-append "v" version)))) + (file-name (git-file-name "crust" version)) + (sha256 + (base32 + "0xgbbhifg3miwd3yp6jq9kp7nqgz5gzy00w95vba45j8jk5vjvvz")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags + (let ((triplet-without-vendor + (and (%current-target-system) + ;; TODO: Is there a use case for allowing this? + (not (target-avr?)) + (match (string-split (nix-system->gnu-triplet + (%current-target-system)) #\-) + ((arch vendor os ..1) + (string-join `(,arch ,@os) "-")))))) + #~(list "CROSS_COMPILE=or1k-elf-" + "V=1" + #$@(if triplet-without-vendor + ;; We are cross-compiling the tools, intended to be + ;; executable for the target system. + (list (string-append "HOSTAR=" triplet-without-vendor + "-ar") + (string-append "HOSTCC=" triplet-without-vendor + "-gcc")) + ;; Not cross-compiling. + (list "HOSTAR=ar" + "HOSTCC=gcc")) + "LEX=flex")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-build-tests + (lambda _ + ;; Attempting to build the tools test binary on a non-aarch64 + ;; architecture fails with: "No cache cleaning implementation + ;; available for this architecture". Avoid building it (see: + ;; https://github.com/crust-firmware/crust/issues/182). + (substitute* "tools/Makefile" + (("tools-y \\+= test") "")))) + (delete 'configure) + (add-before 'build 'defconfig + (lambda* (#:key make-flags #:allow-other-keys) + (let ((config-name (string-append #$platform "_defconfig"))) + (apply invoke "make" (cons config-name make-flags))))) + (replace 'install + (lambda _ + (for-each (lambda (file) + (install-file file (string-append #$output + "/libexec"))) + (find-files "." "(scp\\.bin|\\.config)$")) + (install-file "build/tools/load" + (string-append #$output "/bin"))))))) + ;; The firmware is cross-compiled using a "bare bones" compiler (no libc). + ;; Use our own tool chain for that. + (native-inputs + (list bison + (cross-gcc "or1k-elf") + (cross-binutils "or1k-elf") + flex)) + (home-page "https://github.com/crust-firmware/crust") + (synopsis "System control processor firmware for Allwinner sunxi boards") + (description "Crust improves battery life and thermal performance by implementing a deep sleep state. During deep sleep, the CPU cores, the DRAM controller, and most onboard peripherals are powered down, reducing power consumption by 80% or more compared to an idle device. On boards without a @@ -1274,7 +1275,7 @@ (define (make-crust-package platform) Crust is designed to run on a specific SCP implementation, Allwinner's AR100.") ;; Most files are dual-licensed "BSD-3 OR GPL2", a few are GPL2 only. - (license (list license:bsd-3 license:gpl2)))) + (license (list license:bsd-3 license:gpl2))))) (define-public crust-pinebook (make-crust-package "pinebook")) From patchwork Tue Jan 9 23:14:39 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: 58716 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 B145E27BBEB; Tue, 9 Jan 2024 23:16:31 +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 8940C27BBE2 for ; Tue, 9 Jan 2024 23:16:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKB-0001wA-C8; Tue, 09 Jan 2024 18:15:59 -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-0001v8-D3 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:58 -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-0001fH-2l 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 1rNLKG-0000Lu-46; Tue, 09 Jan 2024 18:16:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 5/8] gnu: make-crust-package: Update to 0.6. 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:04 +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.1704842154402 (code B ref -1); Tue, 09 Jan 2024 23:16:04 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:54 +0000 Received: from localhost ([127.0.0.1]:41279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK5-00005O-Tc for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK3-0008KR-2w for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:52 -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 1rNLJo-0001qc-O2 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:36 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJl-0001Qf-QG for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:35 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40e43e489e4so38803305e9.1 for ; Tue, 09 Jan 2024 15:15:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842132; x=1705446932; 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=IpYAgxft8+L1OI2zieIntXB2n7eN9bnM1wsYQDV7hwg=; b=XW8OrK1+7WqgAAEALNq+f18o5Vmc4fcHaxYZkE1U3axupa72UyUuI3+E0WnQFCFBrq J2TUN6Qwhd68DHQ0RkegR+i/vnhN1/HWgbTzd74C2nX5db4Lwzd3ZSMsFOzg9nPNel4/ ZCBfkWT/BFHakSeYDWcxfkI1nqPSOvkwyv4AuC9VZMBqgO4QqOSSQ+evEU9C3Ryus9O6 Z9zSbQ9bfKt6t9sqOTgSmqW4S6QPrUYKpb4udkRUdT7aNFcLNr2jr2UXmdd8SpSqMZGR bsaxsrbZFiSvuIaitg7EhBHaxoH3IQhEjtZ/FvNcl8Ww6gmDNrkE6jK8n1xqqkhRE638 WPww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842132; x=1705446932; 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=IpYAgxft8+L1OI2zieIntXB2n7eN9bnM1wsYQDV7hwg=; b=X9SV0/m5YsM/o5nB28F1YaeOHM+W+O6rF1mV0wUILeO47wF7njWtztPrKfgD6m1bGR JPzB8mEERbHm1R92mziylsnLDDiX7mquSO69oyF7nKPDGOiTDQpk34aR74JedrgjRLK8 p5yZbG2bfRMbnjwMIi+KmEIDyefmmQnFdSX1mxDPCwnm9sqF6C6+CMSBYEsiEBSu+sIS kdS9DgR02wWIXsH238cjQONp7rT470ECDN8i4LHu5XDRPni10/u08qSuqHgODOL8hECL I4vDNDlek7+JmS+AFYo/Gu7r4RB6x2tF7h6v2uMeIhaNqgpKcjTLhHmJpDip1UN29c8P SUSA== X-Gm-Message-State: AOJu0YzS8sSlnWbJUknQjCAvyVGZC6FEVrbJUGRv9ep6ZljUmEo0V+dG 917eOj6GDNqNJM5mKyGeXN8HC9OEvqifed/fL7Me6O+pNzYucg== X-Google-Smtp-Source: AGHT+IFYvFhc4lM7G4x9TdPSXMqNysCtpcQMQyTW6lMj16EMm/6KMhbFMdf2xXM0wuTsYwjRGOs38g== X-Received: by 2002:a05:600c:4a11:b0:40e:4870:d2a4 with SMTP id c17-20020a05600c4a1100b0040e4870d2a4mr34646wmp.59.1704842132285; Tue, 09 Jan 2024 15:15:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:32 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:39 +0100 Message-ID: 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::32d; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x32d.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): Update to 0.6. * gnu/packages/firmware.scm (make-crust-package): Do not install host tool as it is not built by default. Change-Id: Ia79ae8208589601d32235f6d8ace9dce3f8d74f9 --- gnu/packages/firmware.scm | 42 ++++++++------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 5567bcfe45..30422a573c 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1195,7 +1195,7 @@ (define make-crust-package (package (name (string-append "crust-" (string-replace-substring platform "_" "-"))) - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -1206,43 +1206,19 @@ (define make-crust-package (file-name (git-file-name "crust" version)) (sha256 (base32 - "0xgbbhifg3miwd3yp6jq9kp7nqgz5gzy00w95vba45j8jk5vjvvz")))) + "1blq6bi2rmg4qqwwr07pamv28b50mwcsybhpn9bws8vbzxa43afd")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite #:make-flags - (let ((triplet-without-vendor - (and (%current-target-system) - ;; TODO: Is there a use case for allowing this? - (not (target-avr?)) - (match (string-split (nix-system->gnu-triplet - (%current-target-system)) #\-) - ((arch vendor os ..1) - (string-join `(,arch ,@os) "-")))))) - #~(list "CROSS_COMPILE=or1k-elf-" - "V=1" - #$@(if triplet-without-vendor - ;; We are cross-compiling the tools, intended to be - ;; executable for the target system. - (list (string-append "HOSTAR=" triplet-without-vendor - "-ar") - (string-append "HOSTCC=" triplet-without-vendor - "-gcc")) - ;; Not cross-compiling. - (list "HOSTAR=ar" - "HOSTCC=gcc")) - "LEX=flex")) + #~(list "CROSS_COMPILE=or1k-elf-" + "V=1" + "HOSTAR=ar" + "HOSTCC=gcc" + "LEX=flex") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-build-tests - (lambda _ - ;; Attempting to build the tools test binary on a non-aarch64 - ;; architecture fails with: "No cache cleaning implementation - ;; available for this architecture". Avoid building it (see: - ;; https://github.com/crust-firmware/crust/issues/182). - (substitute* "tools/Makefile" - (("tools-y \\+= test") "")))) (delete 'configure) (add-before 'build 'defconfig (lambda* (#:key make-flags #:allow-other-keys) @@ -1253,9 +1229,7 @@ (define make-crust-package (for-each (lambda (file) (install-file file (string-append #$output "/libexec"))) - (find-files "." "(scp\\.bin|\\.config)$")) - (install-file "build/tools/load" - (string-append #$output "/bin"))))))) + (find-files "." "(scp\\.bin|\\.config)$"))))))) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc). ;; Use our own tool chain for that. (native-inputs From patchwork Tue Jan 9 23:14:40 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: 58714 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 9239427BBEA; Tue, 9 Jan 2024 23:16:26 +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 582A227BBE2 for ; Tue, 9 Jan 2024 23:16:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKB-0001wV-WD; Tue, 09 Jan 2024 18:16:00 -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-0001u0-1d for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:58 -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 1rNLK9-0001h7-O1 for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNLKG-0000MY-O3; Tue, 09 Jan 2024 18:16:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 6/8] gnu: make-crust-package: Use or1k-elf as target. 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:04 +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.1704842155452 (code B ref -1); Tue, 09 Jan 2024 23:16:04 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:15:55 +0000 Received: from localhost ([127.0.0.1]:41281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK6-00006O-J5 for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:55 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK4-0008ML-At for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:52 -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 1rNLJr-0001qp-SR for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:39 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJp-0001Ru-DZ for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:39 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40e55c885d7so1020305e9.0 for ; Tue, 09 Jan 2024 15:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842135; x=1705446935; 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=aCStwL/IjZxIdyEX79TssEf1O6ehpfQYjpkgM67wraM=; b=GDajT/C1RQSKgDxWGwrShh8RglBeTbskF7jvaPjqXTwQPN7tVeAWhlFXB6Q29Ptrtp HUwpj31uZjc5UBEAyDsfYjToF5sQBAuT0mz3+UQJBQt+WcOecc+Yn64cpWC5ntpZaZXL IEpEoMSj5W/VCELjtfCq9dWIfmPe5J2xFxvN5/XejYzuQrz0huT2A0hZFcai7aURf+Fv kQA0DSOMiAqTpVEocgSyeRJEnLFJn5VZS0fs9odw9UZZeyKQ6DR5vbaMU9BBJdz+tOup iBarIBimhMTulQloVYMkF1q88Vv1EXDieCL3o3iuaIqsDUL6VRt16nRbN2Hn+z9gyOcn 5l2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842135; x=1705446935; 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=aCStwL/IjZxIdyEX79TssEf1O6ehpfQYjpkgM67wraM=; b=tbAs9bRgdii4uELH3BejAFTSL6bR73dIB3k+srR3sC/srQTU8o8394DNqLlIDJ8O5D wJbB0g0BiVpyJPY/t/eiWArVKD7TgtLgubwhmBowDK7dp9r9OZOJCSAowFM9vLkLwvyc slx5dCbAL0zs6bM6jUkWEfuTu4lJ0t+qLx4VcpxPfXCn4DJTxORpIoFFPmXDuhwHnFAb yXxbc/LUBMIiEHnh6gYrA9YUd6JSwQURyGD2Uf9wjGN5M/hDe6vkQjHdWVusQQrv56nX afI3LhQBYfNL9Ci89yvy2DELAk62RSS7a3QNKFhvlIA3t1IklYqWZ0kxtmGMwyxRYxEY SlYA== X-Gm-Message-State: AOJu0YwFqIoV+vwNntolq9JVF9+dSAhg3JFLCOfKAObGkVXqBbTqxxMQ j1RyZJxzP4CMoLaUWydhOnTsQvjkg7D4ntK91yFrB4cWBRjBnQ== X-Google-Smtp-Source: AGHT+IGLxZG/NjjLG5SamWLR1SsM7/9Z+uj3loKtftAsNeiRBCb/k0AjpfWLzpCBnsrGSEaa2QrcWQ== X-Received: by 2002:a05:600c:14b:b0:40d:9377:d97c with SMTP id w11-20020a05600c014b00b0040d9377d97cmr35935wmm.65.1704842134797; Tue, 09 Jan 2024 15:15:34 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:34 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:40 +0100 Message-ID: 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::329; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x329.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): Use or1k-elf as the target. Change-Id: I6c8bf053527f1e12e35402f18cebf8e75557c788 --- gnu/packages/firmware.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 30422a573c..e62f29993a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1210,13 +1210,13 @@ (define make-crust-package (build-system gnu-build-system) (arguments (list + #:target "or1k-elf" #:tests? #f ;no test suite - #:make-flags - #~(list "CROSS_COMPILE=or1k-elf-" - "V=1" - "HOSTAR=ar" - "HOSTCC=gcc" - "LEX=flex") + #:make-flags #~'("CROSS_COMPILE=or1k-elf-" + "V=1" + "HOSTAR=ar" + "HOSTCC=gcc" + "LEX=flex") #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -1230,13 +1230,7 @@ (define make-crust-package (install-file file (string-append #$output "/libexec"))) (find-files "." "(scp\\.bin|\\.config)$"))))))) - ;; The firmware is cross-compiled using a "bare bones" compiler (no libc). - ;; Use our own tool chain for that. - (native-inputs - (list bison - (cross-gcc "or1k-elf") - (cross-binutils "or1k-elf") - flex)) + (native-inputs (list bison flex)) (home-page "https://github.com/crust-firmware/crust") (synopsis "System control processor firmware for Allwinner sunxi boards") (description "Crust improves battery life and thermal performance by From patchwork Tue Jan 9 23:14:41 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: 58718 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 3BCF027BBEA; Tue, 9 Jan 2024 23:16:36 +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=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 9105F27BBE2 for ; Tue, 9 Jan 2024 23:16:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNLKD-0001xZ-FL; 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-ET for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:58 -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-0001hY-5l 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-0000NV-6n; Tue, 09 Jan 2024 18:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH 7/8] gnu: Add make-crust-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.1704842160959 (code B ref -1); Tue, 09 Jan 2024 23:16:05 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2024 23:16:00 +0000 Received: from localhost ([127.0.0.1]:41284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLKB-0000E2-8e for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:16:00 -0500 Received: from lists.gnu.org ([2001:470:142::17]:47236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNLK9-0008U9-8V for submit@debbugs.gnu.org; Tue, 09 Jan 2024 18:15:57 -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 1rNLJw-0001r1-NQ for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:44 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNLJq-0001T2-Vm for guix-patches@gnu.org; Tue, 09 Jan 2024 18:15:44 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e5508ecb9so4787125e9.3 for ; Tue, 09 Jan 2024 15:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1704842137; x=1705446937; 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=ukqLaQYPPu84LtD3Uff5mkJBbJHLIJvKs3+vOWd9GzU=; b=B6YSvLyg9dqijdZ7UVapecYYK3Kq4SVML/E8Y/mE5UMxVy1X1cqa3j5TBoi4DR51lb cHHKuUmn5iiM8m+ma6jGKT+zOGvSdbcHZ9ldCc9AudRDUMvESZJBcVbSv8beLTT3onZf koihpT6g2qSgZQNyiDOvfAENF77UkSE7G4bbub25AL0p6fic1W8iWKN11u5hd06GyeVr sFmNtKaUj8mW93NXSemx8Q9Dk20U26lEvBfJH+eTijl5sM1T/X2dWO/WPVwEYH4XZcUR /kWlJQIdSDym6MQNLyLNvbZz86IJ8FFmPdoYmnNzvmTkUpQLouZ37VhueY3JvOKvk5Jv 5BhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704842137; x=1705446937; 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=ukqLaQYPPu84LtD3Uff5mkJBbJHLIJvKs3+vOWd9GzU=; b=i6i5C8Ef3dIUPjxcuVj6QeCRnSI5SyG3d2pBTWPA/gmVGfv3h8G0QfgOyF2PAXP22H AgRY0AwMRJ98tKf8XsnooQzcYSjVWQtpobQP2OXXZN+h6AGPLcAT8dxnoto5Fg4TLXv6 lygotLrdl7Be693dXIzh+87dLpkVrx+aJNhI/JVXQLWfw//7B1z7wvBe9iuwtv7z955z ioRIUu3v3Cqfnr/U3VgZg5F0AFzAzSXevjv0o56RfGRwFqNM468EFmigBPsc3oQZI4Qf WL3SwwG3CVT8Qlw/fsc7sCgUbux5B5dZFnYRTQXzLgHM7vbcMtftbp2M4CtU/62BvT6A 8hHQ== X-Gm-Message-State: AOJu0YzBvtM3HXRuYga7JVXmtOil/Hpo5qO+7dMFTNu+RWDWQfIlwypt cL1sUmo2T2K30g59xq6JxkGcCOrGN229Z1qNlVoO2wHVuCQvPQ== X-Google-Smtp-Source: AGHT+IEbeoEUJ1o6SwLTTqPrM+G+rv4S0oGHYdFv38R1+3F/AYVF2SOWtgEDZzHaWBFIy+UoDsdIhw== X-Received: by 2002:a7b:c7c5:0:b0:40e:491a:ca78 with SMTP id z5-20020a7bc7c5000000b0040e491aca78mr37495wmk.10.1704842137343; Tue, 09 Jan 2024 15:15:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:15:37 -0800 (PST) Date: Wed, 10 Jan 2024 00:14:41 +0100 Message-ID: <06c55ad18bd524cb50b250f1c3c4452702480cf4.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::32a; envelope-from=jean@foundationdevices.com; helo=mail-wm1-x32a.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-tools): New procedure. Change-Id: Iac05ecf1796e4c10692a423c12423ea9b078d141 --- gnu/packages/firmware.scm | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e62f29993a..c3deab5224 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1245,6 +1245,48 @@ (define make-crust-package ;; Most files are dual-licensed "BSD-3 OR GPL2", a few are GPL2 only. (license (list license:bsd-3 license:gpl2))))) +(define make-crust-tools + (mlambda (platform firmware) + (package + (inherit firmware) + (name (string-append "crust-" + (string-replace-substring platform "_" "-") + "-tools")) + (arguments + (list #:make-flags + #~(list "V=1" + "LEX=flex" + (string-append "HOSTAR=" #$(ar-for-target)) + (string-append "HOSTCC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-build-tests + (lambda _ + ;; Attempting to build the tools test binary on a + ;; non-aarch64 architecture fails with: "No cache + ;; cleaning implementation available for this + ;; architecture". Avoid building it (see: + ;; https://github.com/crust-firmware/crust/issues/182). + (substitute* "tools/Makefile" + (("tools-y \\+= test") "")))) + (replace 'configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (copy-file (search-input-file inputs "/libexec/.config") + ".config"))) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "tools" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags)))) + (replace 'install + (lambda _ + (install-file "build/tools/load" + (string-append #$output "/bin"))))))) + (synopsis "System control processor firmware for Allwinner sunxi boards (tools)") + (inputs (list firmware))))) + (define-public crust-pinebook (make-crust-package "pinebook")) 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"))