From patchwork Tue Nov 28 11:35:02 2023 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: 56900 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 1670427BBEA; Tue, 28 Nov 2023 11:37: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=-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 4334627BBE2 for ; Tue, 28 Nov 2023 11:37:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7wOr-000730-Ox; Tue, 28 Nov 2023 06:37:09 -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 1r7wOj-0006xs-H8 for guix-patches@gnu.org; Tue, 28 Nov 2023 06:37:03 -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 1r7wOj-0008FP-3u for guix-patches@gnu.org; Tue, 28 Nov 2023 06:37:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7wOp-0003PC-D7; Tue, 28 Nov 2023 06:37:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH v1 19/22] gnu: make-qmk-firmware: Use AVR target. References: <20230929091333.7623-1-jean@foundationdevices.com> In-Reply-To: <20230929091333.7623-1-jean@foundationdevices.com> 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, 28 Nov 2023 11:37:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 66263@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 66263-submit@debbugs.gnu.org id=B66263.170117141312950 (code B ref 66263); Tue, 28 Nov 2023 11:37:07 +0000 Received: (at 66263) by debbugs.gnu.org; 28 Nov 2023 11:36:53 +0000 Received: from localhost ([127.0.0.1]:45647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7wOa-0003Mj-RP for submit@debbugs.gnu.org; Tue, 28 Nov 2023 06:36:53 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7wOJ-0003Kx-9d for 66263@debbugs.gnu.org; Tue, 28 Nov 2023 06:36:35 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-332ddd8e0bdso2902488f8f.0 for <66263@debbugs.gnu.org>; Tue, 28 Nov 2023 03:36:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1701171382; x=1701776182; darn=debbugs.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=DYdLejtZo55BEjFw15MHWbji2bUz+fRtQsw8FsTssEo=; b=QmCrj45CsmbyuiacT0e/xquQKJNcemXmkUkmDMjMBhmJ//Pqune7IZwdqs9XJSt8ki +bKmR0itkeD74EAW82Sa+vwoFuX4Z4a9lQeYX3vT1uh+m91xeWA341i0F6ZJTZxwZ/8R IbxZbrLS40nWDJuRLv4wNbBo7W5XFV2jRS6n+XR9bQQVFO1mOsAtioDQRuVYnIkkRAZh ia1CbwVK2xAwWLyD2TMy/HFCdw+chUaPeX05wwO42iT+RuR5bOI8yJUvqEog9kPC52IS wNnJAQFLw7bdV5r8i7rZBibbb8+9dQAuw/TDCE4ZOUAccXD6Ru7RHyhQCoMxqPvWBaOt 2QGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701171382; x=1701776182; 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=DYdLejtZo55BEjFw15MHWbji2bUz+fRtQsw8FsTssEo=; b=OGCTzs/EA4b9YLBIA12xncQP6KSkqA7GccLoIXFro4IWVr1+SEsxDySG/omZZ1T1wM qfpsDFtXy6K+1cTzvzDvYgv5m12oNUBwJqy37VOt0iEffcIS7DDV0sqgElL/h3NMa43h L4ZKIhhgu4qcpCxzmAt8H7EHo4MeRKuUzxuAqyBkhPgOa9ZEroLKBPNhyDvXsb0ShAy1 U3/jWJkSV1w4lkSBO6YmV9V0dc6l5H3w9LVSFxmYDWgLaX2nj1rDbFNkE7hzIMt+QuiR OtywsAXtAQNy8opWiz3euG4tQkMPXQNyf8KmxUw4jQotGmNoUJpYNsaG5P/tPeQ6gr3i s9bQ== X-Gm-Message-State: AOJu0Yy6MVx1yLmxC7viXSet67Ae2Mnq6803NVRgNemvDPOYFJ4hZmQU 2D2vhweySOwJmYAXHncJZS1OOGRPL3mj3hCwwy0= X-Google-Smtp-Source: AGHT+IEtf1l69lX44iYq1laV1JR2GfoEga4pPV+XucEnzwpDFnjoN3CxB4TWu961xy32bX99dGyLQg== X-Received: by 2002:a05:6000:c05:b0:332:fe76:2d33 with SMTP id dn5-20020a0560000c0500b00332fe762d33mr5835883wrb.30.1701171382597; Tue, 28 Nov 2023 03:36:22 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id f7-20020a05600c154700b0040b4cb14d40sm1848769wmg.19.2023.11.28.03.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 03:36:22 -0800 (PST) Date: Tue, 28 Nov 2023 12:35:02 +0100 Message-ID: <20231128113510.11214-19-jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 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 (qmk) : Remove AVR toolchain. * gnu/packages/firmware.scm (make-qmk-firmware/implementation): Use `#:target "avr"` keyword argument as qmk does not provide the toolchain. Change-Id: Ibe09f6ef3c555052faf2c5c243303d85675866be --- gnu/packages/firmware.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 58253b93a7..06abfcec71 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1344,9 +1344,7 @@ (define-public qmk `("PATH" prefix ,(map (compose dirname (cut search-input-file inputs <>)) - '("bin/avr-ar" - "bin/avr-gcc" - "bin/avrdude" + '("bin/avrdude" "bin/awk" "bin/cmp" "bin/dfu-programmer" @@ -1359,16 +1357,13 @@ (define-public qmk ;; TODO: Remove after git is wrapped with these. "bin/basename" "bin/sed" - "bin/uname"))) - `("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH"))) - `("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH"))))))))) + "bin/uname"))))))))) ;; The inputs are not propagated since qmk is to be used strictly as a ;; command. (inputs ;; The 'qmk setup' command advises to use GCC at version 8, and there are ;; compilation errors in some firmware otherwise. - (list (make-avr-toolchain #:xgcc gcc-8) - avrdude + (list avrdude bash-minimal dfu-programmer dfu-util @@ -1441,6 +1436,7 @@ (define* (make-qmk-firmware/implementation keyboard keymap (ice-9 ftw) (ice-9 match) (srfi srfi-26)) + #:target "avr" ;; XXX: Running a test target like "test:$keyboard" doesn't seem to run ;; anything and causes the .hex file to be regenerated; leave the tests ;; out for now.