From patchwork Thu Feb 29 15:20:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 61245 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 E25CF27BBEC; Thu, 29 Feb 2024 15:23:23 +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 0E26D27BBE2 for ; Thu, 29 Feb 2024 15:23:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfiF6-00071I-2j; Thu, 29 Feb 2024 10:22: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 1rfiF3-0006yf-R4 for guix-patches@gnu.org; Thu, 29 Feb 2024 10:22:38 -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 1rfiF3-0004WS-AV; Thu, 29 Feb 2024 10:22:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfiFU-0004hP-GL; Thu, 29 Feb 2024 10:23:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, ludo@gnu.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 29 Feb 2024 15:23:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69476@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian Received: via spool by 69476-submit@debbugs.gnu.org id=B69476.170922016717985 (code B ref 69476); Thu, 29 Feb 2024 15:23:04 +0000 Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:47 +0000 Received: from localhost ([127.0.0.1]:35033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiFC-0004fu-Ez for submit@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:46 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:52253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiF2-0004ef-LP for 69476@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:37 -0500 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-412b68d1a42so7828985e9.0 for <69476@debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1709220063; x=1709824863; 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=0SdqeoJGFQaLv4FaUG9wbiTZVbG00x0EgQfArOv0lvo=; b=Io0F2UOY65PDApRM5CprNnBIorLUEBeHKSNdijpjE4LnE9zg8sEFZFxvBNiVgGwSyV yfPFynFZDYR/Tl+g56u1nQGXOAsphzpkbWbGCne6c3C0OQTkyTg8NXCUhF89BrqWwDvj V2hJdJ7HqExkFkAwySxa2ugw2TgXcVisnhAqtoWydNMK+jQF8Jg4tO3Us3d4nyddGFc5 JGW0s+y4KAV3R+d5BQs5CMUmbDMlH+0JY3bZeNi+NLiwckQctRsU2C2rC6SWWP1wgmQm HofisxNkHqgNSULM2erzwN6zvCCNL5oFhUZV0/LHIhPP7LUBuFRct3lQsC7Vjv+MkFan Q3fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709220063; x=1709824863; 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=0SdqeoJGFQaLv4FaUG9wbiTZVbG00x0EgQfArOv0lvo=; b=WK35ppJDg3+EZdw3QXLUA+BOPmJ0oGKKnk3wZRsDAfiBFoxc9ZA+MzmE2AygCg9P63 M+Vjn+ZscCdghlfYtOmSK4vbC4kGbOPEG3gX9RuWwDccxgZedmjv+UKMEJDgSiRbiAKc hRKokz+34pjbqSNBpdh/LnYSYtMHlxcPzLAJOgZwcMFxIRDxo6kVMsfiMMlNDwgSfOAN 8KVrr6De4fTsWl5CLhJYeiKM4hefbPiazQLPVTnt1LU4r49HLcxSqoxz41LABUr54xif eyz+tOOZOJpowKU0XdYCSnlwa/gEaVcuGOwV0giel2NIai0ywnGF5pNC8yIqWMDepsKg C9Ug== X-Gm-Message-State: AOJu0Ywet6M9ziar3CyeNqLSb1slwC0SYp5V2McAhEghfkXfml3V0puR /WYGfk3o5lm16TDEBLglD2c9QCvn70qFkuEVhjU+Yw7XMrpyHCmjb9BYCCCcHZiMHQqeHlo2WnS i/OI= X-Google-Smtp-Source: AGHT+IFUwtd+hS3sfbVSGx3ff/twfp+DmFnBl7dShXkiwxHVizliB3EcbJdiaTmMuKFpjg+ucKHMAg== X-Received: by 2002:a05:600c:468c:b0:412:9654:b951 with SMTP id p12-20020a05600c468c00b004129654b951mr1936939wmo.36.1709220063531; Thu, 29 Feb 2024 07:21:03 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id n6-20020a05600c4f8600b0041273fc463csm5584786wmq.17.2024.02.29.07.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 07:21:02 -0800 (PST) Date: Thu, 29 Feb 2024 16:20:48 +0100 Message-ID: <4f6ab97323db3c8dfe2d5f40d5fe0811a21d4e58.1709219325.git.jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/cross-base.scm (cross-binutils-package): New procedure. * gnu/packages/cross-base.scm (cross-binutils): Select binutils default value with cross-binutils-package. * gnu/packages/firmware.scm (ath9k-htc-firmware) : Do not explicitly set the #:xbinutils keyword argument. Change-Id: I0eb25eb2b494241c205286837bfa79a61de8e0b7 --- gnu/packages/cross-base.scm | 13 ++++++++++++- gnu/packages/firmware.scm | 10 ++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 93383089e5..d275ae894d 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -97,7 +97,18 @@ (define* (cross-binutils/deprecated target #:optional (binutils binutils)) (warning (G_ "'cross-binutils' must be used with keyword arguments~%")) (cross-binutils* target #:binutils binutils)) -(define* (cross-binutils* target #:key (binutils binutils)) +(define (cross-binutils-package target) + "Returns the default package to use for a cross-Binutils for TARGET." + (cond + ;; The xtensa-ath9k-elf target is used solely to build the firmware for + ;; ath9k devices, the patches to binutils have not been updated and + ;; only apply to binutils@2.33. + ((string=? target "xtensa-ath9k-elf") binutils-2.33) + (else binutils))) + +(define* (cross-binutils* target + #:key + (binutils (cross-binutils-package target))) "Return a cross-Binutils for TARGET using BINUTILS." (let ((binutils (package (inherit binutils) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 6993925387..ad687d1de6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -139,14 +139,8 @@ (define-public ath9k-htc-firmware ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; Use our own tool chain for that. - (native-inputs `(("cross-gcc" ,(cross-gcc - "xtensa-ath9k-elf" - #:xbinutils (cross-binutils - "xtensa-ath9k-elf" - #:binutils binutils-2.33))) - ("cross-binutils" ,(cross-binutils - "xtensa-ath9k-elf" - #:binutils binutils-2.33)) + (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-ath9k-elf")) + ("cross-binutils" ,(cross-binutils "xtensa-ath9k-elf")) ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")