Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:47 2024
Received: from localhost ([127.0.0.1]:35037 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiFD-0004g9-7p
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:47 -0500
Received: from mail-lf1-f53.google.com ([209.85.167.53]:50393)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiF5-0004ex-LW
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:40 -0500
Received: by mail-lf1-f53.google.com with SMTP id
2adb3069b0e04-512b700c8ebso1117931e87.0
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220066; x=1709824866;
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=TcNQdfWCoE2Jx53NHNx5X2HYyZXzK6yKC/I8DyugVBA=;
b=OgNRTDoFFS+aw9mFefCq/wO7oJXgckc7pBxFYI9IWY6FZbFcagnhtrTBqmmjuvX6m0
H4+7H/xvtPYwB+3SnIrQ9Lb08usDdLPEzu7CSffbwuhxkJcd0PXFN8XX4s369q4lV5h9
wz4Soh/41O3nv4xAi5D3WmeqNuRmSqk4VtM+YYCccgQ8ksIcYwLxgcJqr/jtvARAM2mD
c408ijGj/RQN3O1/fNpXr50wO1rYs2G0MOFUW2ypkTidxq4QXdaNRyKDFjraT5p+mGrK
iuc4XMVkBS1yikC2iF6J5R8mIqkO/745CBP0KhtWUXcEisI3Ug4Igo6w6xbAPZ7/bCp4
gw3g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220066; x=1709824866;
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=TcNQdfWCoE2Jx53NHNx5X2HYyZXzK6yKC/I8DyugVBA=;
b=ABFYI8jznnC/rNc5q7+tHo7ZblSb9M2OkAEIzkQivj3okom3SjP7s405VsHeHrk4w9
ViuTohGYWrIbTiTWN38SbdrQPb4Otm8x+4mK6s8SAb4n6i+W7uByFzXtMU+3stdJMdwv
BKSZs11Te89ISQHkCGDCheRXCa7RjDuE5+EDEce4+guibHywPodLn3rG6FnDl/fXwG0F
yoycvOztdRXaR8ondGeCwmCmH+pCeV5oRsCYfTZbVrMjmac+YRZT/WvFuVqcUkbOu4Og
R8vku7Gxx1k5fc+pIJqb/qr4uv/6HxUSInAaKvDVNeszSxweHTQ+P0lPdxg2WFLsx19Z
Q0lg==
X-Gm-Message-State: AOJu0YxjgQ9HGytqqwD2AX1GrdrbNXaRLe7Rao0WSqao+vQsTNzCyANE
tauP/TpIsTt1xLmRsQiwNm+ZnuV3EWY6UvnzmH9PojXycDWEc4jSbA9Q9Iou1PkdXE/GMvTcLjD
c+2Q=
X-Google-Smtp-Source: AGHT+IHhxs/oFyHu/c95DyxDatLsWlHB3z5UwiYwux+JhgGr4xPfeyFIGetgpW0HM6p9ddKyyT7mMw==
X-Received: by 2002:a05:6512:250f:b0:512:f679:665b with SMTP id
be15-20020a056512250f00b00512f679665bmr2341936lfb.42.1709220066437;
Thu, 29 Feb 2024 07:21:06 -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.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:21:06 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 8/8] gnu: ath9k-htc-firmware: Split package.
Date: Thu, 29 Feb 2024 16:20:50 +0100
Message-ID: <92203e11d48f408c58b562151b09e5bb376ab62f.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>,
Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/local.mk (dist_patch_DATA): Remove ath9k-htc-firmware-objcopy.patch.
* gnu/packages/firmware.scm (ath9k-htc-firmware): Remove variable.
* gnu/packages/firmware.scm (ath9k-htc-ar7010-firmware): New variable.
* gnu/packages/firmware.scm (ath9k-htc-ar9271-firmware): New variable.
* gnu/packages/patches/ath9k-htc-firmware-objcopy.patch: Delete file.
* gnu/system.scm (%base-firmware): Use new ath9k packages.
Change-Id: I86259e398427abd139c1f310a95bb15e2c03cee3
---
gnu/local.mk | 1 -
gnu/packages/firmware.scm | 79 +++++++++----------
.../patches/ath9k-htc-firmware-objcopy.patch | 14 ----
gnu/system.scm | 3 +-
4 files changed, 39 insertions(+), 58 deletions(-)
delete mode 100644 gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 725093fb09..70d2e99481 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -941,7 +941,6 @@ dist_patch_DATA = \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \
- %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
%D%/packages/patches/atlas-gfortran-compat.patch \
%D%/packages/patches/audacity-ffmpeg-fallback.patch \
%D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index ad687d1de6..47d4c08b0d 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -37,6 +37,7 @@ (define-module (gnu packages firmware)
#:use-module (guix utils)
#:use-module (guix git-download)
#:use-module (guix build-system copy)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
@@ -90,9 +91,9 @@ (define-module (gnu packages firmware)
#:export (make-ergodox-firmware
make-qmk-firmware))
-(define-public ath9k-htc-firmware
+(define-public ath9k-htc-ar7010-firmware
(package
- (name "ath9k-htc-firmware")
+ (name "ath9k-htc-ar7010-firmware")
(version "1.4.0")
(source (origin
(method git-fetch)
@@ -106,51 +107,45 @@ (define-public ath9k-htc-firmware
(sha256
(base32
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
- (file-name (git-file-name name version))
- (patches (search-patches "ath9k-htc-firmware-objcopy.patch"
- "ath9k-htc-firmware-gcc-compat.patch"))))
- (build-system gnu-build-system)
+ (file-name (git-file-name "open-ath9k-htc-firmware" version))
+ (patches (search-patches "ath9k-htc-firmware-gcc-compat.patch"))))
+ (build-system cmake-build-system)
(arguments
- '(#:target #f ; Package produces firmware.
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'pre-configure
- (lambda* (#:key inputs native-inputs #:allow-other-keys)
- (chdir "target_firmware")
-
- ;; 'configure' is a simple script that runs 'cmake' with
- ;; the right flags.
- (substitute* "configure"
- (("^TARGET.*$") "TARGET=xtensa-ath9k-elf\n")
- (("^TOOLCHAIN=.*$")
- (string-append "TOOLCHAIN="
- (assoc-ref (or native-inputs inputs) "cross-gcc")
- "\n")))
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (fw-dir (string-append out "/lib/firmware")))
- (for-each (lambda (file)
- (install-file file fw-dir))
- (find-files "." "\\.fw$"))
- #t))))
- #:tests? #f))
-
- ;; 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"))
- ("cross-binutils" ,(cross-binutils "xtensa-ath9k-elf"))
- ("cmake" ,cmake-minimal)
- ("perl" ,perl)))
+ (list #:target "xtensa-ath9k-elf"
+ #:tests? #f
+ #:configure-flags #~'("-DTARGET_MAGPIE=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'change-directory
+ (lambda _
+ (chdir "target_firmware")))
+ (replace 'install
+ (lambda _
+ (let ((fw-dir (string-append #$output "/lib/firmware")))
+ (for-each (lambda (file)
+ (install-file file fw-dir))
+ (find-files "." "\\.fw$"))))))))
+ (native-inputs (list perl))
(home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")
- (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs")
+ (synopsis "Firmware for the Atheros AR7010 USB 802.11n NICs")
(description
- "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB
-802.11n NICs (aka Wi-Fi USB dongles). It is used by the ath9k driver of
-Linux-libre.")
+ "This is the firmware for the Qualcomm Atheros AR7010 802.11n USB NICs
+(aka Wi-Fi USB dongle). It is used by the ath9k driver of Linux-libre.")
(license (license:non-copyleft "http://directory.fsf.org/wiki/License:ClearBSD"))))
+(define-public ath9k-htc-ar9271-firmware
+ (package
+ (inherit ath9k-htc-ar7010-firmware)
+ (name "ath9k-htc-ar9271-firmware")
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments ath9k-htc-ar7010-firmware)
+ ((#:configure-flags flags) #~'("-DTARGET_K2=ON"))))
+ (synopsis "Firmware for the Atheros AR9271 USB 802.11n NICs")
+ (description
+ "This is the firmware for the Qualcomm Atheros AR9271 802.11n USB NICs
+(aka Wi-Fi USB dongle). It is used by the ath9k driver of Linux-libre.")))
+
(define-public b43-tools
(let ((commit "27892ef741e7f1d08cb939744f8b8f5dac7b04ae")
(revision "1"))
diff --git a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch b/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
deleted file mode 100644
index 13c3ca1413..0000000000
--- a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-The firmware is cross-compiled, but the build system ends up using
-'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
-+++ source/target_firmware/configure 2014-10-28 20:57:29.666436530 +0100
-@@ -11,6 +11,7 @@ mkdir -p build
- cat > "$TOOLCHAIN_FILE" <<EOF
- INCLUDE(CMakeForceCompiler)
-
-+SET(CMAKE_OBJCOPY ${TARGET}-objcopy)
- SET(CMAKE_SYSTEM_PROCESSOR xtensa)
- SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/$TARGET)
- SET(CMAKE_STRIP :)
diff --git a/gnu/system.scm b/gnu/system.scm
index aede35775e..927abc642c 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -876,7 +876,8 @@ (define* (operating-system-with-provenance os
(define %base-firmware
;; Firmware usable by default.
- (list ath9k-htc-firmware
+ (list ath9k-htc-ar7010-firmware
+ ath9k-htc-ar9271-firmware
openfwwf-firmware))
(define %base-packages-artwork
--
2.41.0
efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:47 2024
Received: from localhost ([127.0.0.1]:35035 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiFC-0004g2-Se
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:47 -0500
Received: from mail-wm1-f45.google.com ([209.85.128.45]:42145)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiF4-0004em-2q
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:38 -0500
Received: by mail-wm1-f45.google.com with SMTP id
5b1f17b1804b1-412bfacd146so3892465e9.0
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220065; x=1709824865;
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=VcsLsUEMLbzBBDR/6N28RfDfj9lUT2fndMOiowrKUDc=;
b=hIERCpuditUMvyz+F6eldjQ51FGu3BcWNHPGUqCZLuWKpPvH2BH8/4/D1oqEPqpw+6
cWB9iB0MggApcXgYphV8sSzh3/pfLhtGIdcI1NsySzMHK5igfOy102mXALJiHUgx9c7C
e1IyUCwo6IEELysnGjZB+J/zFKQDYgfpg+alB5qcSmouzAokDl4pWJdGfwsOJ2u9Ly4A
o/qM7GatxOEGUVXeqQaYwMKCegbJ91QcYuzN43SJLbAoj3LGmtijN+5BTxxa4MRcfRT6
KWnENEjVOwDWhG3ZRAdJZZ0tFD7VYs/0EQr8NANs1GfhBZ9GnV67OmUXvmW8kXvyp/LP
Qh0g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220065; x=1709824865;
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=VcsLsUEMLbzBBDR/6N28RfDfj9lUT2fndMOiowrKUDc=;
b=oBYpSMOzP2Wip9ptkN0NWWCkdW3q9sZpgBbIe3GcmZj+54X3RgkYxhEOCsQlyvo1Ab
uAeAHF/LVrJ2OrBFzfXGxWajXZ7PMCFRzZHrA7LH/DMsYA5ZdvdGQcHb4KxVENIyLZBE
+sCTyJIAB28ZinYjBRIKfMp3jPMd7Qf8LT7JWi1EU52kMGhjeliTp5JtC49Pn6T+CNPT
5sk7S92MIAo0DOPDN2yc/iFtTGIMD/2r+i7axH+Sd+il5LfF4keoMnTQfYgivq3lnz7T
0Qt3zOZGYAMDjPY0TlOX5KaKlX2fbAP0RWU/9c19nhBnMZYUJ614NABt/mx31pCth/uj
hSoA==
X-Gm-Message-State: AOJu0Yxs2v6Wjx9YZxPuds1nc4HUdfLSO2E4HGwK8OhpEGfBR0IN/QIG
pMlmuALnehRmhwywL8p7PiQxkcWVejfsngDILsbDIbDegbksOCPPmWQbWqcirwsWRgWyDOxJ76Y
gBxw=
X-Google-Smtp-Source: AGHT+IGxTgn9SBIDs0EKxITlrnF7puD8PRFqqnU4vwXqlL0q9JvoWeyaThl4EtSo2+MgI2HuQjk4cA==
X-Received: by 2002:a05:600c:1548:b0:412:aec6:484f with SMTP id
f8-20020a05600c154800b00412aec6484fmr2501501wmg.15.1709220065048;
Thu, 29 Feb 2024 07:21:05 -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.04
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:21:04 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 7/8] guix: cmake-build-system: Handle unknown systems.
Date: Thu, 29 Feb 2024 16:20:49 +0100
Message-ID: <4d426a20ba51e666b481324ff6300ad2af98a5f3.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build/cmake-build-system.scm (configure): Use Generic as the
system name if the system is unknown.
Change-Id: Ifd4a618ef67eb420b02d48f05291571aea44e46e
---
guix/build/cmake-build-system.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index d1ff5071be..0774124c95 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -69,9 +69,13 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
target "-gcc")
(string-append "-DCMAKE_CXX_COMPILER="
target "-g++")
- (if (string-contains target "mingw")
- "-DCMAKE_SYSTEM_NAME=Windows"
- "-DCMAKE_SYSTEM_NAME=Linux"))
+ (cond
+ ((string-contains target "mingw")
+ "-DCMAKE_SYSTEM_NAME=Windows")
+ ((string-contains target "linux")
+ "-DCMAKE_SYSTEM_NAME=Linux")
+ (else
+ "-DCMAKE_SYSTEM_NAME=Generic")))
'())
,@configure-flags)))
(format #t "running 'cmake' with arguments ~s~%" args)
--
2.41.0
guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:46 2024
Received: from localhost ([127.0.0.1]:35033 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiFC-0004fu-Ez
for submit <at> 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 <jean@HIDDEN>) id 1rfiF2-0004ef-LP
for 69476 <at> 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 <at> 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)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k.
Date: Thu, 29 Feb 2024 16:20:48 +0100
Message-ID: <4f6ab97323db3c8dfe2d5f40d5fe0811a21d4e58.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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) <native-inputs>: 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@HIDDEN
+ ((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")
--
2.41.0
efraim@HIDDEN, ludo@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:46 2024
Received: from localhost ([127.0.0.1]:35031 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiFB-0004fs-V2
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:46 -0500
Received: from mail-wm1-f47.google.com ([209.85.128.47]:60681)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiEz-0004eJ-Vz
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:34 -0500
Received: by mail-wm1-f47.google.com with SMTP id
5b1f17b1804b1-412a14299a4so7993465e9.1
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220061; x=1709824861;
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=nGaEWohkJKsiDn26XxzfyrRm3DHHf3dRP9xNIuceCkY=;
b=XoGkri4wd3WCJjdRCX72Fy2IA/3XRGel3U9+dy7O8KL3Lrrb1tK+R52H4Aoci11oJV
cq+CNGH/RMG3YLa256tDZhtav3NY20ggqocZ9qnS6cpJcPKivcsifp3vcJvAFfRTSO4t
9LPQ9bLQiOFDFt6wXkYhOKhKqc4pazrzxOJVl9AwRUcwsD7gJr7V4BKS4FCKLFAzjnWT
37DtFYmVXk6bKPBuHKtyHc9edhHc4P755saXV/FsmKsFVUdFrrwsBvwHjQepbLBoAdVe
dL7iCdD2tamSG0dTnq0xz8gFDFsaP4zBVyTIpiB++ebPTWnEqevoM03htlNJDxMmaUjK
9E9A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220061; x=1709824861;
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=nGaEWohkJKsiDn26XxzfyrRm3DHHf3dRP9xNIuceCkY=;
b=Gozlupf/B1T0SwjbumKbxlsSNCGuZYVyUbdbMWjOFtY0cE24Ev0Kad9VIaAGtlFEQv
qtLQTgutaILEmB6TapZBRlWU2zyTzt0AVVW2xYdupj8mUjXtAYtTG79HbhISXILm4XYb
TjB6F1IVV8q3Rx28KVaY9b6u5CVKOpr3dXkLDRKZ318c7a6cK9rX0Cad0y86v0U6oF7W
ChYTPHrSiQhna1uui3NblZnCpWyxlrPA+y3co8gLXuxVyvX9BLZQbwe8jTv6FDiZhE32
cAJm4AKDaT7qImLRJtiS0M7nufgi9UysFCGDoFBY1/9Mi5jhcjfhJKFEn7xHtgIebC3N
opkQ==
X-Gm-Message-State: AOJu0YzC0+uKLR5OO0AdyMQ70kF2BDXrK7Tfx9kZdNdQacfl7E61Aj4/
b+f56ZJNcBMGn8b+YSWQJTSuyDgZCb3GAFI+f//bK5eLq4/9kIHmdXw9Ap3nwPACYS4Kk+WxYUJ
FTqI=
X-Google-Smtp-Source: AGHT+IFxNtGzPVg5TtWcJfYKr/l1oobrAzIt/gkPRXJvRUwFwJuy31T3OSQrnzViVqP/zqjGmQ2Sbg==
X-Received: by 2002:a05:600c:a08:b0:412:ae57:379 with SMTP id
z8-20020a05600c0a0800b00412ae570379mr1934935wmp.17.1709220060807;
Thu, 29 Feb 2024 07:21:00 -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.00
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:21:00 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf.
Date: Thu, 29 Feb 2024 16:20:47 +0100
Message-ID: <51b3861e69dc0ab0e52692448e9280a364a3397e.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/firmware.scm (ath9k-htc-firmware): Use the
xtensa-ath9k-elf target for the cross toolchain.
Change-Id: Ic1a7c4088312290a86a508f371f4f0e784e301a5
---
gnu/packages/cross-base.scm | 4 ++--
gnu/packages/firmware.scm | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2d79e0acf6..93383089e5 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -118,8 +118,8 @@ (define* (cross-binutils* target #:key (binutils binutils))
;; target libs, not native libs, so this is safe.
`(cons "--with-sysroot=/" ,flags)))))))
- ;; For Xtensa, apply Qualcomm's patch.
- (cross (cond ((string-prefix? "xtensa-" target)
+ ;; For xtensa-ath9k-elf, apply Qualcomm's patch.
+ (cross (cond ((string=? target "xtensa-ath9k-elf")
(package-with-patches binutils
(search-patches
"ath9k-htc-firmware-binutils.patch")))
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index da7835a95d..6993925387 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -121,7 +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")
+ (("^TARGET.*$") "TARGET=xtensa-ath9k-elf\n")
(("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN="
(assoc-ref (or native-inputs inputs) "cross-gcc")
@@ -140,12 +140,12 @@ (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-elf"
+ "xtensa-ath9k-elf"
#:xbinutils (cross-binutils
- "xtensa-elf"
+ "xtensa-ath9k-elf"
#:binutils binutils-2.33)))
("cross-binutils" ,(cross-binutils
- "xtensa-elf"
+ "xtensa-ath9k-elf"
#:binutils binutils-2.33))
("cmake" ,cmake-minimal)
("perl" ,perl)))
--
2.41.0
efraim@HIDDEN, ludo@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:35 2024
Received: from localhost ([127.0.0.1]:35026 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiF1-0004fD-Hj
for submit <at> 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 <jean@HIDDEN>) id 1rfiEy-0004eE-Bb
for 69476 <at> 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 <at> 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)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets.
Date: Thu, 29 Feb 2024 16:20:46 +0100
Message-ID: <80cd4e5f5c0944ab4d0a420481071ef4e792b9e7.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>,
Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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" <<EOF
INCLUDE(CMakeForceCompiler)
-+SET(CMAKE_OBJCOPY xtensa-elf-objcopy)
++SET(CMAKE_OBJCOPY ${TARGET}-objcopy)
SET(CMAKE_SYSTEM_PROCESSOR xtensa)
SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/$TARGET)
SET(CMAKE_STRIP :)
--
2.41.0
efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:35 2024
Received: from localhost ([127.0.0.1]:35024 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiF1-0004f5-6j
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:35 -0500
Received: from mail-lf1-f41.google.com ([209.85.167.41]:50512)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiEx-0004eC-3E
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:31 -0500
Received: by mail-lf1-f41.google.com with SMTP id
2adb3069b0e04-5131f3fc695so1118410e87.1
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220057; x=1709824857;
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=BqLh8JCzDCyX4y2ZnJKOll43lEE/dKnDgYgfIC7F+dk=;
b=Q6Uk8t/G6FSg+dJkC7mviebx9klw/F1pvxccCgxKb8bp15kuOYL4CqbfGBV5YE4O6W
OcSJPf6OUU7bq0TH5I8gA9cjHIPcIPcrYUJcgouR7hEF1me/QnR6855p0pbwcbLPOkld
BtD3+gh5xPcfJG9OMNiN2xBZ/k1QHiWZzuZGlf30pXQUId5OSS0HQzbSjhkWjSJrXift
LAn5Mp9f6K2CXlqazp2yl367fo6BMVa6msv1v1OLwrqKxNlP7xFXoH13PgL0h0aW+IFB
iJC6QGT1C/eGuBmmgG7HDVHPwGu5XjRuog24E9orp7D6sYoq0Xjfv1LO4jG0T6z3omNR
krfw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220057; x=1709824857;
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=BqLh8JCzDCyX4y2ZnJKOll43lEE/dKnDgYgfIC7F+dk=;
b=XeRGx33n0ShA+8M82wui34LkzK/8wTIyadtKSQKGcarMEz8HDSTevNNa+0PaBuqxVB
yTClwY5vaw05BWuNJdTdX/mO/7b8BnsWN4+ewRnAuDwuVsdhxfUE5751fWLco8KPZ7l6
glN3E/u6shk6pFtWTddT502DDLAVbMawKjdaj+NyDfjwYwy9AUzhYKpmv05P2N48/y9v
w6OhEpAbeMtfrnUI7PirFtUO5N4XSQ3yCWDmA5jB90MszUv4IRH8lIhvcgI6deeoLtJr
aoWlh+O6e0mrj44lHoZhxEcMnF3ZebzONhWueoiX+1WsuuezQ7WE9Wnw1XHx+gyQkEya
6nOA==
X-Gm-Message-State: AOJu0Yyu/uBbeMCBrNSA0uusl4feGW3gJodvAfF4zXjAZiGAo4QjBhAn
W4itpBtz1YllRn/DZsnwjRj8vGq2xRLR/94xwPyvtSvsrFHEtzMMyO6xf3w2APlYmVyX3s21/t9
EfZI=
X-Google-Smtp-Source: AGHT+IGObA87P+ZFjdbfql6YQb38RR7tLl/JaG5LdTPvOUryjQyQf6ST0BkaM1rZl92wdYtCulIJAA==
X-Received: by 2002:a19:8c08:0:b0:513:1853:4369 with SMTP id
o8-20020a198c08000000b0051318534369mr1691888lfd.49.1709220057504;
Thu, 29 Feb 2024 07:20:57 -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.57
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:20:57 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 3/8] gnu: ath9k-htc-firmware: Remove binary blobs.
Date: Thu, 29 Feb 2024 16:20:45 +0100
Message-ID: <2b663798ff1173bd03fde668c163ad72d014289e.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>,
Vagrant Cascadian <vagrant@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/firmware.scm (ath9k-htc-firmware) <source>: Add snippet
to remove bundled binary files.
Change-Id: I2f0592d03039ff9d5a5f3a79b0c62566164f3762
---
gnu/packages/firmware.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 828bc7402a..a9f218eb9f 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -99,6 +99,10 @@ (define-public ath9k-htc-firmware
(uri (git-reference
(url "https://github.com/qca/open-ath9k-htc-firmware")
(commit version)))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Delete binary blobs.
+ #~(for-each delete-file (find-files "." "\\.(a|o)$")))
(sha256
(base32
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
--
2.41.0
efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:35 2024
Received: from localhost ([127.0.0.1]:35022 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiF0-0004ey-Nj
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:35 -0500
Received: from mail-wm1-f43.google.com ([209.85.128.43]:48373)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiEv-0004e9-De
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:30 -0500
Received: by mail-wm1-f43.google.com with SMTP id
5b1f17b1804b1-412c286be35so2259705e9.0
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220056; x=1709824856;
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=QtK7nDLtVxeCmc6qCQxMdT8HrSFVa2b8lv8Ky3NN3eI=;
b=JkOOsKUPHIglysFEE6mpZmrzqZCDaXNeyAtFEwJNH09ZOoWsTlrzvcfsGwoOnfITt2
730a87kat6/XJtHw/loXj23dB8NFfAGHTx3q5c8AyZkzIm4w1sQe8Uq1dYFBXIXH7nTd
9cEO6Ok97E/RrLH3SCWiBYVshO0wldoPV5pjCUD8WRkBFKHNdbA1blpCA711IvzBFDiT
WHyYLDKBcqvrWAejrBYF7J0mUMO3Wov+tQdLW2zR026Ec8FpAUlLFZHiutSr7+pe4WOL
xYqeagn84cAVPvdJ5ocmMQtLsWBr5u9CSOnrE1bWIeHG8mpfdWUGJovbTBduiJosRXNt
rY5g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220056; x=1709824856;
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=QtK7nDLtVxeCmc6qCQxMdT8HrSFVa2b8lv8Ky3NN3eI=;
b=ZwqfgN5I6au0/lKC3BrykA8yEvsxQVslouVCRUwVWW1YWNUoVSiYIx+hmZkDZgjB4b
AkjHtQBKHqstFmZl07ci683ks7iF1sJypqOX+QxqoXll0xu4vIUkvGhqpeZnqiV+ald6
CxPDlRPA1C5qSBW/ZBCdVAN70XmY1XNk2aZrcNL5kDUNJS5ZDvFkSYrF/m4Ag8xFY/YC
+M+OvM18y7TSMewnBOR15K/prP2/7BiK/LS92mLctJjpgcudyBaoNYtPAFClfYJjoZW0
UHBaRm6e2kC3/yk/4h2lUHZCSt4j8AgYjc8eLKD4Rysqk5UhLAosF2IfVCe+ps5DdiO5
AT9A==
X-Gm-Message-State: AOJu0YyT7fgNU+3sHNCNfpz595qfGojSbAKoyak7BCjx/hAvtDxTGgXi
l69YdTsClXfeGDH4ucHjwubAw3U7rpGU3UUF1fiWbVAHMC/TRgCFtbLaTKUZTk+qkqR+3zcceoV
wl5g=
X-Google-Smtp-Source: AGHT+IGSb8nRTWDeYXeUIF4JF8FmKvnthQwHsaVsAc4jHXguRcrzCu3Lh+aYRtMa6aL5IX2eRcenNg==
X-Received: by 2002:a05:600c:154a:b0:412:a16d:fedc with SMTP id
f10-20020a05600c154a00b00412a16dfedcmr2073237wmg.7.1709220056265;
Thu, 29 Feb 2024 07:20:56 -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.55
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:20:56 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 2/8] guix: Add xtensa-ath9k-elf platform.
Date: Thu, 29 Feb 2024 16:20:44 +0100
Message-ID: <f4ed9445b4b3229f4a67242678b5ca6454cc52d7.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* Makefile.am (MODULES): Add guix/platforms/xtensa.scm.
* guix/platforms/xtensa.scm (xtensa-ath9k-elf): New variable.
* doc/guix.texi: Add xtensa-ath9k-elf documentation.
Change-Id: I51eef245142ed58613340c16d4bf7266e6bf6adb
---
Makefile.am | 1 +
doc/guix.texi | 6 ++++++
guix/platforms/xtensa.scm | 28 ++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 100644 guix/platforms/xtensa.scm
diff --git a/Makefile.am b/Makefile.am
index cef972880c..df62c4e255 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,6 +144,7 @@ MODULES = \
guix/platforms/powerpc.scm \
guix/platforms/riscv.scm \
guix/platforms/x86.scm \
+ guix/platforms/xtensa.scm \
guix/build-system.scm \
guix/build-system/agda.scm \
guix/build-system/android-ndk.scm \
diff --git a/doc/guix.texi b/doc/guix.texi
index 7153c9e7a4..d3db1ee03d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -16965,6 +16965,7 @@ Cross-Compilation
- x86_64-linux-gnu
- x86_64-linux-gnux32
- x86_64-w64-mingw32
+ - xtensa-ath9k-elf
@end example
Targets are specified as GNU triplets (@pxref{Specifying Target
@@ -46763,6 +46764,11 @@ Supported Platforms
C standard library.
@end defvar
+@defvar xtensa-ath9k-elf
+Platform targeting Xtensa CPU used in the Qualcomm Atheros AR7010 and AR9271
+USB 802.11n @acronym{NICs, Network Interface Controllers}.
+@end defvar
+
@node System Images
@chapter Creating System Images
diff --git a/guix/platforms/xtensa.scm b/guix/platforms/xtensa.scm
new file mode 100644
index 0000000000..304e23ab1a
--- /dev/null
+++ b/guix/platforms/xtensa.scm
@@ -0,0 +1,28 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Foundation Devices, Inc. <hello@HIDDEN>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (guix platforms xtensa)
+ #:use-module (guix platform)
+ #:use-module (guix records)
+ #:export (xtensa-ath9k-elf))
+
+(define xtensa-ath9k-elf
+ (platform
+ (target "xtensa-ath9k-elf")
+ (system #f)
+ (glibc-dynamic-linker #f)))
--
2.41.0
guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
Received: (at 69476) by debbugs.gnu.org; 29 Feb 2024 15:22:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:22:30 2024
Received: from localhost ([127.0.0.1]:35017 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rfiEw-0004eS-AS
for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:30 -0500
Received: from mail-ej1-f53.google.com ([209.85.218.53]:61810)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1rfiEu-0004e5-2A
for 69476 <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:22:29 -0500
Received: by mail-ej1-f53.google.com with SMTP id
a640c23a62f3a-a3122b70439so188495166b.3
for <69476 <at> debbugs.gnu.org>; Thu, 29 Feb 2024 07:22:00 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundationdevices.com; s=google; t=1709220054; x=1709824854;
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=CNyZ47Am1t4nAHbUpthstsycHI5D+oNLjVKb1qWw2r4=;
b=WzgccKtuDWhPq+Sj6Psau+BGlfgndkZQwUaDC7Z2XcTEaouD5mJr0Tw2TlcUeAK17i
4ybhFu7Rz9/KwJyKbuLPuPDs3BEGTjBpVnxhu9w2dL/QP4gZQO/0fGraPFIZdawTIV+j
lwt+Ej8bhpULTCMonRtUHgeT6izmlYyjwI7G5eHfRxALR1HWqZpbi5bRibO4+UYyV9/A
xuv8z3G+RQvBgV6zMCU00RmnocDFk2HlZvOZOe/GPxL6Z7YTKx6p1jjRpU18HhliS+y1
nrJhoRK9cxOdZl+2l/9Y2Nz2pe8GPNVW49uMAaTTqgltWO+jMO6MoqBn7m77KAyiZl7r
d5AQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1709220054; x=1709824854;
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=CNyZ47Am1t4nAHbUpthstsycHI5D+oNLjVKb1qWw2r4=;
b=pPIY+IiMd1Sx0LcZSTRFpRrbFow3bE14OdNWuTTpc8DzwEaqbT9HphfP1+VDbyJ8Xa
7qbqn8pSViCfkDI6mrSNXNQcyBwcr+TbTqGxWiO+hpHxFpNbEqozAok2bo907tMRq4eT
iwI3OM5afsyQs+8LApPEa785HIEq4zoMjL7fLwNG+WZZjZdUit8gPl0XZxjholS5FViQ
z48S4nNSWff46pgXhDtlBDI/u9CdyWY0VAmlqWe6k1lkAweSHeovPTuxLLNQEBBO2Rys
DESbNJlsAUfGM+GaqOyPs0/F1HhZVhtED4eoklZyt1VCs4EX/V/+8HHogpQpzBQkieNz
ojsA==
X-Gm-Message-State: AOJu0YwPCogXwzbKFk2RCQFeYTPhndKKFCBG8T3+pF5IcGzhnU/Cc+bD
Im8YU3KJkYQ1RvulCpRAHFtRiEx6qmNAdzZW4qjQ/kHvAwJS/2nR3n/s5FPBj9V4axmrt1pvza8
dCeo=
X-Google-Smtp-Source: AGHT+IF9veYgkKteaGcuC3hi3V0lwiZDDHTaWwvJAlRNVTGOHDtYRqnjmG8yHRsnTQZioduOw0tizg==
X-Received: by 2002:a17:906:508:b0:a3e:b442:cfdd with SMTP id
j8-20020a170906050800b00a3eb442cfddmr1703679eja.17.1709220054028;
Thu, 29 Feb 2024 07:20:54 -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.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 07:20:53 -0800 (PST)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 69476 <at> debbugs.gnu.org
Subject: [PATCH 1/8] doc: Add documentation for x86_64-linux-gnux32.
Date: Thu, 29 Feb 2024 16:20:43 +0100
Message-ID: <2e5ffa2bd69e06e446284f3927e23604cdd4ff48.1709219325.git.jean@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709219325.git.jean@HIDDEN>
References: <cover.1709219325.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69476
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* doc/guix.texi: Add documentation for x86_64-linux-gnux32.
Change-Id: I408d57ae5ae3e9b1449633b82c41aba0d40ded06
---
doc/guix.texi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index f6476e0d81..7153c9e7a4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -16963,6 +16963,7 @@ Cross-Compilation
- powerpc64le-linux-gnu
- riscv64-linux-gnu
- x86_64-linux-gnu
+ - x86_64-linux-gnux32
- x86_64-w64-mingw32
@end example
@@ -46732,6 +46733,11 @@ Supported Platforms
Platform targeting x86 64-bit CPU running GNU/Linux.
@end defvar
+@defvar x86_64-linux-x32
+Platform targeting x86 64-bit CPU running GNU/Linux with the run-time using
+the X32 ABI.
+@end defvar
+
@defvar i686-mingw
Platform targeting x86 CPU running Windows, with run-time support from
MinGW.
--
2.41.0
guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 29 Feb 2024 15:20:00 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 29 10:20:00 2024 Received: from localhost ([127.0.0.1]:35008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rfiCV-0004YQ-Jo for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:20:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:55750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jean@HIDDEN>) id 1rfiCS-0004YH-8b for submit <at> debbugs.gnu.org; Thu, 29 Feb 2024 10:19: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 <jean@HIDDEN>) id 1rfiC0-0004US-LL for guix-patches@HIDDEN; Thu, 29 Feb 2024 10:19:28 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <jean@HIDDEN>) id 1rfiBy-0002iT-S3 for guix-patches@HIDDEN; Thu, 29 Feb 2024 10:19:28 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33dcad9e3a2so691441f8f.3 for <guix-patches@HIDDEN>; Thu, 29 Feb 2024 07:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1709219964; x=1709824764; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YAjzHf6L/6NcctSSgaqSPWEc7kn09GVVhFPhlhjiWkI=; b=EhLp2LwJZEAdxP5eX7E+bRFNPAqlpQbMtj+waDAStgAhO4h17FkQOZLEJO+AUX6P/b T0FDjj131B10SgHDRj63UbE8nijpGggKyM/sLs0MNd0UoXVo3wph3xIcDdraAg8RB7Do VIYMl59VZeGzcYPbdLym/1FjGrfadccIcy1owpQV2kDfv4tSSXrJIhsq218HZ+kuOAsU xvus+ATXPXXs/+QRyZKhuW+7R2ctVp6cSFtxV0AGxSfUr86Llb2usk3aW5uyaPc3NKj6 3VwJdeVWzDJYA7el66UHvLL0W1pj1ERBE3zQrzT83+JNJlvNkckAn8EihdCfE2arW+f8 whCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709219964; x=1709824764; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YAjzHf6L/6NcctSSgaqSPWEc7kn09GVVhFPhlhjiWkI=; b=EPXGsnqEVx71cICNm/UH7b396ncXQE1PqW5/bvStoGxzlxZVKWNMHZhd9WMEeGhfut 57ZfgvkVLEfLyotw9eCwybWqPj7tcwjWAzK5/ZVx+m3Mb39Hdo+RwrNipqbhWeo5/1Xf +J3WgGTRIVAnRo705H1QJfSn3or/NQGFsEvAFVNbji2fiGtLw4YgSyYrbmqcehSiugDu dVO0artVquF45LJ0tVBgkxpClL9q2K4unRVcfKdkh2KSKIogKfskEoiDbkKEHXJvYbaW ClJOvuWqWAPreoCe9GxcXnOM98AzgG3coKuO9gxrwTaWlEgcp4iHvgjio6qzoo2Ou6ho m3ug== X-Gm-Message-State: AOJu0YybAojn7UrgvrKaGNVOMupFcbRyfBFKC2ph/CbhcNh1VRPnpLnr yWmSn2PkE4BOua3/KzgM27vZsWsHz8EIgKg3ddNgUpNqF6jJGu6JvQZ0zVhiRQ4w+ShF2dEfdI1 yh/M= X-Google-Smtp-Source: AGHT+IGOLJxw5VWQD31/GfNWBhsWpkcS4zeTUQCRTlpyl0ljKT7+XSOO391dHhWPvwUvc9jP+q+/aQ== X-Received: by 2002:adf:b645:0:b0:33d:32fe:cb49 with SMTP id i5-20020adfb645000000b0033d32fecb49mr1658318wre.3.1709219964395; Thu, 29 Feb 2024 07:19:24 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id i10-20020adff30a000000b0033b6e26f0f9sm2010701wro.42.2024.02.29.07.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 07:19:24 -0800 (PST) From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/8] guix: Add xtensa-ath9k-elf platform. Date: Thu, 29 Feb 2024 16:19:17 +0100 Message-ID: <cover.1709219325.git.jean@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN> Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=jean@HIDDEN; helo=mail-wr1-x42d.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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) Hello, As the ath9k-htc-firmware package requires a custom toolchain to build the firmware I thought it was best to have a target for this specific package as it modifies the default configuration of the Xtensa target in GCC. To work around this a new target is added: xtensa-ath9k-elf. It uses binutils@HIDDEN and the patched version of GCC to properly compile the firmware. So, as a result it allows using #:target keyword parameter to cross-compile the firmware and avoids explicitly adding the cross compiler in the NATIVE-INPUTS field. As a result the ath9k-htc-firmware package was splitted into two and uses the cmake-build-sytem now to use Guix's cross-compilation support properly, so it removes the need for the ath9k-htc-firmware-objcopy.patch. The [PATCH 7/8] contains a patch that was already sent to: https://issues.guix.gnu.org/68366 I don't have the hardware to test this firmware but the build produces the same hashes for the firmware so it's safe to say that the firmware should keep working. The hashes with this patch series: a5481cc67d962b217de1300121a6c7584e847cbe215442553d24a2173ca9202e /gnu/store/0i3zw28pvrr8l85fx79i8lq0f9vmgyjz-ath9k-htc-ar9271-firmware-1.4.0/lib/firmware/htc_9271.fw eef84c16e3edad3fdec19c985d190b5ed3f5bd5bae20be5579681ab35f001406 /gnu/store/iqbd77grzy4sngkxz9lgyvk52apn8vzj-ath9k-htc-ar7010-firmware-1.4.0/lib/firmware/htc_7010.fw And the hashes in master at commit 75bad75367fcf2c289fae3b40dbcc850f92177be: a5481cc67d962b217de1300121a6c7584e847cbe215442553d24a2173ca9202e /gnu/store/0m45gn74b5bavxq77158i3l593lh082r-ath9k-htc-firmware-1.4.0/lib/firmware/htc_9271.fw eef84c16e3edad3fdec19c985d190b5ed3f5bd5bae20be5579681ab35f001406 /gnu/store/0m45gn74b5bavxq77158i3l593lh082r-ath9k-htc-firmware-1.4.0/lib/firmware/htc_7010.fw Jean-Pierre De Jesus DIAZ (8): doc: Add documentation for x86_64-linux-gnux32. guix: Add xtensa-ath9k-elf platform. gnu: ath9k-htc-firmware: Remove binary blobs. gnu: ath9k-htc-firmware: Allow using other targets. gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf. gnu: cross-binutils: Use binutils-2.33 for ath9k. guix: cmake-build-system: Handle unknown systems. gnu: ath9k-htc-firmware: Split package. Makefile.am | 1 + doc/guix.texi | 12 +++ gnu/local.mk | 1 - gnu/packages/cross-base.scm | 17 +++- gnu/packages/firmware.scm | 88 +++++++++---------- .../patches/ath9k-htc-firmware-objcopy.patch | 14 --- gnu/system.scm | 3 +- guix/build/cmake-build-system.scm | 10 ++- guix/platforms/xtensa.scm | 28 ++++++ 9 files changed, 105 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/ath9k-htc-firmware-objcopy.patch create mode 100644 guix/platforms/xtensa.scm base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be -- 2.41.0
Jean-Pierre De Jesus DIAZ <jean@HIDDEN>:efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN.
Full text available.efraim@HIDDEN, vagrant@HIDDEN, guix-patches@HIDDEN:bug#69476; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.