From patchwork Fri Jan 19 13:54:45 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: 59129 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 3476D27BBEB; Fri, 19 Jan 2024 13:56:39 +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 D281127BBE2 for ; Fri, 19 Jan 2024 13:56:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQpM6-0003aF-FM; 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 1rQpLm-0003RI-Dj for guix-patches@gnu.org; Fri, 19 Jan 2024 08:56:02 -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 1rQpLm-0007xK-4c for guix-patches@gnu.org; Fri, 19 Jan 2024 08:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQpLo-0001wG-At; Fri, 19 Jan 2024 08:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68355] [PATCH v2 6/9] 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: Fri, 19 Jan 2024 13:56: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: 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.17056725407360 (code B ref 68355); Fri, 19 Jan 2024 13:56:04 +0000 Received: (at 68355) by debbugs.gnu.org; 19 Jan 2024 13:55:40 +0000 Received: from localhost ([127.0.0.1]:57878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQpLP-0001uU-3n for submit@debbugs.gnu.org; Fri, 19 Jan 2024 08:55:39 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQpLI-0001tZ-9O for 68355@debbugs.gnu.org; Fri, 19 Jan 2024 08:55:32 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-33921b95dddso286588f8f.1 for <68355@debbugs.gnu.org>; Fri, 19 Jan 2024 05:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1705672524; x=1706277324; 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=SZ8LyAco3pmiOY9LUl6uhc4tyNIkMoiOKIehYsc3oE0=; b=iz3tzWa+P4FpexmOpmH9vTQcxAE7E4/zBXphgnMnKHfRPA3QB6dS3PWGbUTIklnfGE 9adYwEGF34fH1cy/Rm9QvMmZ0w4f8xTQt+370RPEt116HT9zOgYsXPaUsmR+m+hjI9Zl /OCtCDpXMFaHy1atWCD8fX5EggpFNfrD3Y6JL1QsSuovr5hDryELwsmg1lIh4+yeQjru +LEZ6pk3LBfQeIbI0fi25ctgBGFQxRVmpF5WQ/55cgwbfR3R++cYK/3KmOoISfnof5el s84CX54VeoS84cpNGco9T7l3qq3pTTCiyLoCE3NR0RJMyRUCqQbDxyrTZS5thVNkiaBL SjbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705672524; x=1706277324; 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=SZ8LyAco3pmiOY9LUl6uhc4tyNIkMoiOKIehYsc3oE0=; b=GJIHjRkN8sa1+98cuddylModrdtMXwdl87qfJaZY+/PJ9ixIVVdTIahE8KKxXQwmFz i6yuM1Gn0W4gv66sAufCOIOrffdTmOw8/ki1q2WEoz8N3GmfmPFj3Mzq4bKOllDI03/f 1pK/VRus/lHCFxE211H8AZqXXwpa6yWxSKYlkCVFg+Hhj4k+O1v1JOFcMiabgkppoxEe zyGqSqNSFFtXMjKAdZAJ72cKKC16b2XRGX8MfV4lcomeOOSl0OM1WDvGOkDEawKCEKJn m9TycjFt3NXeC9t8+irjnWAO60NucgYy7zi3Ip4I+2jn4qyQTS6hynChM9wYCeAcnkYw rjQw== X-Gm-Message-State: AOJu0Yw8hTlSq7vGH0ImAg6HxtKpOfgHI7hySm7i2Tkck4qhufxIqm3G tgqRub/Cyh+XTAmJXfzYV9KbMHKQJG+q6xvPLBv5XC8cstCWjgdqnn/90nfKD78PVytXrB3ePhF 2Xgw= X-Google-Smtp-Source: AGHT+IFu9XYlAZ7j+rwejLqpCnX1LzeYf0EAEN1BXt58D+Ie7gGea/Q66XiPKuY4rovrJTbXEBhQRw== X-Received: by 2002:a05:600c:46c4:b0:40e:3521:483d with SMTP id q4-20020a05600c46c400b0040e3521483dmr642582wmo.122.1705672524211; Fri, 19 Jan 2024 05:55:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 05:55:23 -0800 (PST) Date: Fri, 19 Jan 2024 14:54:45 +0100 Message-ID: <9cfcd4262f00aabf959c7219243d554023ddcc35.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): Update to 0.6. 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 eb5251de5e..a2e3f785d5 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1202,7 +1202,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) @@ -1213,43 +1213,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) @@ -1260,9 +1236,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