From patchwork Wed Jul 21 00:46:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 237 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 38FF627BC78; Wed, 21 Jul 2021 01:47:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B077B27BC6B for ; Wed, 21 Jul 2021 01:47:11 +0100 (BST) Received: from localhost ([::1]:37018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m60OE-0005MX-Ke for patchwork@mira.cbaines.net; Tue, 20 Jul 2021 20:47:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60O6-0005M9-HX for guix-patches@gnu.org; Tue, 20 Jul 2021 20:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m60O6-0006m0-97 for guix-patches@gnu.org; Tue, 20 Jul 2021 20:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m60O6-00089P-1P for guix-patches@gnu.org; Tue, 20 Jul 2021 20:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH 0/9] Target check fixes and cleanups Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 00:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Thiago Jung Bauermann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162682841531314 (code B ref -1); Wed, 21 Jul 2021 00:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jul 2021 00:46:55 +0000 Received: from localhost ([127.0.0.1]:35721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60Nz-00088z-EN for submit@debbugs.gnu.org; Tue, 20 Jul 2021 20:46:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:52750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60Nx-00088r-CF for submit@debbugs.gnu.org; Tue, 20 Jul 2021 20:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60Nx-0005Lz-1d for guix-patches@gnu.org; Tue, 20 Jul 2021 20:46:53 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:13236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60Nt-0006cB-A9 for guix-patches@gnu.org; Tue, 20 Jul 2021 20:46:51 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 79334998 for ; Wed, 21 Jul 2021 02:46:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1626828403; x=1628642804; bh=/oPGhUio9jwoiBRjloTxjhLcHnERMaMT/3nI+LPaZWM=; b=i2doz/Mkbh7Y 4ex0/L46GYtcSlPMA/vIxdRoucuF4Zg4YAbIlw0KM6BSu+Zq9pffU8Kpt3CL5hKt pgnwpVpmVcj3blw4uD98QoRvhgtxjBW8/ju7ZQ5n1Y4eyZLNrfhhvaGYYzYW4H1V 1w3ISDvu+RawTDPZBXCFcdk16faANI0XnZ5YctT8uVjAsNZByOSXumFEe6PVO9HB 0L+dnSo3jmAm3nUKVz2xDAcQFaA6wZwFoIV0r08QPXz+VUsNxJrAG0NGm5r16/Du bvH8EnrFQ5IAwRKg1ubC7nyg8tPlFKmYiR+G0Krtzt/EbjmVRBUV/ZBBBYUQN3kY I0ezE777/9LrfLMfmGuXltsIR41kvIbq7tD2Yt/0JpGhxA7SaV+Jd1ENrWX6brBp pHk8SO6ucxHBqC2gSAXfb9aR+sIgkw/JVcYooSJFM2IaZddk+Rm61pj2OvE3Re9O CbV/hj6fLjeZ2ubsg6dWZT0eCfLUcAhL/ImI9cUxkFeCB2jGPlmaiBsA+g1ctoeb CPULnVf0YYNhEEFkF6gVJ/7y1pbE1eeaGsZYt8xUi8FMtUocYE+TDp3u7EJRVaPm L/XjtfSV5ktTItU/zbNWcVZXGeazLp7OrHZe40VD8escZSVtd3pTEr8kmXb1ISHo oY0v/vrKHWlG3h2QAfBa4CbkEIWYu4U= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EyXnqPfb4CoL for ; Wed, 21 Jul 2021 02:46:43 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id AEBD7841 for ; Wed, 21 Jul 2021 02:46:42 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 78DF243C; Wed, 21 Jul 2021 02:46:41 +0200 (CEST) Date: Tue, 20 Jul 2021 21:46:15 -0300 Message-Id: <20210721004615.631777-1-bauermann@kolabnow.com> MIME-Version: 1.0 Received-SPF: pass client-ip=95.128.36.41; envelope-from=bauermann@kolabnow.com; helo=mx.kolabnow.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches Hello, I recently had a closer look at uses of ‘%current-target-system’ and ‘%current-system’ and noticed a few bugs to fix and also cleanups that can be done. They mostly stem from the fact that ‘%current-system’ holds a Nix system identifier, while ‘%current-target-system’ holds a GNU triplet identifier. A few parts of the code are confused about that and make the wrong check. The individual patch descriptions have the details. The last two patches are just cleanups and not bug fixes. I’m on the fence about the merits of the last patch. It can reasonably be seen as either a worthwhile cleanup or needless code churn. I’m sending it anyway, and I’m fine with either dropping or applying it. The series applies on today’s master branch, as of commit: e644e45aec26 gnu: pipe-viewer: Correct references to youtube-dl program. The only testing I did was running `make` on each patch in the series and checking if there’s any new Guile warnings or errors (there isn’t), and running `make check`. The testsuite results are: ============================================================================ Testsuite summary for GNU Guix UNKNOWN ============================================================================ # TOTAL: 1935 # PASS: 1903 # SKIP: 27 # XFAIL: 2 # FAIL: 3 # XPASS: 0 # ERROR: 0 ============================================================================ See ./test-suite.log Please report to bug-guix@gnu.org ============================================================================ The failures are in tests/publish.scm, tests/guix-describe.sh and tests/guix-package.sh. Compared to the master branch, tests/guix-describe.sh is the only new failure. The test is skipped in the master branch. This is because I ran the master branch tests on a git worktree, where ‘.git’ is a file rather than a directory, causing the test to be skipped. If I change the `if [ -d "…/.git" ]` line to `if [ -e "…/.git" ]`, then the test also fails on master and I have the same testsuite results with and without the patches. Thiago Jung Bauermann (9): gnu: Fix check of ‘%current-system’ and ‘%current-target-system’ utils: Add ‘current-target-nix-system’ helper gnu: Query membership in ‘supported-systems’ list with Nix identifier gnu: Use ‘current-target-nix-system’ in pattern matches gnu: Use ‘current-target-nix-system’ in prefix checks gnu: Fix GNU/Linux system detection bootloader: grub: Fix mix of GNU triplet and Nix system identifier gnu: ustr: Don’t pass default argument gnu: Use existing target helpers from ‘(guix utils)’ gnu/bootloader/grub.scm | 5 +---- gnu/packages/algebra.scm | 3 +-- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/bdw-gc.scm | 4 ++-- gnu/packages/boost.scm | 4 ++-- gnu/packages/bootloaders.scm | 22 ++++++---------------- gnu/packages/bootstrap.scm | 6 ++---- gnu/packages/c.scm | 3 +-- gnu/packages/ci.scm | 6 ++---- gnu/packages/compression.scm | 6 ++---- gnu/packages/crypto.scm | 4 ++-- gnu/packages/databases.scm | 3 +-- gnu/packages/debug.scm | 6 ++---- gnu/packages/digest.scm | 3 +-- gnu/packages/firmware.scm | 4 ++-- gnu/packages/gcc.scm | 5 +---- gnu/packages/golang.scm | 6 ++---- gnu/packages/gstreamer.scm | 6 ++---- gnu/packages/java.scm | 16 +++++++--------- gnu/packages/julia.scm | 3 +-- gnu/packages/linux.scm | 4 +--- gnu/packages/lisp.scm | 3 +-- gnu/packages/llvm.scm | 4 +--- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/mes.scm | 3 +-- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/multiprecision.scm | 4 +--- gnu/packages/ntp.scm | 4 ++-- gnu/packages/pascal.scm | 6 ++---- gnu/packages/pciutils.scm | 3 +-- gnu/packages/photo.scm | 4 ++-- gnu/packages/php.scm | 3 +-- gnu/packages/python.scm | 26 ++++++++++---------------- gnu/packages/rust.scm | 4 +--- gnu/packages/sdl.scm | 4 ++-- gnu/packages/syncthing.scm | 4 ++-- gnu/packages/telephony.scm | 4 ++-- gnu/packages/textutils.scm | 3 +-- gnu/packages/valgrind.scm | 4 ++-- gnu/packages/video.scm | 7 ++----- gnu/packages/web.scm | 9 +++------ guix/utils.scm | 14 ++++++++++++++ 42 files changed, 101 insertions(+), 149 deletions(-)