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