From patchwork Mon Jan 16 03:25:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46180 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 F3A3C27BBEE; Mon, 16 Jan 2023 03:28:20 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 DC72F27BBE9 for ; Mon, 16 Jan 2023 03:28:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9I-0000EA-8K; Sun, 15 Jan 2023 22:27:04 -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 1pHG9H-0000Cz-14 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9G-0005oq-Pu for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9G-0007sU-9M for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 01/13] gnu: make-u-boot-package: Add a u-boot argument and use gexps. References: <20221220165038.25114-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221220165038.25114-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383956230046 (code B ref 60224); Mon, 16 Jan 2023 03:27:02 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:02 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8H-0007oQ-8A for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:02 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:34396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8G-0007o1-1C for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:00 -0500 Received: by mail-qv1-f44.google.com with SMTP id n2so2986032qvo.1 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=njBYzXhWpMyet/PUw8ErK4ju78CIYBGi8O5ZSMYIvodErHKTgLWijVjiDie3PQfj7U NfdjGK2DapNwQvYqpbJHm1e13OOCwcWpqOzKveaN7ueo7tgcwpNclvyKtc1WgAyCjJI4 o9C8kQweDOiT6c06XoIm/QwuYuqpXudXFORL8609cBQJa+OlBUvu231J4Evx2U4A70Ls ty2zVwqLrsYiBPLXXR/GPJFyu0Duhlog9UiN6cDB0OiGI2HghgOE3RUdEFhYWFr4E2qm c1nbKJS3xuVhb2lqxz/mTgUMLX9LXpcSAAvYO1Fjo/XdVM9wAVpZaxgdCPTg0JfxQHs/ bdKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=OIhin5DHqEgs/ZBwAJsIFtkvnvIJQYEX0CGB9wzea2FiexjIT3zk5nuZexQ17LWund UaqdyYQttO6Ye1fFuxNqfaOAOukkj92leOlSqZfi33Vi+SRwi5DNMw+k+BRj/+/jR+cY 38XnMXuFIAyuGwX9KUx9wjWsq5ASuhuI+fv9laOxb/ZgkKuPbBeroFwDcrHJT45J2sYt 88ODOqY96a0A1hAKxl/nU86MfEgSKbSizVTuNs9UU48cYuy4s+wpILtBjGD7EJO84UP4 8gQ0uGPL00/Jn8oo7y4D9WM81pc6Ix3p7G24JEuz4A1FV/tFdme14o7DXDGtonvAXEO8 0IVA== X-Gm-Message-State: AFqh2kr6AymA1pxRV0eKCMdR7w7/HKiNnBCh4/5KckO2NWfSgh72/1RT 3coCFxumF9zZexJCeMhlzKeLF1dajDt3nh/K X-Google-Smtp-Source: AMrXdXterIm95bHe48sb0vlyNtMw6pycr2Lh2vY+Jqi3AWFiXYjZjgYMftBmk4qj0zOT0l2y3C+3mg== X-Received: by 2002:a05:6214:5bc2:b0:4c7:62eb:145d with SMTP id lr2-20020a0562145bc200b004c762eb145dmr144239198qvb.25.1673839553861; Sun, 15 Jan 2023 19:25:53 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:53 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:32 -0500 Message-Id: <20230116032544.1378-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 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: , 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 And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. Do not bind OUTPUTS. --- (no changes since v3) Changes in v3: - No longer bind 'outputs' extraneously in build phases gnu/packages/bootloaders.scm | 181 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 84 deletions(-) base-commit: a9a38f515e5770fe7d19052c761f0f5e839af4e6 diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8dc6ff698d..96dd65ae9d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,11 +860,13 @@ (define*-public (make-u-boot-package board triplet defconfig configs name-suffix - append-description) + append-description + (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description." +appended to the package description. U-BOOT can be used when a fork or a +different version of U-Boot must be used." (let ((same-arch? (lambda () (string=? (%current-system) (gnu-triplet->nix-system triplet))))) @@ -879,91 +881,102 @@ (define*-public (make-u-boot-package board triplet "\n\n" append-description) (package-description u-boot))) (native-inputs - `(,@(if (not (same-arch?)) + ;; Note: leave the native u-boot inputs first, so that a user can + ;; override the cross-gcc and cross-binutils packages. + `(,@(package-native-inputs u-boot) + ,@(if (not (same-arch?)) `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `()) - ,@(package-native-inputs u-boot))) + `()))) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build kconfig) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build kconfig)) - #:test-target "test" - #:make-flags - (list "HOSTCC=gcc" - "KBUILD_VERBOSE=1" - ,@(if (not (same-arch?)) - `((string-append "CROSS_COMPILE=" ,triplet "-")) - '())) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((config-name (string-append ,board "_defconfig")) - (config-file (string-append "configs/" config-name)) - (defconfig ,defconfig) - (configs ',configs)) - (when defconfig - ;; Replace the board-specific defconfig with the given one. - (copy-file defconfig config-file)) - (if (file-exists? config-file) - (begin - (when configs - (modify-defconfig config-file configs)) - (apply invoke "make" `(,@make-flags ,config-name)) - (verify-config ".config" config-file)) - (begin - (display "invalid board name; valid board names are:" - (current-error-port)) - (let ((suffix-len (string-length "_defconfig")) - (entries (scandir "configs"))) - (for-each (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format (current-error-port) - "- ~A\n" - (string-drop-right file-name - suffix-len)))) - (sort entries string-ci<))) - (error "invalid boardname ~s" ,board)))))) - (add-after 'configure 'disable-tools-libcrypto - ;; Disable libcrypto due to GPL and OpenSSL license - ;; incompatibilities - (lambda _ - (substitute* ".config" - (("CONFIG_TOOLS_LIBCRYPTO=.*$") "CONFIG_TOOLS_LIBCRYPTO=n")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (uboot-files (append - (remove - ;; Those would not be reproducible - ;; because of the randomness used - ;; to produce them. - ;; It's expected that the user will - ;; use u-boot-tools to generate them - ;; instead. - (lambda (name) - (string-suffix? - "sunxi-spl-with-ecc.bin" - name)) - (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) - (find-files "." "^(MLO|SPL)$")))) - (mkdir-p libexec) - (install-file ".config" libexec) - ;; Useful for "qemu -kernel". - (install-file "u-boot" libexec) - (for-each - (lambda (file) - (let ((target-file (string-append libexec "/" file))) - (mkdir-p (dirname target-file)) - (copy-file file target-file))) - uboot-files) - #t))))))))) + (substitute-keyword-arguments (package-arguments u-boot) + ((#:modules modules '()) + `((ice-9 ftw) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build kconfig) + (guix build utils) + ,@modules)) + ((#:imported-modules imported-modules '()) + `((guix build kconfig) + ,@%gnu-build-system-modules + ,@imported-modules)) + ((#:test-target _ "test") + "test") + ((#:make-flags make-flags '()) + #~(list "HOSTCC=gcc" + "KBUILD_VERBOSE=1" + #$@(if (not (same-arch?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + #$@make-flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (let* ((config-name (string-append #$board "_defconfig")) + (config-file (string-append "configs/" config-name)) + (defconfig #$defconfig) + (configs '#$configs)) + (when defconfig + ;; Replace the board-specific defconfig with the given + ;; one. + (copy-file defconfig config-file)) + (if (file-exists? config-file) + (begin + (when configs + (modify-defconfig config-file configs)) + (apply invoke "make" `(,@make-flags ,config-name)) + (verify-config ".config" config-file)) + (begin + (display "invalid board name; valid board names are:" + (current-error-port)) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" + file-name) + (format (current-error-port) + "- ~A\n" + (string-drop-right + file-name suffix-len)))) + (sort entries string-ci<))) + (error "invalid boardname ~s" #$board)))))) + (add-after 'configure 'disable-tools-libcrypto + ;; Disable libcrypto due to GPL and OpenSSL license + ;; incompatibilities + (lambda _ + (substitute* ".config" + (("CONFIG_TOOLS_LIBCRYPTO=.*$") + "CONFIG_TOOLS_LIBCRYPTO=n")))) + (replace 'install + (lambda _ + (let ((libexec (string-append #$output "/libexec")) + (uboot-files + (append + (remove + ;; Those would not be reproducible + ;; because of the randomness used to + ;; produce them. It's expected that the + ;; user will use u-boot-tools to generate + ;; them instead. + (lambda (name) + (string-suffix? + "sunxi-spl-with-ecc.bin" + name)) + (find-files "." + ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + (find-files "." "^(MLO|SPL)$")))) + (mkdir-p libexec) + (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))))) (define-public u-boot-am335x-boneblack (let ((base (make-u-boot-package From patchwork Mon Jan 16 03:25:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46183 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 A1B3927BBEB; Mon, 16 Jan 2023 03:28:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 4200D27BBE9 for ; Mon, 16 Jan 2023 03:28:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9I-0000EP-GA; Sun, 15 Jan 2023 22:27:04 -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 1pHG9H-0000D0-1Q for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9G-0005or-Pw for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9G-0007sc-LN for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 02/13] gnu: make-u-boot-package: Install .imx files. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383956430078 (code B ref 60224); Mon, 16 Jan 2023 03:27:02 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:04 +0000 Received: from localhost ([127.0.0.1]:60047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007p2-3O for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:38804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8G-0007o3-QX for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:01 -0500 Received: by mail-qv1-f47.google.com with SMTP id qb7so18874517qvb.5 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=YKgWrovAAyKwXCZygjDa6eqtNhTxtwfa79aKsR8MAdo=; b=joRF7Ahs7zdmgy7uyQVhbGFLnBmiP738inKWtnlfhCh0vXlpHLkRKBYMoJrhwMjtVp Rhad3XypudUCXr05Isqp2Q0xDMNdHRsHocIq4yBjrYlwxMWdxbrfN5tlZNVXI1MzIXVR aKgt21qNdI+40mx7cXVSI90MbIKMx26WNRwgn5P0v3q2oVK+WWRlzDL/uMi6TzkXhqhL eCXEchMQnTCTVe4VEQCNhvE5GfGEAUStzUvLHpmwknZr+nAvPsUFjmRvvRoimOG24fXq 6Oa02z8DCb1le05Eu7GbjgleiOq5asy4JDlw7GTuYmleUGYsX3SnIshynoKwgxiNcr28 H50Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=YKgWrovAAyKwXCZygjDa6eqtNhTxtwfa79aKsR8MAdo=; b=j16ntzwoRKGbwEAPHyF4RBiZS/hXvQvOvy6yZKTChuzO7r9GpfPiNEUijQGqBDAU9z R6lclHlMsEUA52CuDDM5VWsINA1THNHJmrY5pQSY/1Fuy4kiNczdpoXy1EK6kEGLCcPE okDNwh54tdRZRZ+QlRJ4L40CQKYozcVeqy+LWc2Imm9OjVQvmqi8fPbXEvg/6yADzDGR xCJ0fRlmcBAguU1r5G3O85EM0e3n1drwsufPgdTYxJ4RnpGA1QD9EExlxQnAn3BCjxDq 2yJfAAnq9Vf5yYahl1/4B9bXKXFsGfVuapdoaiZxsHkY3GzsU4HgSCUYKqNEod0bSt6j +A2g== X-Gm-Message-State: AFqh2kodF+n59oX1Se1wZ2RDSdniU/D7joJ3UY66n87iFyYGAhsEhTPj 1hhbsizwyRzINqdg3dbco6Iw68GvZORZGL58 X-Google-Smtp-Source: AMrXdXtyAP/NaafhEOmha1ylJEjuV0DJVY8XF+p9rZCSU7eLadRi5l2tCNtgqYzYxynUC3ukyaXIvw== X-Received: by 2002:a0c:fa51:0:b0:535:90a:48c1 with SMTP id k17-20020a0cfa51000000b00535090a48c1mr4173524qvo.18.1673839555224; Sun, 15 Jan 2023 19:25:55 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:54 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:33 -0500 Message-Id: <20230116032544.1378-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (make-u-boot-package) [phases] : Add imx to the regexp of files considered for installation. --- (no changes since v1) gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 96dd65ae9d..b17f8b1a9f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -965,7 +965,7 @@ (define*-public (make-u-boot-package board triplet "sunxi-spl-with-ecc.bin" name)) (find-files "." - ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + ".*\\.(bin|efi|img|imx|spl|itb|dtb|rksd)$")) (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) From patchwork Mon Jan 16 03:25:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46182 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 777CE27BBED; Mon, 16 Jan 2023 03:28:25 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 BFD7627BBE9 for ; Mon, 16 Jan 2023 03:28:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9I-0000Eo-Nq; Sun, 15 Jan 2023 22:27:04 -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 1pHG9H-0000DL-Cs for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9H-0005p0-5B for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9H-0007sj-0a for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 03/13] gnu: u-boot: Reduce the number of native inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, U-Boot Mailing List , Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383956430085 (code B ref 60224); Mon, 16 Jan 2023 03:27:02 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:04 +0000 Received: from localhost ([127.0.0.1]:60049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007p5-CV for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:41675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8I-0007o5-55 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:02 -0500 Received: by mail-qv1-f47.google.com with SMTP id d13so18849201qvj.8 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Lo3qoBY7CBTH0Mo2rlMlePlK8rsfm21g2R4hc3L3CVU=; b=Kxkb+/FVIkg1ig4Zf6YbnsZPmg1tOPIM0V8lATm4IaquzLNtmoyNGmbeZmVsTMsmQk MN1Eqas+7OO2NkHExvnhBSAGWDckirNO7KEKYs1tFAno+OqgPJjID9lwbOfY8DA/rTvp hg6B1/XoGQfYyBBHAXA0dKjPC4uFms7pm69Fsqb5uwwEswyLUG55AgB+9fLv7Si4s2yJ hE7NDLVyBF56yc6F37Kwgcxu3My26Xa6xbZS63qaOkyd3V+A5fauzaHr0FMMwGF6SQc1 A5cmy7nYKlajI9M0Ab6JlthMXYJa15lLLsK22vP5G8ljJzPUNkNTGt5nzal4p88u7bkV 9cvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Lo3qoBY7CBTH0Mo2rlMlePlK8rsfm21g2R4hc3L3CVU=; b=J03zaaZbSwLMzBYUOV3lNLiNCkQoQeYvnEXQVmD40rx/XErkzyt94o1/N5mbWLmtoz dVfLN/ZSyG3U7gKvMZfMl6rNmsSICJAj1kAw95J8Ct/q6n5xqWlxFm+XKp41PvLyy4QY +QNPS2WxhspRr65RnkbHqYpmbCkd6iSAS+KzeCv4MAh3M3gFpEXjD6DgUBLio02lFRMZ KQVxCHJ5xUF0D/0+V2wA3xqjFgj2z8LIUpslLWT3Qcfic3dAnk6tCZ9W5w0UjTcwFKZK U533kP4HkNJ5Fz8CYitId/oEE51fawA8Y907lcv/GUIaPK+aG/ze6YFrIzzvAoaK5+CK CjXQ== X-Gm-Message-State: AFqh2kpZTVN0D4uS4aLOWHs0fTQfPwuTmnd2wTF1wPWQT5vwWz+N++xH 5NxCPPdpCauIbTNNWoRV98QPwnjdWI/i5HgC X-Google-Smtp-Source: AMrXdXu+QVtMpftQO0vOoVVdQw5Z67WrTTWDTjdvLAM5HkX6PapsW/piRZMHJUeAiRfklKQeA4N/tw== X-Received: by 2002:a05:6214:1186:b0:534:a801:112f with SMTP id t6-20020a056214118600b00534a801112fmr12630261qvv.46.1673839556635; Sun, 15 Jan 2023 19:25:56 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:56 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:34 -0500 Message-Id: <20230116032544.1378-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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 The extra python inputs are only needed for running the u-boot-test-tools test suite. This lowers the requirements for cross-building the various u-boot packages. * gnu/packages/bootloaders.scm (u-boot) [native-inputs]: Delete bc. Move python-coverage, python-pycryptodomex and python-pytest to... * gnu/packages/bootloaders.scm (u-boot-tools) [native-inputs]: ... here. --- Changes in v5: - New commit. gnu/packages/bootloaders.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b17f8b1a9f..7ec26dda05 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -662,8 +662,7 @@ (define u-boot "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h")))) (build-system gnu-build-system) (native-inputs - (list bc - bison + (list bison dtc gnutls flex @@ -672,9 +671,6 @@ (define u-boot perl pkg-config ;for 'make menuconfig' python - python-coverage - python-pycryptodomex - python-pytest swig (list util-linux "lib"))) (home-page "https://www.denx.de/wiki/U-Boot/") @@ -725,7 +721,7 @@ (define-public u-boot-tools (name "u-boot-tools") (native-inputs (modify-inputs (package-native-inputs u-boot) - (prepend sdl2))) + (prepend python-coverage python-pycryptodomex python-pytest sdl2))) (arguments `(#:make-flags '("HOSTCC=gcc") #:test-target "tcheck" From patchwork Mon Jan 16 03:25:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46171 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 EB91927BBEB; Mon, 16 Jan 2023 03:27:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 4623427BBE9 for ; Mon, 16 Jan 2023 03:27:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9J-0000FE-Is; Sun, 15 Jan 2023 22:27:05 -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 1pHG9H-0000Dh-RK for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9H-0005p7-JJ for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9H-0007sq-Bz for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 04/13] gnu: make-uboot-package: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957030127 (code B ref 60224); Mon, 16 Jan 2023 03:27:03 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:10 +0000 Received: from localhost ([127.0.0.1]:60056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8P-0007pp-OP for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:45624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8J-0007o7-FU for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:03 -0500 Received: by mail-qt1-f176.google.com with SMTP id h21so23615430qta.12 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=fv4ZwJnjOAMf+hgZd2D51OTW7vjya62HbX+G+hqzdfc=; b=Z7IiyBXePj3pZZj0maVOZ69/dqr0mYE3U2RsKYzH4Kdue6J1UxhTDRECwnir2FjgRw R+ALI9N2V4XSfsuB2lzMXqvSBdFC+zMU2O0UXm7L7Qs2FNXauO/AxF7ZEqxzHWSX04br /Rz/M1WPWTCdJ6AfujuoE+pPI2vfyddGor6YzQC+eqxWDyBJAeNUxQbs9pwZsJ+jGgt8 G9JWqtJh3SZnOMjCjh3S7ihAwKIDYW+P/UD6hjuMaf6UgdXJuni1ZzjRZtWV52lbLZWm Eu505voTJ2UQWtXJw9q3Cp6ixtNu4+0vtf+JAQ7U9eElQGP+qcFKasaJCLVpmR/Y9JfJ 9CeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fv4ZwJnjOAMf+hgZd2D51OTW7vjya62HbX+G+hqzdfc=; b=kGdFj6qTtr3TFpLDxkJurTAD7mx/mMH/VTHExmYs5S0HeEoN+0T6ZmqmtH2nNvIgVu rHIOOYBhLz0oerI+FdVExDM79DVaI2m45tXGA5gDVdBXMuNfSMGU76aOwOdQ7Xg6T8f5 LvGp9bIfCckqjkCVQxIFmOREfWrKEdf9+sYlATxsso+HXpRnC4UVpeB3LPHjptx25kc0 76AamAdOhLcF+K1CPDZA9wj3ZHZSmYWjnUuEvbG+QJ0E3L7LzKgFtGOZCQIj04xORjTW XSNZYfQZ+6igHsGva8Vo+8gg+xt2QSGufvmb7LsgJ1/V/qNN1Y2y4lScTTDO8nN2OkA+ QACQ== X-Gm-Message-State: AFqh2koywwLlna63+Bg/2+YWsG2wf7uQqhhIdOTVh1d/wDRwRe4LvJrM zFFTlXRb2gg8383QWjTUaiG62xsIMlkUJZvV X-Google-Smtp-Source: AMrXdXvq6VrkzjsGsUs0ErqLkTiwCMvrMzJOYfonHWLR+YGEgu7JJT4TFOIvrCCX1jeN8boaGf3rhg== X-Received: by 2002:a05:622a:5d93:b0:3ad:dd32:3410 with SMTP id fu19-20020a05622a5d9300b003addd323410mr31884674qtb.21.1673839557786; Sun, 15 Jan 2023 19:25:57 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:57 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:35 -0500 Message-Id: <20230116032544.1378-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (make-u-boot-package) : Rename procedure to 'native-build?'. [native-inputs]: Remove field. [arguments]: Specify the #:target argument, when not natively building. Adjust for the above renaming. --- Changes in v5: - Remove bogus comment Changes in v3: - Rename %current-target-system to %current-system in comment gnu/packages/bootloaders.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7ec26dda05..b7a31c8b48 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -863,9 +863,9 @@ (define*-public (make-u-boot-package board triplet NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is appended to the package description. U-BOOT can be used when a fork or a different version of U-Boot must be used." - (let ((same-arch? (lambda () - (string=? (%current-system) - (gnu-triplet->nix-system triplet))))) + (let ((native-build? (lambda () + (string=? (%current-system) + (gnu-triplet->nix-system triplet))))) (package (inherit u-boot) (name (string-append "u-boot-" @@ -876,16 +876,11 @@ (define*-public (make-u-boot-package board triplet (string-append (package-description u-boot) "\n\n" append-description) (package-description u-boot))) - (native-inputs - ;; Note: leave the native u-boot inputs first, so that a user can - ;; override the cross-gcc and cross-binutils packages. - `(,@(package-native-inputs u-boot) - ,@(if (not (same-arch?)) - `(("cross-gcc" ,(cross-gcc triplet)) - ("cross-binutils" ,(cross-binutils triplet))) - `()))) + (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments u-boot) + ((#:target _ #f) + (and (not (native-build?)) triplet)) ((#:modules modules '()) `((ice-9 ftw) (srfi srfi-1) @@ -902,7 +897,7 @@ (define*-public (make-u-boot-package board triplet ((#:make-flags make-flags '()) #~(list "HOSTCC=gcc" "KBUILD_VERBOSE=1" - #$@(if (not (same-arch?)) + #$@(if (not (native-build?)) (list (string-append "CROSS_COMPILE=" triplet "-")) '()) #$@make-flags)) From patchwork Mon Jan 16 03:25:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46173 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 BDF7A27BBED; Mon, 16 Jan 2023 03:27:33 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 9D25927BBE9 for ; Mon, 16 Jan 2023 03:27:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9J-0000FD-Ig; Sun, 15 Jan 2023 22:27:05 -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 1pHG9I-0000Ds-4E for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9H-0005pD-S6 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9H-0007sy-Nn for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 05/13] gnu: make-u-boot-package: Allow disabling cross-compilation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957030134 (code B ref 60224); Mon, 16 Jan 2023 03:27:03 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:10 +0000 Received: from localhost ([127.0.0.1]:60058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007ps-43 for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007oC-HK for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: by mail-qt1-f174.google.com with SMTP id x5so141572qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=T5bQAegduhe4oEmuLD2FMzTnHuj2YUiICLA9RIA2tSdfBLoGpQVHGamKCGw0QNYpuP /HXfEeTyiCDzH8XQ7OAGjh3dDQO1gbB38RTXeQm0tsClwpFVb1YyeAJmwzTTircRUGIR 21enXvfviTAzlioD0luiGxEQtc8oEYWbAQo727jStEhKPLrPULRsvBRjY2fn/VWCok0k JrTPAQSa0mwGO1kN6jtGAkQwGAu836/UGRg4O6HhKcs9XReZgTp+lQ9efGGbYA7I7EED q6Gq9FArRI6Atgle7bybExNkFBajMDwFdewH3v0d4GINQxHU7amebqChxg4WxwtGEkMW kGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=bF6Xa1dwZ+m96irZLVMITyd61UclJDakjckcA03KEVQPjLxjlRRxn4er4RdyzK6cvD 7dDBTusP+TnlCbRASCXPEV5g1HRneUAL1GYV5VWj6UqAg7vINJFNrFcCyAs8az598mdV LMOMfmiizI/dGw97ghnRHy+dcTblOsR9nb7/RxyQVHOXUrbaAiJJJimhydlC0LOL9hFB yVkitb05ZTQfJ+wL4w9pynDny74eGeGAbsxgbVc/49VwRvRLGFg6XVyCYy+Xfpj6YbND Jtz43pdBtvV4XHL6Aww/racZ+eeDGD/YLGW0Yr/QjZcoezMOs85MqCF0zmmMe3wUZTxX QnKw== X-Gm-Message-State: AFqh2kqRLQ8QEFDFju/yYUT+VcQPSvhOp/VaiCJDTi3R3mzaz7gP+SuQ 0ZCx7F08ZaIA6QUzLPk+vdUFWBgTitzO5KZn X-Google-Smtp-Source: AMrXdXvuzz93hjOFMAfpcj1ku71hQ+nSzvsOh1k9aZ2s5fZ1n1NnIxe+DbE2EA2XjkBlUae1NK/iiQ== X-Received: by 2002:ac8:7766:0:b0:3a5:f9cb:886f with SMTP id h6-20020ac87766000000b003a5f9cb886fmr118465442qtu.29.1673839558996; Sun, 15 Jan 2023 19:25:58 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:58 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:36 -0500 Message-Id: <20230116032544.1378-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (make-u-boot-package): Accept #f for the TRIPLET argument to disable cross-compilation. Update doc. --- (no changes since v1) gnu/packages/bootloaders.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b7a31c8b48..290d832a83 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,12 +860,14 @@ (define*-public (make-u-boot-package board triplet (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. -NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description. U-BOOT can be used when a fork or a -different version of U-Boot must be used." +TRIPLET may also be set to #f to disable cross-compilation. NAME-SUFFIX is +appended to the package name, while APPEND-DESCRIPTION is appended to the +package description. U-BOOT can be used when a fork or a different version of +U-Boot must be used." (let ((native-build? (lambda () - (string=? (%current-system) - (gnu-triplet->nix-system triplet))))) + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) (name (string-append "u-boot-" From patchwork Mon Jan 16 03:25:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46176 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 14AE527BBE9; Mon, 16 Jan 2023 03:28:09 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 D782B27BBEB for ; Mon, 16 Jan 2023 03:28:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9J-0000FS-Qg; Sun, 15 Jan 2023 22:27:05 -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 1pHG9I-0000EU-I9 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9I-0005pK-A8 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9I-0007t5-66 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 06/13] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957130142 (code B ref 60224); Mon, 16 Jan 2023 03:27:04 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:11 +0000 Received: from localhost ([127.0.0.1]:60060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pz-EE for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:41483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8L-0007oE-N0 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:06 -0500 Received: by mail-qt1-f178.google.com with SMTP id d16so10793465qtw.8 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=edUwSHd0rBjUJZnp3zvmryDuuwufJYQVfYslim3QNooe/ZQzI2dpB0AIpAwAfL1O9N 8Qa7oUBFDh6jePjWPpGttz7JJ7FbHKcuDXLbgbez6VfhVUNP1VhuKoix+jHQfA5spp6u GAgaDdXJ0I7gv5MP2T/BngZ/p5+F7SGDwF/BZoV/HA7SWnaBH6CR/5/IZ3WvjOOMVUvR 4/WQrbrBI5G3ZwzwF84K2HgMCFJntnHxhgwefF68rpjNuA6hmEWRPmBi+aAG3RMq7a83 g3juvZaORXGRm3gg0icbPMmO3MJNSkgLHOm79/4zgGgxr04NGABElpF3zCK6Iuuwis5r SxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=uaVCg19TjhZNjaX7r7tfVvT9mcGlohZ0quRFeFuFdnxFnyN4hZoSdS7S4rap6vepay NSfs4vAJHoq/US8zmAThhX2gqB7LwC4l8JE4Em3GQSZTfYN9kJC4RG/1q3v2cmaXLK5K fY8eFgtml2rTpplfRqW9zKzrf4uRuQmyZvZ0TY7hFl29JP3XHX7VPrD9b71w/6X6vu6D NBnZEqU7KQPx9ANEaKErUw/m7rxKfM9kr/DSHujqWtFnwwCUb0OiY9m2mQ/TfToCmtg/ zHzJGJcKvuqwjTEQjfet6i5NgRRwIBUjvnkGqbXZUpznWU2yTqv0lZLUYkBoqAogXlxz r4wQ== X-Gm-Message-State: AFqh2kr3DUnI8GlgfrNw36RnHrSJXw8mrqjBv+49ea0f4IZCyCAIZnMr QdrR+x0jFBZm5Tof79MOxvDQOm5fanmOXxW7 X-Google-Smtp-Source: AMrXdXumFSijtXxSuvNVGfLWPyv774Zd9nXX5qmCPsXFHUolCXcKI8RWjaJvlzZOVvooLfpl7vHZFA== X-Received: by 2002:a05:622a:1cc6:b0:3b6:33c6:c5ac with SMTP id bc6-20020a05622a1cc600b003b633c6c5acmr1704254qtb.4.1673839560161; Sun, 15 Jan 2023 19:26:00 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:59 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:37 -0500 Message-Id: <20230116032544.1378-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 290d832a83..f3b3c91c47 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1221,17 +1221,16 @@ (define-public u-boot-pinebook-pro-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define*-public (make-u-boot-bin-package u-boot-package #:key From patchwork Mon Jan 16 03:25:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46179 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 4A8A727BBE9; Mon, 16 Jan 2023 03:28:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 AC46027BBEB for ; Mon, 16 Jan 2023 03:28:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9K-0000G0-29; Sun, 15 Jan 2023 22:27:06 -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 1pHG9I-0000F2-VN for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9I-0005pQ-Nn for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9I-0007tH-JN for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 07/13] gnu: u-boot-firefly-rk3399: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957130156 (code B ref 60224); Mon, 16 Jan 2023 03:27:04 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:11 +0000 Received: from localhost ([127.0.0.1]:60063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007q7-TW for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:43000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8M-0007oV-UI for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:07 -0500 Received: by mail-qv1-f50.google.com with SMTP id m12so16808712qvt.9 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=eJYkrzbhk5UlVeNZRItupK2j2gjt0HssIe28NJUKqqOCresPzu3SoBvs8hlxb7+ane rMEgMU3WLLKVWUFBFYk/F87wyS7/qZubTlSsSFwQO+LdFCA7cjss1P9evwWKKhKIDBAM xFJXYqhRsCyHA3M18C2y7BrT/OmdKCi2VeZptF/C3SjA1QWUMfTDMcFS1eRSg4Wn/E4S RARiO25KoITjlaIfoGxfjg+kATV0xaJQCmEAoEp84y4wOXLYmg+C1sUST7UwWOpy2hfK tVwB1+l4XmowCYvbiEPfjVHKJPxHnqUKFFDAs0SEyRnGDuWJT/GmC9l8BuRHMG8YRk1J 43VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=ZHFz2FD1y3J0GoMv2TipWZ8iANMfejo0cLtlUb/Kyx6ESMDnwzUbqNhMjjdlY/u0JG qVAyOwb6w0k/wvSEFLLvYWomvzqnoqGb6DteOQTb/xpgjdUy+j6uB25VAIOloWWp9M8h qiy8YQ0kSnid872MqxHpvwnjM/xe6FmZVFVdB0VJ9sGnDApQRabXJE8O/Ef+khB75UY3 bIo9qBbCda+9Ar43mm086Sofc1v+W7J/scSnq5yjW9RXByvZ2tYIkSnsuXe+/f3lLt3K Z4Xq6duPweUgx61+kldIwgikYehfCgdVbLUQod++ZQeLeg08sCKkkDL7x7YSVzILW2bt dbGw== X-Gm-Message-State: AFqh2koYx1kMjGkpFmLfVH+Z8W9rpkkheQX7MKI7Spp8EY4nrFlcuHZ7 vCUKERZtrcSsKlzGMvr+exnbdKcbcxpaWeUC X-Google-Smtp-Source: AMrXdXslG+/1c9z6qY5F+H6T2XZAaiFJe1qEWQygfyS9i3FaRvv6Hlyj7Utk1Vvu4OOIwuiq79iY/A== X-Received: by 2002:a05:6214:11a6:b0:534:1d7d:a290 with SMTP id u6-20020a05621411a600b005341d7da290mr30057334qvv.36.1673839561322; Sun, 15 Jan 2023 19:26:01 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:01 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:38 -0500 Message-Id: <20230116032544.1378-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f3b3c91c47..624a832802 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1156,16 +1156,16 @@ (define-public u-boot-firefly-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu" From patchwork Mon Jan 16 03:25:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46177 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 576BE27BBF0; Mon, 16 Jan 2023 03:28:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 D9FA527BBEB for ; Mon, 16 Jan 2023 03:28:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9K-0000Gk-W4; Sun, 15 Jan 2023 22:27:07 -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 1pHG9J-0000FB-E9 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9J-0005pX-6V for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9J-0007tP-1m for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957230163 (code B ref 60224); Mon, 16 Jan 2023 03:27:05 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:12 +0000 Received: from localhost ([127.0.0.1]:60065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qL-GV for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:36861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8O-0007ov-4a for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:08 -0500 Received: by mail-qt1-f175.google.com with SMTP id x5so141647qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=iyNZ6efkx35AlTxuruZFSsO+E3lznjrq+SiZurr5ikUtrGLiPyGnh8mWd13Dm9/KQ1 LudFQ4vUJMXGN6uRhfaAyeRD3NGLP7wvOrPnTClGErYsN3unpFSUO/6JTF3q4RHEN/LQ m4xeL3XYcmHe90cBLTeKjR2vUI6qCi9kaTstACkZLfzE38u6uZTYrzXqw0bchGIf5KcX Qq1EDHwsBJ8gaV7hzqvw0y33T32STvyRA3cpLKQtPQSKib7WeVbzm2NHCnGB1ltyw6xN aL1Ht/k7OYgnQbfwIsx4rcp6mVqh+Bn3xcIH4EwoC9QJcWITB34i74WuzxF7i9nPNRvw IPvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=nBlG8B3rXEfBgoq77V6B35jwLE7Rgu7Nuunxr/oiL/304+h+tyL0dTOpxsK6oCl3fc jXQ50ZsqdoyMSwdMk1Lv4kYLw2q6xLJL8IiXK9jmUwoLQxHd6+GiDKShFpAJMQT7C+Rh kGXAvHPbafKJPGlOo1xu/kxE3GnqN72JMR3DVAGbJ30jOKAd/+pDcWxInZGRZZLNr8HV utt+z1JtsDis6x22FJaIvGmlKu+gN/kSC5lGMDY4RiKjcLqNlr6zOQ8RSGUM7WTuzuiL WjziiATl/sUJQVT3CPvORg41CdQfdMWzGoBp+xd4hBguSXg83+B86lHfz9ORux4nxGoN 1CVA== X-Gm-Message-State: AFqh2krbBvw4iC51A7jb6ElprdGpviOIj3CKeULYfCzggtyq9tY6tBff 4B6tlOjmL0WLBddkn08Bqta7r8ZY7+5MK7BA X-Google-Smtp-Source: AMrXdXs6Lk+NcKwdbrYgK7V4DZpLJYgimoFYQsoICIdY9c49C9QzVJhHfkbZlAMbWCjr8jhS2VKITg== X-Received: by 2002:ac8:4cc8:0:b0:3a8:e528:dab5 with SMTP id l8-20020ac84cc8000000b003a8e528dab5mr99625670qtv.0.1673839562525; Sun, 15 Jan 2023 19:26:02 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:02 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:39 -0500 Message-Id: <20230116032544.1378-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (make-u-boot-sunxi64-package) [native-inputs]: Turn into... [inputs]: ... this. --- Changes in v5: - Fix commit message Changes in v4: - Revert erroneously replaced firmware package - Revert bl31.bin -> bl31.elf change caused by the above - Make the arm-trusted-firmware-sun50i-a64 a host input gnu/packages/bootloaders.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 624a832802..53e6557ac7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1001,17 +1001,13 @@ (define*-public (make-u-boot-sunxi64-package board triplet (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((bl31 - (string-append - (assoc-ref (or native-inputs inputs) "firmware") - "/bl31.bin"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-sun50i-a64)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) From patchwork Mon Jan 16 03:25:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46178 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 EB18527BBEB; Mon, 16 Jan 2023 03:28:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 3B7D427BBED for ; Mon, 16 Jan 2023 03:28:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9L-0000HZ-Qo; Sun, 15 Jan 2023 22:27:07 -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 1pHG9J-0000Fa-T0 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9J-0005pd-LJ for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9J-0007tW-GY for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383957230170 (code B ref 60224); Mon, 16 Jan 2023 03:27:05 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:12 +0000 Received: from localhost ([127.0.0.1]:60067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qS-RI for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8P-0007p3-Aa for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:09 -0500 Received: by mail-qv1-f51.google.com with SMTP id y8so18846946qvn.11 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=REutzbTResn2mreTbezE632ZghhpgMN7sFJjABPrdVBfFfqVJJO6MQ4wMUm0lY170X seLbiJWFygcjBBnrxgtrU9VaGZZiU8Zpi6kEQnQoQFXpc945DUDy/A+EkE8fPsP2Tqoh /ZfQTjO1Xn0kFyqPe5HpwkHKnv7UNW2IZOu/JfWS63mjD+R47jxDNA5Y+hBpyqOCXMbe PsluKbpNrJqPCSBj5YHlmxr9iSupRbMj7/tOZc5GP43RS2plXD8+Wkk5GwKD/r9kaihA uaqwuhMIrsMe9yZadd9DYglDPxO7WryH2yvTQnSsrEHMCnfdXdZnnNg/6aRMP526vsgZ ZYJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=bCT8r+tJYwCB803k/1FqHR+uku7eFoy84IL5vzT1HHZAt0HRxuWNVPd97kEtF4gLwN 4QOCuq6VVYTGKlipGYmqzo8IRR8AE60sHsuZK6DiiHimX2Y8tpakhTxgeN/tmA5JDsGS FoYgjGynhhxlnVolEGMnNoGJ0QEOpseV4NDtlaUOyiszrLhUrZmUvHjzb6rsfK2HYcQk 8YaeqFYOpIgGVdo0mZOCpgtRO+3QE7cDkalEGzfqm8wXN1jXebsRo47cIzhlLfvxEiY9 OvtxdUtkoTNZyjXdlBZzPdwOHRDassoY6BNo3aiVNuTsynSTyx3TRsoDWM2VSeW9Bqll BceA== X-Gm-Message-State: AFqh2kqshfzepQiJWtEgBXtxXl5ghguhZVtyz/XFcbBQOlTsg867sp8d BXYidrfIe+bhRrAqn9i+aDfSKTBb3m4xeWAI X-Google-Smtp-Source: AMrXdXsaVZQ8n4E2tHcv/a3ebALoLKcgbMpDW3pJFd1mzvfk7gBJ5KqBjBuNsy1Xbaxk7EZQ9+tcIw== X-Received: by 2002:ad4:4bc3:0:b0:4ca:28e3:27a2 with SMTP id l3-20020ad44bc3000000b004ca28e327a2mr117149146qvw.49.1673839563772; Sun, 15 Jan 2023 19:26:03 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:03 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:40 -0500 Message-Id: <20230116032544.1378-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [native-inputs]: Remove input labels and use modify-inputs, and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Make arm-trusted-firmware-rk3328 a regular input gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 53e6557ac7..64af453844 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1136,14 +1136,13 @@ (define-public u-boot-rock64-rk3328 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (search-input-file inputs "/bl31.elf"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu"))) From patchwork Mon Jan 16 03:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46175 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 1782427BBEE; Mon, 16 Jan 2023 03:28:08 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 9748D27BBE9 for ; Mon, 16 Jan 2023 03:28:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9N-0000I7-IV; Sun, 15 Jan 2023 22:27: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 1pHG9K-0000GO-Ak for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9K-0005pk-3I for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9J-0007te-VA for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 10/13] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383958230206 (code B ref 60224); Mon, 16 Jan 2023 03:27:05 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:22 +0000 Received: from localhost ([127.0.0.1]:60072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r7-Bf for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:22 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:43808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pN-Fw for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: by mail-qv1-f53.google.com with SMTP id q10so18842052qvt.10 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=nrVQPO5ttOHtEXwtGnQdK/dAFHiI50WGT/XeKwQ3iruxNgvYs9s/7kZqpML7r3Bzqo cAiBAcKNAaBmV4itCg19lUgbgJoQ9gdrec5W5xVwPBM9xpjDVCY19bf5EIyhX/miuimf Ka49x0Rxvp2zXiqBHiE4r7rXv4fqdTBkDZz9xnzS9/tIzIzDjBBoXq5qGymEJsd14jBm nh+5Df+Vow7Cb78/UDGZBoEwBcRW7Le3Y+CEnHIaMALM2v8IOVFsoV5mbfRPiC5W1uvy VBDhParB85ex7FKqWoZcm1xI258NXronKtYBiGUuwU/bJ3k/oj3roycMg6JYjcoZCeCl L5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=ZajWq5gUHzginDWHpDYIvs/J9e7WMytO0Gojnl0Pvorekn5h8LO425iIKgCe+ojDBj 4p18BrFWbocVWi5KEcYd9/I1G7hrVgEg0hvNRPQq0vvhYUeCVYqcTeOF0NmBMNwdTA4y G1Ig66CntI+c/AbOydI3Esp3hxJfgR4DhvpifrEMKTKTC13GM3aEAR1WpE6egsyXv8Qa 1cmS2XeTIBbK/7bjGGa5zrVWgHGcKsUOVp+0Ef++T5/7tkYLWrEEEm5S4aY9qS1Q8IeM gZDHTkd7wr5xhpwR99pFq2iCiECs7c6ius+4sXHwF/GO3jtnaCqHBDHbX78Y9elS1tXR wWCQ== X-Gm-Message-State: AFqh2korX8Phdf6lE8cV0r9p0iTkFZ0UG6cOA/t3d7gFqdMAdU7tu5gP Bz2nbjFISk5H40FYxyhQzhMoeifSsw7DPnlO X-Google-Smtp-Source: AMrXdXvyfsDc3vV1tB6XjRVX2DLfRz+Vpz5V5p8Tn3/JNpgqGOkRI8WumwOsC0sO8rsuA8gJlspaQg== X-Received: by 2002:a0c:f688:0:b0:532:d40:1eb0 with SMTP id p8-20020a0cf688000000b005320d401eb0mr59972966qvn.30.1673839564926; Sun, 15 Jan 2023 19:26:04 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:04 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:41 -0500 Message-Id: <20230116032544.1378-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-sifive-unmatched) [arguments]: Use gexps. Use search-input-file. [inputs]: Remove labels. Use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 64af453844..d9f9672f77 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1119,15 +1119,14 @@ (define-public u-boot-sifive-unmatched (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((opensbi (string-append (assoc-ref inputs "firmware") - "/fw_dynamic.bin"))) - (setenv "OPENSBI" opensbi)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "OPENSBI" (search-input-file inputs + "fw_dynamic.bin")))))))) (inputs - `(("firmware" ,opensbi-generic) - ,@(package-inputs base)))))) + (modify-inputs (package-inputs base) + (append opensbi-generic)))))) (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) From patchwork Mon Jan 16 03:25:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46172 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 7F3F327BBED; Mon, 16 Jan 2023 03:27:27 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 581AC27BBE9 for ; Mon, 16 Jan 2023 03:27:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9M-0000Hp-CU; Sun, 15 Jan 2023 22:27:08 -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 1pHG9K-0000Gg-PG for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9K-0005pq-HL for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9K-0007tr-DU for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 11/13] gnu: u-boot-rockpro64-rk3399: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383958330214 (code B ref 60224); Mon, 16 Jan 2023 03:27:06 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:23 +0000 Received: from localhost ([127.0.0.1]:60074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r9-Lu for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:40926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007pV-Sm for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: by mail-qt1-f181.google.com with SMTP id jr10so16467155qtb.7 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=H83keKuAa2FPPWfrbAc1skM2WrNQw4IhLvJ8FWIfXTC+A8VGS5fdjDI4tpV9jjeOiU Ol0JPThdel8KgZ8OCf5NlrqXUxOzQVJ24wt6EsxQQTXFxxyi3ycz4VFNj4E8HxA7aso3 P+uHt5LJrDCnY1j+jxIQAjsufSO6e1BHxRpYFmzld6s9MSOfAx9QLZUzLIqxHUGDQ8xw eMbAFteUEueDu7ZTq2fvdEpnacLGV2pLTLDYNchsxsbsI3WQmf+J4iLlso0udH/VC2rj bTK3q7vivQOz7NQdsF6Z1MeHw1p/erNpxDfya0hc9ime6LPHrToMH0ZihCS4uB9hbBSw AjUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=BdPKKJIJLM0XcDbvv59H7Dq/D0Tx1iz6W48zvZvijMqvYrsOAcGwVZzuG0NCzQGN0+ l9PYkhntEdI1oLZJ2Rf/NRtD9U75hmyWVVK6OPg49W+MRASbGphXXMAfvdUwPImdWIwN 92omqTkPfO9RdT5q+qWjLaEH/z54rwBJg5ouDLD1NZ/Q8K6JRdDuQ1/9bqnXZLayms/6 ePQU5rkjFWIO7oJmAHfkbig87Yv0xJrMGQgA4JqZTnIC8UMvpRjNzTIcQZlgP04uqFWj F5E7GS8inpHM9IBDw1CdWEkCn3QBHsQN3jg5BU7qzXRRxi5HCdewMqSiVwmj73mW/9mG lVJQ== X-Gm-Message-State: AFqh2kpdrLDal8X5DR4Bv6l3AgZ5KsOmchhFJU3H1GV+ptug++5PKDvF u76fh5WlepZUPEOJBXtTqwsZDNkpSib61NPz X-Google-Smtp-Source: AMrXdXsePiM4Qim3RNDO8xjTSytg37d9YpC6qMlNUn6cSdU2v1ni3guU1vgQ3bUrsZOtwVY6R/L0NQ== X-Received: by 2002:ac8:73da:0:b0:3b6:2f46:937c with SMTP id v26-20020ac873da000000b003b62f46937cmr4858298qtp.37.1673839566192; Sun, 15 Jan 2023 19:26:06 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:05 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:42 -0500 Message-Id: <20230116032544.1378-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Make the arm-trusted-firmware-rk3399 a regular input gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d9f9672f77..9da97232ea 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1176,37 +1176,36 @@ (define-public u-boot-rockpro64-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - (add-after 'unpack 'patch-header - (lambda _ - (substitute* "include/config_distro_bootcmd.h" - (("\"scsi_need_init=false") - "\"setenv scsi_need_init false") - (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") - "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) - (substitute* "include/configs/rockchip-common.h" - (("#define BOOT_TARGET_DEVICES\\(func\\)") - " + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + (add-after 'unpack 'patch-header + (lambda _ + (substitute* "include/config_distro_bootcmd.h" + (("\"scsi_need_init=false") + "\"setenv scsi_need_init false") + (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") + "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) + (substitute* "include/configs/rockchip-common.h" + (("#define BOOT_TARGET_DEVICES\\(func\\)") + " #if CONFIG_IS_ENABLED(CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func) #endif #define BOOT_TARGET_DEVICES(func)") - (("BOOT_TARGET_NVME\\(func\\) \\\\") - "\ + (("BOOT_TARGET_NVME\\(func\\) \\\\") + "\ BOOT_TARGET_NVME(func) \\ BOOT_TARGET_SCSI(func) \\")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) From patchwork Mon Jan 16 03:25:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46181 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 3561727BBE9; Mon, 16 Jan 2023 03:28:22 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 B34C727BBEB for ; Mon, 16 Jan 2023 03:28:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9M-0000Hf-6j; Sun, 15 Jan 2023 22:27:08 -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 1pHG9L-0000Gt-4m for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9K-0005pw-Tt for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9K-0007tz-Q7 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 12/13] gnu: make-arm-trusted-firmware: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383958330223 (code B ref 60224); Mon, 16 Jan 2023 03:27:06 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:23 +0000 Received: from localhost ([127.0.0.1]:60076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8d-0007rI-2n for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:46818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8T-0007pc-34 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:13 -0500 Received: by mail-qv1-f42.google.com with SMTP id p96so6779751qvp.13 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=KnVnQzOCLcdDgRhzVY9QmrfHk/ZdBqjvbOlC3jMiHEE=; b=VskrAZVAZMnDYe0H7HU5t9SDDEni0BR5jRFmpDrdnAPijMYq1BlVvoxa2X2/HCcRZh hVNYh5+CY5B0f8SdK+YlSjsN2f5l6anLZN5bdJtiAWH/g/Hn4nnTQrIgvF/ocC9sV3K1 fvbiLMxPopqB7m70yVTUoQgeihCR4z6JZyzIYeEyBQsX9kKYAI8RPIrh+GUjLSk1jldi 1YjIk0gyes/hgwc2aOI/WC9wH0igqY7FLelW/FoE86UsEj1W/Fuine+IdUs1LV3uhba1 /MIDEM1Fyd1u6b4VNwtNy98kVUzQqr5FGWBKzDkUGqMBGyv1I7GaJwEz6Wc5e3v8aE/F 22qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KnVnQzOCLcdDgRhzVY9QmrfHk/ZdBqjvbOlC3jMiHEE=; b=lTcc9gxPG066pWZ9Jfv9fV/EjdfH+cEQu15vpOzbQNucIapQ+X1CJpX35uUMxO53St Zfqv8qEGk0JBbbqfZji7c8vpIgLaJjIqtCGxUIlA/0kCAIiz7jmSKYb5pGIi+ejjDvCo GPZkV5+nZ6T5M9yH0FVYb0Jasv1T5LASVHY5K1oG8iyWm7fsYL2UvjEMqb8ZRqhQZGV6 srfsQG/B8p4QaMbbaeHDEy5QvngNG1Ca3fC/5ZOwZn1x3CU2FQo1tqRPJxa5nTLFRTow Y2Vy+jk73UnuIr3t+m2VUUqXePrv4aYXj5PbZeCcuwmEv4BQXOix/cqEiwBXD/uzapa3 OPtQ== X-Gm-Message-State: AFqh2ko6stpFe/8UQZl3UF40g6uJcuCFsi0UqrFZLKBsGMX1n97IAhoS v3muZ2Jcwqsmfu3iXqRbsMRuHFqlAX6tpLB7 X-Google-Smtp-Source: AMrXdXv0YHORfVdjZN8MPWF4mjZyLihtH1108fGzOWbs7+nvuSZ7ZdJRae8o3/wVExbGWuTaVaAliw== X-Received: by 2002:ad4:4a0d:0:b0:4c7:595c:9940 with SMTP id m13-20020ad44a0d000000b004c7595c9940mr110672699qvz.51.1673839567446; Sun, 15 Jan 2023 19:26:07 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:07 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:43 -0500 Message-Id: <20230116032544.1378-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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 Reuse knowledge from recent U-Boot modifications to streamline the package definition. * gnu/packages/firmware.scm (make-arm-trusted-firmware): Change optional argument ARCH to keyword TRIPLET. Default to aarch64-linux-gnu. [arguments]: Use gexps. Add a #:target argument. Streamline how the CROSS_COMPILE make flag is computed. [native-inputs]: Delete field. --- (no changes since v4) Changes in v4: - New commit gnu/packages/firmware.scm | 116 +++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 64 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index b6ee4c0565..029e84d5c2 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020, 2021, 2022 Marius Bakke ;;; Copyright © 2021 Petr Hodina -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -944,70 +944,58 @@ (define-public ovmf-arm (string-append fmw "/ovmf_arm.bin"))))))))) (supported-systems %supported-systems))) -(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) - (package - (name (string-append "arm-trusted-firmware-" platform)) - (version "2.8") - (source - (origin - (method git-fetch) - (uri (git-reference +(define* (make-arm-trusted-firmware platform + #:key (triplet "aarch64-linux-gnu")) + (let ((native-build? (lambda () + ;; Note: %current-system is a *triplet*, unlike its + ;; name would suggest. + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) + (package + (name (string-append "arm-trusted-firmware-" platform)) + (version "2.8") + (source + (origin + (method git-fetch) + (uri (git-reference ;; There are only GitHub generated release snapshots. (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") (commit (string-append "v" version)))) - (file-name (git-file-name "arm-trusted-firmware" version)) - (sha256 - (base32 - "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) - (snippet - #~(begin - (use-modules (guix build utils)) - ;; Remove binary blobs which do not contain source or proper license. - (for-each (lambda (file) - (delete-file file)) - (find-files "." "\\.bin$")))))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (find-files "." "\\.(bin|elf)$"))) - (for-each - (lambda (file) - (install-file file out)) - bin))))) - #:make-flags (list (string-append "PLAT=" ,platform) - ,@(if (and (not (string-prefix? "aarch64" - (%current-system))) - (string-prefix? "aarch64" arch)) - `("CROSS_COMPILE=aarch64-linux-gnu-") - '()) - ,@(if (and (not (string-prefix? "armhf" - (%current-system))) - (string-prefix? "armhf" arch)) - `("CROSS_COMPILE=arm-linux-gnueabihf-") - '()) - "DEBUG=1") - #:tests? #f)) ; no tests - (native-inputs - (let ((system (%current-system))) - (cond - ((and (not (string-prefix? "aarch64" system)) - (string-prefix? "aarch64" arch)) - (list (cross-gcc "aarch64-linux-gnu") - (cross-binutils "aarch64-linux-gnu"))) - ((and (not (string-prefix? "armhf" system)) - (string-prefix? "armhf" arch)) - (list (cross-gcc "arm-linux-gnueabihf") - (cross-binutils "arm-linux-gnueabihf"))) - (else '())))) - (home-page "https://www.trustedfirmware.org/") - (synopsis "Implementation of \"secure world software\"") - (description - "ARM Trusted Firmware provides a reference implementation of secure world + (file-name (git-file-name "arm-trusted-firmware" version)) + (sha256 + (base32 + "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Remove binary blobs which do not contain source or proper + ;; license. + (for-each (lambda (file) + (delete-file file)) + (find-files "." "\\.bin$")))))) + (build-system gnu-build-system) + (arguments + (list + #:target (and (not (native-build?)) triplet) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install + (lambda _ + (for-each (lambda (file) + (install-file file #$output)) + (find-files "." "\\.(bin|elf)$"))))) + #:make-flags #~(list (string-append "PLAT=" #$platform) + #$@(if (not (native-build?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + "DEBUG=1") + #:tests? #f)) ;no test suite + (home-page "https://www.trustedfirmware.org/") + (synopsis "Implementation of \"secure world software\"") + (description + "ARM Trusted Firmware provides a reference implementation of secure world software for ARMv7A and ARMv8-A, including a Secure Monitor executing at @dfn{Exception Level 3} (EL3). It implements various ARM interface standards, such as: @@ -1018,8 +1006,8 @@ (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) @item System Control and Management Interface @item Software Delegated Exception Interface (SDEI) @end enumerate\n") - (license (list license:bsd-3 - license:bsd-2)))) ; libfdt + (license (list license:bsd-3 + license:bsd-2))))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64"))) From patchwork Mon Jan 16 03:25:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46174 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 DDCAD27BBE9; Mon, 16 Jan 2023 03:27:53 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 686BB27BBEB for ; Mon, 16 Jan 2023 03:27:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9O-0000IP-2e; Sun, 15 Jan 2023 22:27:10 -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 1pHG9L-0000HU-IE for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9L-0005q5-Az for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9L-0007u7-6n for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 13/13] gnu: u-boot-puma-rk3399: Use gexps and fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383958430229 (code B ref 60224); Mon, 16 Jan 2023 03:27:07 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:24 +0000 Received: from localhost ([127.0.0.1]:60078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8d-0007rQ-MU for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8U-0007pj-6l for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:14 -0500 Received: by mail-qv1-f49.google.com with SMTP id p96so6779765qvp.13 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=qK73+VxovCkgLYsmV1tyK7vMRXNosM2JyzNnvE+8wocNa0nVEnK1PuG9SmzSbdtqga thCfoE9TdbwLRcYSZAbwLq38BvqGoibFoZboLIgM8fDrx3YbUK/hLC0xqGKAM/f1wLqC RJhaUwQ2+tXNiE9rWXqZIykJkU8unVNycUBhUmpkCuncViMYeL3eDeU4aWO+TyKLGFgC VqzoiNkvg4B8+GfEIikQNI3QrTPtLfIfGJQbX45fDdnbbKCGlpnSLekf1PVboV6v3ddT 565YB4IiwjQZaxEVTdAZ1TCfD56iVWMAjBfVhQJ3OFGPRPJ+/YqW1K0wnbLUqhfq0qyf R7Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=cX81U/4BrFq4a88+r9XsYfjE43CiZirCMl6Fu8SECZUwQ9b7LNUUKB1pnloQu63pv4 /ogKf31a5qvKIjqAea7n/FDvrD2sOWqWRvnjd2WAi5FfESas5hQkXB0X46aiSfcHdo6J OqstvZjMNElWYscftQj/tEFPKdr20T6lrvoEGUDKmxl1VTW1Tp73efjyL48KNRrs9XLL t8auEeqVXiUDlb2HnokZlhs4thIdRtCQAi7veelNsBmxAjFkDIkgw+9s2xARjnzAj78V rhXvP2YMZYc0Q8wfYG0qf1SCmluNgWtWT+FcyZT+QWXkjt3twWXZsuql/r9unFLFkVv6 Edgg== X-Gm-Message-State: AFqh2koCUJgw3rLW8GxBU0uaZ+g1bizyEOs08v6loUXLDAckfIqQAfIj mBbWykNufL7ZUAWfx+u3wBOR6N484URCe8U1 X-Google-Smtp-Source: AMrXdXs1QkRkKNDBBdhVH/QW17qep1FO+jwEIyUK1JDXrZaL6sZRUyH2SGLYxP71G+iADLkz0OJPBA== X-Received: by 2002:ad4:5308:0:b0:532:25ce:8ae0 with SMTP id y8-20020ad45308000000b0053225ce8ae0mr45703373qvr.10.1673839568597; Sun, 15 Jan 2023 19:26:08 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:08 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:44 -0500 Message-Id: <20230116032544.1378-13-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> 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: , 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/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- (no changes since v4) Changes in v4: - New commit gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9da97232ea..4cf6a74022 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1091,17 +1091,16 @@ (define-public u-boot-puma-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))