From patchwork Thu Feb 29 15:20:46 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: 61247 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 9E0BA27BBEA; Thu, 29 Feb 2024 15:23:30 +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 170C827BBE2 for ; Thu, 29 Feb 2024 15:23:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfiF6-00072M-Nw; 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-0006yd-Lu 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-0004WU-E2 for guix-patches@gnu.org; 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 1rfiFT-0004h5-KL; Thu, 29 Feb 2024 10:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets. 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: Thu, 29 Feb 2024 15:23:03 +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 , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 69476-submit@debbugs.gnu.org id=B69476.170922015617940 (code B ref 69476); Thu, 29 Feb 2024 15:23:03 +0000 Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:36 +0000 Received: from localhost ([127.0.0.1]:35026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiF1-0004fD-Hj for submit@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:35 -0500 Received: from mail-lj1-f177.google.com ([209.85.208.177]:49512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfiEy-0004eE-Bb for 69476@debbugs.gnu.org; Thu, 29 Feb 2024 10:22:33 -0500 Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2d2509c66daso11758101fa.3 for <69476@debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1709220059; x=1709824859; 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=vqqhFGvnXC1yEECfSiTfOItsKcGn8ThsT+4xbW9rbus=; b=PWVPiaewlKIZW4OgPvoFzOSTYjChu7zCrY8Jv5Os0oCJEgsSjJLkcKiCCDJSovTRQh VcItaRdEPUnooVZv0jSwvgH6a+kDvWCmybjazQFFdVjZIC+dv04/O7RxrcqWkvYiq8Zv gpnz8pAhlxvKK1iskO+YHwm+paOaDUNCaw49iYWMHWMtoIRNDsv4MhGqYVJrydp0yQeK a4ue94nMpUStP4ovOKBchSKt6jBXM6uH1mGftiX5sy0Wip6B8zxUy0Hg5yRu83pRNgSk usFMKb3W5z47MMsCvoWuPkk95TZHctLnjGJ/OiZ+M5GPsDnKbI+g3UwVmmnCF5J6FyGi UTyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709220059; x=1709824859; 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=vqqhFGvnXC1yEECfSiTfOItsKcGn8ThsT+4xbW9rbus=; b=V+dFEGkZ941Q099dnJbwgVBt7uwnzUOmf0xBKex76kkPSOghW0JSA/z7/miOKVuF7g Xd3pn4gsOuS61uBZk5LYxq28PAeCNAUA7oawQ/R6RqTXL+pozuH7SI2+Py835YJyus2V kHMylSXHZkO1yHlj9s26XCp9HZOzYuokOoEVzqNVEVzBLGa92Ja7BZG/iby4RRJbMXR8 4gNE07MC4hNBofame2sFa4t1IMNumRhGpf8sEU2zuZJLKjvBuRex/xdAvnwIfX6Dm4DL u2lvVYzBgAdJRL3SGNc4ahk6eY7ANOiRKrU6yj8bcjswCZ11HZrElyxW25h6x3GbDloc R+JA== X-Gm-Message-State: AOJu0YycrlVEQZtIKZoZKD2ted4Emy8NFib6SOCJT/WquBZlgtT2nkC+ j7Z84ngUkAiy2QIWqYX+m5DAoicnCFcMwZsvc5qDGhf1VclFtFWzBHljsGGc0686heHReSfJFi1 Gecg= X-Google-Smtp-Source: AGHT+IGZs6rUJPk5eNm2rO8WEL5eOfcA19NoAJqNnlqXW9suaXuZFeNpLdJlTRBmgsGrqko7F4jXPQ== X-Received: by 2002:a2e:9b94:0:b0:2d2:a202:8a92 with SMTP id z20-20020a2e9b94000000b002d2a2028a92mr1858833lji.14.1709220058733; Thu, 29 Feb 2024 07:20:58 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id n6-20020a05600c4f8600b0041273fc463csm5584786wmq.17.2024.02.29.07.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 07:20:58 -0800 (PST) Date: Thu, 29 Feb 2024 16:20:46 +0100 Message-ID: <80cd4e5f5c0944ab4d0a420481071ef4e792b9e7.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/firmware.scm (ath9k-htc-firmware): Override the TARGET environment variable in the configure script to use xtensa-elf. * gnu/packages/patches/ath9k-htc-firmware-objcopy.patch: Adapt to use TARGET environment variable for objcopy. Change-Id: Ia44f0f25dde532b90168f2f2456412a43ac9af24 --- gnu/packages/firmware.scm | 1 + gnu/packages/patches/ath9k-htc-firmware-objcopy.patch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a9f218eb9f..da7835a95d 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -121,6 +121,7 @@ (define-public ath9k-htc-firmware ;; 'configure' is a simple script that runs 'cmake' with ;; the right flags. (substitute* "configure" + (("^TARGET.*$") "TARGET=xtensa-elf\n") (("^TOOLCHAIN=.*$") (string-append "TOOLCHAIN=" (assoc-ref (or native-inputs inputs) "cross-gcc") diff --git a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch b/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch index 2172f8353f..13c3ca1413 100644 --- a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch +++ b/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch @@ -1,5 +1,5 @@ The firmware is cross-compiled, but the build system ends up using -'objcopy' instead of 'xtensa-elf-objcopy' by default. Force it to +'objcopy' instead of '$TARGET-objcopy' by default. Force it to use the right one. --- source/target_firmware/configure 2014-10-28 20:57:26.834436561 +0100 @@ -8,7 +8,7 @@ use the right one. cat > "$TOOLCHAIN_FILE" <