From patchwork Mon Jan 2 00:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45787 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 824C227BBE9; Mon, 2 Jan 2023 00:47:36 +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 8A25327BBED for ; Mon, 2 Jan 2023 00:47:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yn-0001r6-KT; Sun, 01 Jan 2023 19:47: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 1pC8yl-0001qV-Ta for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yl-0004WQ-F6 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007Gn-9k for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 01/11] 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, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262041827872 (code B ref 60224); Mon, 02 Jan 2023 00:47:03 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:46:58 +0000 Received: from localhost ([127.0.0.1]:42060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yf-0007FG-Kg for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:58 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:42720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yd-0007Eq-Rw for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:57 -0500 Received: by mail-qt1-f171.google.com with SMTP id i20so21467545qtw.9 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:55 -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=aoaP4N09+ZK7r2QCQIrxaE8IUHQ+3Y1+30O+DuSUUnc=; b=hmeZt3bLmydvmMs9I2XceyaiRtnnYue43u9Gki4tV+0s926SqswH+oTAgfwpPGGCcp FdaBeZ2MLlhXH/T6yhqGm/l3BDfXiFbyla8+XlKmy3V4sKNAryuddxGcKfiF0N0G1pWB 0IlklhXo95gM7y3GtUjmKneDSq30ElllE41lDRk5192sUlM7AaJtTTgXX7jIM5HhMbPb PA1R9lgGnLcIW8m4rdLUhMFG3XgUx/pj50NfGfneHzzElA0jSpKTI8roGJGY1jMBanR7 vsm8SNkiEPc740tYFZihkjB+bZO2s9aasBS8xh3UCgEUTotPBcGQMgNn/My1CqDXVF2L sf6g== 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=aoaP4N09+ZK7r2QCQIrxaE8IUHQ+3Y1+30O+DuSUUnc=; b=rNf5bZDRmY+clb1T5IHXa7gIXxBSGggmy+u5sFQ5/AE9m+W4+alSeMdJRi+RBKMsNx PQeWAij9eqcBLUiQJ8uzGW2taHTIfxHcOMydAjj57Tm1nT0dfPrn895edpXCqSaCgDpZ vMM2cmLI5/wgySi4i7nFYH9BGTnEd/cib9yw5E1Jdu70IodZSiKQ8biqwANJ5cUH2hXD scpSUbnWdvV8RoHQrO+exmDSF8DzEroNC9oT5J6XCJ508/syhfg1FsmqJEIJt3zl9gFE MrQxwhDROwxF+dc+dWF1Ez5jiIJ14reATvkbR3Dqf8vSTHERmBl67o2xSeeOTOYLdRHj OVGA== X-Gm-Message-State: AFqh2kp4I79txm1U4l7C6BuDyqdlaStmydK3CFag2zG6TkrGA0v3c6YO ltMrJKa8tYjxK953LHdjvWJC7TbiZyl6mQ== X-Google-Smtp-Source: AMrXdXvCuDFfiUdraOsQJ6KtAqOq1w6lFBuvft2lEZ5ypAWRfLcpk1D9d7hH2WyXspge03v0mg4aIA== X-Received: by 2002:a05:622a:230e:b0:3a7:e14e:9579 with SMTP id ck14-20020a05622a230e00b003a7e14e9579mr59941913qtb.29.1672620410022; Sun, 01 Jan 2023 16:46:50 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:49 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:26 -0500 Message-Id: <20230102004637.3920-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. --- 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: d7a9d72bb02a2a3b1a99183655bf878547116032 diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e3a63882e9..be460ac715 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -855,11 +855,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))))) @@ -874,91 +876,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-malta (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) From patchwork Mon Jan 2 00:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45789 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 1998527BBE9; Mon, 2 Jan 2023 00:47: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=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 B964D27BBE9 for ; Mon, 2 Jan 2023 00:47:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yn-0001qu-BK; Sun, 01 Jan 2023 19:47: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 1pC8ym-0001qU-01 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yl-0004WP-CQ for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yk-0007Ge-Mp for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 02/11] 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, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262041727858 (code B ref 60224); Mon, 02 Jan 2023 00:47:02 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:46:57 +0000 Received: from localhost ([127.0.0.1]:42058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yf-0007FE-AV for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:57 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:41671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ye-0007Er-IE for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:56 -0500 Received: by mail-qt1-f182.google.com with SMTP id c7so21476373qtw.8 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:56 -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=L0MoX9pjhzngkIX7ZtOL3lxzFK+y68G7BI3NeNrLZHE=; b=cGzrTZHe57C3kTVqoQ8ODcz/3SPgS/C5bgAYo0jzria67V4J8l1ssPpNTqSvmPb9Zc ktGtAxmbe7yHVCkrrcUw+pG7pBWkvxfn2WJha5piwAvBKXiSODFiXSPlrXRGsHz+jdBW c17r6B0lbv6ZKf13kunuXMIRUGK9oRJiKsJWhAsgcbEGA2zjXztz0b9KJJ+6NHJ4N3I/ N6BJ7EVdzWi1cQ+F9cdsrlY5tZWY1zRQc+daLM2cVYCG7tdSWVg1Qo27cywMtTvO0dCg W4cjfZ1Z4LOFweFQPNbdqypbRRtdvqxIa5rcpt4md3/XVeJIr3P6OuE4LDa/qISOasN1 NflQ== 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=L0MoX9pjhzngkIX7ZtOL3lxzFK+y68G7BI3NeNrLZHE=; b=ngcGaSMzgw6vOtWw/+g166uIWy5nd4l9hlXUKqmbNb/UgzlkLSuJdHRCcWRS6JeCxP oIzscSNv9Wr+/zmqv9ypE28K2mxdNXqvcnL1C8FcTWolN0Nd4r/ePRk+Rz7X8CGOkzV9 TlNNUevaEERERO7LE9+7wwzYfTBgv7j7yvZXTJYPdnAZbtABqXEhXkZE70s0MwvxjMg0 miQMUGqH0or5l2cQbncXx1Us2pqEvTe3PXa5OsQZIJ8/NwaPfxNw/e3I897yDwcE60Ej p5FkdjobwxOqqX+NuMF4m9hcXM8zzmx+C1EqJkPdO6Ppvm/ncE5riqFfd0LDS4rbep/R IZ2A== X-Gm-Message-State: AFqh2koIhK0DBIG3ZzhoAgaY5GmzYUagagoVMswMqZqa4oWZaitLVenR SM6/Yc63KQpnvW6anBDqcDyZ4KhOL7Sp7A== X-Google-Smtp-Source: AMrXdXuBt7u6G8x91aZouU+VrGeojfuElQvAEff3w9YM8vwS0mP6p8f0F0HtA9FBoSyLv7mGieYzsg== X-Received: by 2002:ac8:6718:0:b0:3a7:ed2f:ae0d with SMTP id e24-20020ac86718000000b003a7ed2fae0dmr54363754qtp.29.1672620411017; Sun, 01 Jan 2023 16:46:51 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:50 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:27 -0500 Message-Id: <20230102004637.3920-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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 be460ac715..75033c4def 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -960,7 +960,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 2 00:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45791 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 C9EE727BBED; Mon, 2 Jan 2023 00:48:06 +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 022D927BBE9 for ; Mon, 2 Jan 2023 00:48:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yq-0001sm-Di; Sun, 01 Jan 2023 19:47: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 1pC8yn-0001qw-Ce for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yn-0004Wn-4X for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007H5-Pi for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 03/11] gnu: make-uboot-package: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262041827879 (code B ref 60224); Mon, 02 Jan 2023 00:47:03 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:46:58 +0000 Received: from localhost ([127.0.0.1]:42063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yg-0007FW-Hh for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:58 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:36664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yf-0007Et-JF for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:58 -0500 Received: by mail-qt1-f179.google.com with SMTP id v14so18715588qtq.3 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:57 -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=pxJBSnUusmfLk6t4r6m2FBjlWz5z43FstgGDHSNcAOc=; b=G5vJmlXUi7QnW6lhBgHkxyt9L29urPGs/qM5NDFSuU1TeeS+r/Qw1hKyRBOjSM45Bo 5lSzpVLywq5cQPU7wuJuNckJKyQPOVDujUytYEPelsHVMkuTWFF+kKJFBlI6uHJXj6kD fL10xXJBnw8znRhIJaUrnf8fHp+CwHVYpy02KUhipUD8lLKt4Z2ZoB4IicBsGMo8YX1D Q59upzWTZtRq54TjUNJxB6mkGTD7MxrD9pkoD+ZqkOaHTrCIcLdUVx0i/Ivr9BOpHrBG lTTCX4+JdVY0k2Xy40STKP+DIJ1v5APt/7HNdU7o05gGmXiPVbvUJ6f0HqaLeOfe7YMb IOXw== 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=pxJBSnUusmfLk6t4r6m2FBjlWz5z43FstgGDHSNcAOc=; b=j5z4z6F7LzQBRPqlVCbZwLW6rl3YCeDXGRSV2u4LWY6fL4rcMXiAPoABPUL3vdivtX ToqSGBhjNiYtsCcqgTVNL1kzF03ohdDuIyAI0ZmwjS7EKWOQx66wpNnkXINmpGKj2qys bUSAGya7Enke8HAVbHYwfLs5U4cIgf4XxMwupAdWMFNZevWf80XwjzsFwrwkJD29fh+k E3y0BM8azp+NaRMca5BEExzUmG1i9mjpj70KJcigkKfLA/faOo1T2b7H1p0nlMjkpVFy 2R8/TSuPkRT5SuT1aS+QXwoiV1afDEcoXPuF6eOmVC7vKxQtxy0l9HvDK6dD5GoORmub V5Eg== X-Gm-Message-State: AFqh2kpagbl5EulFut9RP3hJPBxpbG7BLudn5BFsxNi6gNn2fsCN828t IImRMSUXTdq+9za1Y47qyhVcWTBgH3l/fQ== X-Google-Smtp-Source: AMrXdXtfT6b9P1JZCAkbePl0J5l0LyGpEA5TEU+PbdCMLEtQHGhkrhy1hWBamLPG9NCkQDTI6kFT7A== X-Received: by 2002:a05:622a:1e99:b0:3a8:2ccb:f55d with SMTP id bz25-20020a05622a1e9900b003a82ccbf55dmr59362072qtb.33.1672620411993; Sun, 01 Jan 2023 16:46:51 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:51 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:28 -0500 Message-Id: <20230102004637.3920-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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 v3: - Rename %current-target-system to %current-system in comment gnu/packages/bootloaders.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 75033c4def..c3c15d557a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -862,9 +862,11 @@ (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 () + ;; Note: %current-system is a *triplet*, unlike its + ;; name would suggest. + (string=? (%current-system) + (gnu-triplet->nix-system triplet))))) (package (inherit u-boot) (name (string-append "u-boot-" @@ -875,16 +877,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) @@ -901,7 +898,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 2 00:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45783 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 B350C27BBED; Mon, 2 Jan 2023 00:47: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=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 9030327BBEB for ; Mon, 2 Jan 2023 00:47:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yn-0001rC-OY; Sun, 01 Jan 2023 19:47: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 1pC8ym-0001qk-SY for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8ym-0004Ws-Ax for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HD-6d for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 04/11] 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, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042127910 (code B ref 60224); Mon, 02 Jan 2023 00:47:04 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:01 +0000 Received: from localhost ([127.0.0.1]:42069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yi-0007G0-Va for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:01 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:37591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yg-0007Ev-Nv for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:59 -0500 Received: by mail-qv1-f45.google.com with SMTP id o17so14802325qvn.4 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:58 -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=OgZ6xvQ4kBs21bBADQZvWxhuklkjFG1Jj1/h6hid/HI=; b=BtPF4ANtQborNozjbfVNWWjU0X7L45Pz/Q6lM84JWWhowo69htCYKeTcUrjr2UbVDQ FmeO9sL/6TeecZ3HHJX7tL958Xbnlcm1hucX5djvxQE5JfamRu7aBeKOqEr+33Nt/LhT LDeWZj/TJPGTjqXgi5uzLXYQDhJjb8bBqZfP+8Oe3V52WZvvHUgwagmaGV5NOcoGsxon nPS4YKJENiHr8zxsZEK2yzFCoaQVIGseljo2hCkG+knvdPYwH6cIMEBegfDxyDgM4FOt 6uGztB0el9CehiL59RZMSYuhFKQZSGBk00G9Hw7B7uGRfCXqGS6O3jgGK4Czl1VdQERm 07fA== 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=OgZ6xvQ4kBs21bBADQZvWxhuklkjFG1Jj1/h6hid/HI=; b=rzhYCzNKeRjVjvBWzv32CScN7Yh/ObqU8Fe77qlPisAmdTjLy4z7EOq+1/UvEqW2Kg 0vXL0mcBV1+JegW2/DCdLULAaoiCrj/ZQ+I+3GZjSK+vkvJOcFloq9DLYYABWLM93ORX HIbuwd1mILiZp6QKofwTTwfR/DBgPiaRBzSrDRvXmRu35HULbXRqAA7akOzqrJnZSj0Q 2sZLW5/j9MvcWq3aNcqvvIT/Qtrd5ZqHg5ouT8UMchxTD6r1B68u18JUfj6F0cBLZV/K jDfgBdDmxiCGpGiyX4xtaIsfCetvzkuwE7gtPrJVXRJT6qJwQZUxIs4UC6wNxPN7dniW BZfw== X-Gm-Message-State: AFqh2krRTuLkpQC/g5+29U81BthNlVUdDh0SDisO2iMeudWjHkbIed/Y G1YhEr7OgD1qkdzEsjln593Wsiq9QtR+hg== X-Google-Smtp-Source: AMrXdXsn1UB8GUkH3uWv5mi49LKzKJmnPnp7TC+qbl/qpN3nTXnu8/pny910dzuoRKg9f9Dmd00ZwA== X-Received: by 2002:a0c:f906:0:b0:531:be1a:89af with SMTP id v6-20020a0cf906000000b00531be1a89afmr7822269qvn.6.1672620413115; Sun, 01 Jan 2023 16:46:53 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:52 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:29 -0500 Message-Id: <20230102004637.3920-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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 c3c15d557a..1a4415b858 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -859,14 +859,16 @@ (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 () ;; Note: %current-system is a *triplet*, unlike its ;; name would suggest. - (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 2 00:46:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45790 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 5CC3127BBED; Mon, 2 Jan 2023 00:47:58 +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 C979927BBE9 for ; Mon, 2 Jan 2023 00:47:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yq-0001so-EC; Sun, 01 Jan 2023 19:47: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 1pC8yo-0001rL-4z for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yn-0004YY-Sr for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yn-0007Ho-OG for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 05/11] 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, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042227934 (code B ref 60224); Mon, 02 Jan 2023 00:47:05 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:02 +0000 Received: from localhost ([127.0.0.1]:42073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yj-0007GF-OB for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:02 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:38850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yh-0007Ey-Mo for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:00 -0500 Received: by mail-qt1-f169.google.com with SMTP id z12so21495828qtv.5 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:59 -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=O6ikzglE2k4gB8lo7Su39uWFENRIsTKcMDXCf4doHlo=; b=VvI2nCd/iY4TVA73vDE/zzt6I9FztePvbzKtpRE7TSgq662EREPRc2HzGtCRJ4F3jL NyPjG4ggbR75kMBJqW/DLRcbscXRQ4bz3Wd+Hp/fzj33KmuUNQsTDpNScLhQVhvMsXH+ W/Q6sRCPZosanwOhaCrjXfTbIDyk7DuKjKGm31ZxpW5a0WZvUGD1YJqxwZUT4fDrhty2 hdF18i4W6Xun3kDS4x5IzroWtl3PDDCPPLNJswHOOqwLxB2EEpamokjehcRGQng+0KZL SUJzok8k2pDdInKVcspPMO+Zll9uv9lwMv9nloqqKkAWx/qbPaF+n0FU9rzsD7EUPILc +i8A== 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=O6ikzglE2k4gB8lo7Su39uWFENRIsTKcMDXCf4doHlo=; b=5xNMr0kRjH2meV2vXRABMZTBu/w8vLBl0HDxx7S0CntW5W2V03UXMI7wdMiiYXtsU8 vrD7KsXkvAr8u+GZxaeAPB0ej8Q92PbcJU1vxr4VEB3iAXN0gWF1EUMFSPC39O1abbEn aVY4zi6IsrllHylLwqFeeuMurwp09DHht/bj0FXVvFnzmhqQwfCxxWBfdG0ZBqG1VpPt Jo1P8WZ9vSfoXyu+L/jLN04CpDaNPI+UN74p+gRThzaYoNiUp7yHZnxjbvFJ5EYFqkNu ukco5eFLZl+y1bLpO1QQ/NnDeG/mTXtQXibqVgOTJScKqHv/IJrH55skoKMIHIoWRPCo giSg== X-Gm-Message-State: AFqh2koApIcz0/wPj+F5Z0qXW5E/+folwVoAM6dm/Rxd3jICCfLP5wvd gmuwEJmt7K6Bdr5sryAxT5MU6B6qMUBi0g== X-Google-Smtp-Source: AMrXdXtvqaxAwChApdjAeLorhyfAliJfyH+PH3Yl/8/W5wZA/JMihhUs1wxkrndT9vROO+2OEnQfNg== X-Received: by 2002:a05:622a:144:b0:3a5:4f32:9caf with SMTP id v4-20020a05622a014400b003a54f329cafmr69196381qtw.59.1672620414076; Sun, 01 Jan 2023 16:46:54 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:53 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:30 -0500 Message-Id: <20230102004637.3920-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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. [phases] {set-environment}: Look also in native-inputs (for cross-compilation). [native-inputs]: Use gexps. --- (no changes since v1) gnu/packages/bootloaders.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1a4415b858..602ec7f8a3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1225,17 +1225,18 @@ (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))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" + (search-input-file (or native-inputs 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-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define*-public (make-u-boot-bin-package u-boot-package #:key From patchwork Mon Jan 2 00:46:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45784 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 ACBCF27BBED; Mon, 2 Jan 2023 00:47: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 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 1C68227BBE9 for ; Mon, 2 Jan 2023 00:47:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yq-0001tI-T5; Sun, 01 Jan 2023 19:47: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 1pC8yo-0001rS-Ft for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yo-0004Yj-7c for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007Hy-3q for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 06/11] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042327963 (code B ref 60224); Mon, 02 Jan 2023 00:47:06 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:03 +0000 Received: from localhost ([127.0.0.1]:42078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007Gm-5Y for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:44660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yi-0007F0-Qk for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:01 -0500 Received: by mail-qt1-f175.google.com with SMTP id c11so21453209qtn.11 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47: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=fhIEgZXQs7XrHkDSXGoBPg/YTzU+0HSi9Qd6Ucnil8I=; b=Gn+WyVKqbBlOYf9Dqto9u3OSS8CtDNxa3B4f25dBTLcBJUoQqu0CDkpGl3OU3MTRuJ 2h9eR5Cw/Bfm0RXfuqtZznO6XJM7ynAg+l7Jy800kbPo7Nz663ogU9tz65gNT+V/CU+s P03BkClGMTLJzDXnt+H0aaQrel0YbDBig0Ff8IeXrXfPt+zHOm7LCNz3pAuFDq8TlsLX cvHvCZJZFMDtKfMNLWSK36id6m86gr7JqPw2ixMSUPObdSGG+8msYWhGPt86NaZfxjP4 YuAi+wNqzUnzPzPwQwJjnWImSPvl9ZGC4r4tQ3Vc/jymCS8D2MHGhmqX9lAi2HtQF8lq UxJg== 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=fhIEgZXQs7XrHkDSXGoBPg/YTzU+0HSi9Qd6Ucnil8I=; b=isI64/wPabxD5fUsWbl6MwtepKR+MfRT9jYFsRdVK8vQYwE2CUxOP4QIgQ2hwgy4T4 HKoyaPh4LcOh1ikWGRvccSPcVTqEv1Wm3a7EMVFWTcYPSmB0sl3boJL/zSI4Qda/E68m YZPBJlaeFeZfdJicWoZ2kSmQ6gqpHcAET2ZgY2Oo+3RzVp8XZQN4oj4Rh28wnXqEWv/3 lRoyjuhdKoTmd76HecM3XeenI5+U/mQtVHcc43NaIzOS8IoOcVxcbQSvQap+zF7vi/q4 JHa/qCHeS765BT/X26AObqEZpXLqOaXzZQxnqWy7zh8xhskO3CqZ9AMQNzCiiP/Dutkp CRxw== X-Gm-Message-State: AFqh2kqrnapecpuVNOyZJLC9DzpP5Rnhi7rSkhTkJjX+2EL2Y94NU7aG Uhbk0r421QiSfghjuk+s5kUZe8ux0+PyTA== X-Google-Smtp-Source: AMrXdXu6w/h8X/7cVL00ZM8oVXS9uqiCjWOR+C4b8Yg2q98ILWSG9WgExkpnL6Cv094XmWYiYRX5yg== X-Received: by 2002:a05:622a:4d8a:b0:39c:da20:5f8 with SMTP id ff10-20020a05622a4d8a00b0039cda2005f8mr73291592qtb.2.1672620415252; Sun, 01 Jan 2023 16:46:55 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:54 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:31 -0500 Message-Id: <20230102004637.3920-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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. [phases] {set-environment}: Look for the bl31.elf in native-inputs, useful when cross-compiling. --- (no changes since v1) gnu/packages/bootloaders.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 602ec7f8a3..8a56ee9cec 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1160,16 +1160,17 @@ (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))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file (or native-inputs 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-inputs (package-native-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 2 00:46: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: 45788 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 2744227BBED; Mon, 2 Jan 2023 00:47:52 +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 89A4627BBE9 for ; Mon, 2 Jan 2023 00:47:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yr-0001tK-4j; Sun, 01 Jan 2023 19:47: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 1pC8yo-0001s4-Sc for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yo-0004Yq-KM for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007IA-Fz for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 07/11] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042527994 (code B ref 60224); Mon, 02 Jan 2023 00:47:06 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:05 +0000 Received: from localhost ([127.0.0.1]:42084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HK-I8 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:38857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yj-0007F2-Nc for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:02 -0500 Received: by mail-qt1-f175.google.com with SMTP id z12so21495889qtv.5 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47:01 -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=7urhBD6EuoSPV7a76anzEzJic8m3aNAtkY/qq1EsFUQ=; b=BNGVHxW5mVz214yJH7Z1L9vGHZhe6zKs6JcyhahywMCdeeVFj0AWS66NFfO174pLy5 K0D0Vllx1yosZp0FZ/muKAvWm+I/RM8Wjg9V0GuxBFFmG8uC6Wuj++HC9V5K0NE46oZB O343FVuUB6Ho+NfsqRArRhb3JC4nyIcpaSEIrIoe/2UT65ofZy7TBehe0t/EBWhCSt4E OEwC5CTy4xO0QRfF/keDkNF9rlNuErKCyDkxkMcipyYifZb1XvhWn0XdjIjwHvTUlIz+ MKr++uHFjwqIfczw6Fzhi/mDtsTv2j1BXJWyVOzeNI1HUhiMdc08aCBWY2XlbuAWKnWm /tRQ== 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=7urhBD6EuoSPV7a76anzEzJic8m3aNAtkY/qq1EsFUQ=; b=jWiFYIeuj2+lYufiW7IIhNJbgTnhKhde2uxyvK2dg33Y2B/l6GWd/E1pMYjsTRTBtu xsnG78WqJ6uKIbYF19g93tlAVi9ljGmGMO2SKhMoT85r4nCk9grB6BTDzSJhhdj9B8tB gn7EINY6Red7iq+JxR9Km0jWKBQD3xy92SxM/BYrtaI0ZGeGjdjI1yNQc3SEC65nqVov qGrd0YE49af+jfUG85Aa5oKnWJbhgZs8glB1xOLTAWJ3M+AfdmWOx+AjnnJ5c98zukTz mxmjSmSOWDdUr7mDBzb6IQicnVnHF8Mgs9AS2LFARQ4p/Tswk29Wwbvk3GO457yd0F2P IxBw== X-Gm-Message-State: AFqh2ko7SWcc/ecA8nN2IXI0pb0p52lPoBpoFHL254lEewbkrN0nm6BX cgOerTUbSdPbNqbJhgE0A61X8jqFyevx9Q== X-Google-Smtp-Source: AMrXdXuV0G0TH1ekYGyOGBlBrgfVRnBotnQAmITrsprYQNo2/bUpc75eqQ4bxtDEMkZjVYKrvPZM/A== X-Received: by 2002:ac8:6a0e:0:b0:3a9:86c6:e27b with SMTP id t14-20020ac86a0e000000b003a986c6e27bmr46702077qtr.28.1672620416256; Sun, 01 Jan 2023 16:46:56 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:56 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:32 -0500 Message-Id: <20230102004637.3920-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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) [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't exist anymore for some reason. --- (no changes since v1) gnu/packages/bootloaders.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8a56ee9cec..a19d1ebf17 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1005,17 +1005,14 @@ (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)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file (or native-inputs inputs) + "bl31.elf")))))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) From patchwork Mon Jan 2 00:46: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: 45785 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 E0DC027BBEB; Mon, 2 Jan 2023 00:47:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 B31B727BBE9 for ; Mon, 2 Jan 2023 00:47:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8ys-0001uL-SX; Sun, 01 Jan 2023 19:47: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 1pC8yp-0001sG-9k for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8yp-0004Yw-1t for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007IH-Tk for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 08/11] gnu: u-boot-rock64-rk3328: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042528004 (code B ref 60224); Mon, 02 Jan 2023 00:47:06 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:05 +0000 Received: from localhost ([127.0.0.1]:42087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HS-TQ for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:46974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yk-0007FI-P9 for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: by mail-qt1-f177.google.com with SMTP id x11so21459330qtv.13 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47: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=wFsm+WsM6PdEq9YU8EXujhaXeKxBwa6adx5HEsWPabQ=; b=ifT70ybpsb42UpagS4/VAFJ5Tz7asE1V0UqOqCIYqvba24SiAa3HQHyOI2kOQdtWfk PtjXiKhfg3SWIfSGf7KbOLosrravzjkL9r/xBpu+uWH9TGQp4gVRUZvVF95rqaN9QU3i P/xd1PlugvJ47MvIS31rs1P26lGnkL/GXkH1n74Xdx6xwplGUqjGA5mcme8kXGwBEiv/ 39dGAN7ncu/tEfQcSrSexRwNCMNoZ3XxVlC0pbenD383+9ziE6u+PIXcgxw5Lkh2Z24w nmBh/ybiKJMVHsHEg7AcuxS8bS+0kM6g4ubna0kpaZFRIldfJ+xhYGkIkvasIfw9b2oF WqzA== 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=wFsm+WsM6PdEq9YU8EXujhaXeKxBwa6adx5HEsWPabQ=; b=B5WMVhx+W/msGy6yVcX30cDQGlk5fcwduAWmlYgbJkDfdRhXsU/vqFUtN5UfUkVlZ6 bGg6xYt08JqR2p4lh+DfvNC7GZGDKxWJ27BPWDLhV89LGKjlmYiQBKPX3D4swOaiQR2C fYp86Re8CE1CioKphok3KmfRF6ykF1hpWGMJ/8vJCQV7ZnKiDK7CX067GzQEaogk85gx 8p1+3E9QzBjkMtbnTq3ph85UdyTCKeRTyqO6cqSdUAjjHSGeIVNk6P6kX1FX6Eik9WmJ 0KMQl4uzS0RSw/gn4SO9mnUo+Fim9AWOf13+fmPzUWwRanFbcMfr/XS1ZxGWsjosctb1 Fgxg== X-Gm-Message-State: AFqh2koR2Pde2TUscaGsjhRrEIvVwiNOxMdq4VvEfcK7lh+Qu8gIpnlN 9WfNDfbWgSQ+r9h4dy7+ujjUTi8XNBZ2Sg== X-Google-Smtp-Source: AMrXdXvYM8gh6NwrCtfskV3rd7KE9cP5Yv7OkWLW6h4cawI99n0ZrOS0xEEPmQryeyb+cLHVzsorqA== X-Received: by 2002:ac8:470e:0:b0:3a9:756b:d9d1 with SMTP id f14-20020ac8470e000000b003a9756bd9d1mr46689357qtp.19.1672620417224; Sun, 01 Jan 2023 16:46:57 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:56 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:33 -0500 Message-Id: <20230102004637.3920-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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. [phases] {set-environment}: Also look in native-inputs. [native-inputs]: Remove input labels and use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a19d1ebf17..d1c04db66a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1141,14 +1141,14 @@ (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)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file (or native-inputs inputs) + "bl31.elf")))))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-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 2 00:46: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: 45792 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 E817127BBF0; Mon, 2 Jan 2023 00:48: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=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 36B8F27BBEB for ; Mon, 2 Jan 2023 00:48:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8zn-0002VL-6a; Sun, 01 Jan 2023 19:48: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 1pC8zk-0002RK-Tg for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48: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 1pC8zj-0004gQ-7C for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8zj-0007MZ-3v for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 09/11] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:48: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262043228079 (code B ref 60224); Mon, 02 Jan 2023 00:48:03 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:12 +0000 Received: from localhost ([127.0.0.1]:42097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yt-0007Ip-Pr for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:12 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:44667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007Fb-OH for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:10 -0500 Received: by mail-qt1-f181.google.com with SMTP id c11so21453266qtn.11 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47: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=kl4YmHHu4tQ52Yx51BWGoML4i4gSKW8uYkp8la5Wzrg=; b=Z7sktAwRRy+MGFyVB/mXr2iPobDJMWAUZB4v8Y1sRYgjJ3hcLwjXGpJMWMavNaJh8t qJliMWgH6iP80JvihH74yfpz7kl5P/nb0gZVIodg49d3T5i2c4Dcx35pP0AQjsqWtSie sRTfi99m2Opj2qo/fFMefvv2nZgZ5qm0iptweQ6YzxO0Cm6rf6WeL6J32KX6b03/Yixb 2WENvGzKlwTxyLvYCridKnn08N7Cm40lObAYjxXPic6mMARbKG/8KnloVgGRj6czT4g0 4Fc3Hflt5pe3WR4xDZajit959e7O/WZaPDNqBp17owRHgL4bIFtzsDxPxX9EREB2UxNf ZcnA== 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=kl4YmHHu4tQ52Yx51BWGoML4i4gSKW8uYkp8la5Wzrg=; b=seO0imL19DnyARKF79NwuftDIclR7QM7KtwyUogpBYnZlaYZc/jy7leo9MaalGS3nc uIix1Y/0PTd9NvxGMG20Xor7DOB+s0sPMcBLHuCv+SL7TQ+JPwJINSgGchkVI+IDmsf9 Ue4i7kCvSK/WHPiclusLxBWQqK8tXDMvmDctnTiYDvIcSylZ3c4BvGs72KuqE6KAs9sJ jJz5oe66QHlG9mVsdr2/xFOp6h5I1KwVnJ0yJjNj0c13Ls6ECaVS03AMAS4SI/2Eng0K FMN0Kfkh0qACns76h6/7aaLglIf0FcI7euhvfULx+CSKeOtF+CJA7KwOKzDcit8K3j72 YiZg== X-Gm-Message-State: AFqh2krabuY0L83iOqaAUXL12n0jeiWBGbTcU8L/iLEDFMUzPvcLK+2w 3coHKxRB4BoFjMb6i+5a0ScvK+SSF6Eorw== X-Google-Smtp-Source: AMrXdXtmfsXc4Uq5AreVdKTc1g9iGK3iF2IC7V3oEoy9Jl8kIHCp+Jc0TjoxMtVZcLMf1C0mskKr0Q== X-Received: by 2002:ac8:140e:0:b0:3a6:a7a2:57b with SMTP id k14-20020ac8140e000000b003a6a7a2057bmr50473671qtj.6.1672620418216; Sun, 01 Jan 2023 16:46:58 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:57 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:34 -0500 Message-Id: <20230102004637.3920-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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 d1c04db66a..960c5b4a88 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1124,15 +1124,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 2 00:46: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: 45786 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 A793027BBE9; Mon, 2 Jan 2023 00:47:34 +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 DEE2527BBE9 for ; Mon, 2 Jan 2023 00:47:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yo-0001rZ-Km; Sun, 01 Jan 2023 19:47: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 1pC8yn-0001qt-7x for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47: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 1pC8ym-0004Wx-UH for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HL-MQ for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 10/11] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042127918 (code B ref 60224); Mon, 02 Jan 2023 00:47:04 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:01 +0000 Received: from localhost ([127.0.0.1]:42071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yj-0007G8-Cw for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:01 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:36664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yh-0007Et-Jf for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:46:59 -0500 Received: by mail-qt1-f179.google.com with SMTP id v14so18715750qtq.3 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:59 -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=2o7How20zSCsrP966tL7YM+JfdZMhsJsVmIjsh1Sua4=; b=TxwwOlJeTPTIAYDrB2pe+qNXA4R00zkblj83DKkDGfx7AFXz92kt6sBawRmbQU20DP sMOZ0uw+ElkkqphprTwU0bwzAqlsPnnqha3t0kq+5EgT3hQuYbfOMZtGffdllz2UEyqh Ux49frIHNf7CZL20APAxu7Ni6AQ1zGrMpNk1jSiNvxd+ANGmEdbEYiO4jdzhwxfyi45P nCPkxk0cTKAYTQr6BdNT2DhIOL9ZSGMM2qSJ3gCS0J2/hQ4BS2VIugnVTjfgED53TgI6 GRPnza6i99vws9wAPOET4uRztUOLOblUHA7MCsO2O9FVdtg+1wHfUdlo2vR9PGtkObOw xiyw== 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=2o7How20zSCsrP966tL7YM+JfdZMhsJsVmIjsh1Sua4=; b=qO8bETagP1I/BrdZPpftHohZMTuhAxAvF/IlwDlmmdqiNvGzvrjx20s9PaCY6y1r5V 0SzQUMdP+cSkFLElfeQlefyPx8CNCcW+u9GHHB2rL0LHUrGakvF9g5km7GYzm3MtIXJp rIzXIFPkDgZ1KmWcuf3SaigTtN4tVp8IMcx9gBXDrMSBSvFkGkykN79bXLTUW2hVBYR+ ht/6KC21nRfELnj9yUGeHZsZ1LHOiftvwtqdOxFgyaQRzQnzg7KVq9Wr/pvL3Fi4PsoD dTLwxBgaamUq3mU8d7ggdeKVTme/d/gHr0/dbWMXO86oIy+tZ+DswLUpa81IQG3dNO5j oGNg== X-Gm-Message-State: AFqh2kr0z9yHl7PAOzkjmV4/uakHBP21VqnB1JBdshIdGJZs6JhMyB4B NQnJ5c1fTX+R5ZxPYIIbASyfRSP5JSMWWQ== X-Google-Smtp-Source: AMrXdXvRQrKH0FyLHuzRik99DoEMXJ5640KljoFa2HuHMmkEjt+dwbFyVmkC3MHhR27SJ976VGeFiw== X-Received: by 2002:a05:622a:4108:b0:3a5:1680:4cd0 with SMTP id cc8-20020a05622a410800b003a516804cd0mr55416698qtb.7.1672620419199; Sun, 01 Jan 2023 16:46:59 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:58 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:35 -0500 Message-Id: <20230102004637.3920-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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): Use make-u-boot-sunxi64-package. --- (no changes since v2) Changes in v2: - Add commit to allow disabling cross-compilation gnu/packages/bootloaders.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 960c5b4a88..18750c2ad4 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1090,23 +1090,7 @@ (define-public u-boot-cubietruck (make-u-boot-package "Cubietruck" "arm-linux-gnueabihf")) (define-public u-boot-puma-rk3399 - (let ((base (make-u-boot-package "puma-rk3399" "aarch64-linux-gnu"))) - (package - (inherit base) - (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)))))) + (make-u-boot-sunxi64-package "puma-rk3399" "aarch64-linux-gnu")) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) From patchwork Mon Jan 2 00:46: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: 45793 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 D7F2D27BBE9; Mon, 2 Jan 2023 00:48: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 5079527BBEE for ; Mon, 2 Jan 2023 00:48:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8zm-0002Uk-QD; Sun, 01 Jan 2023 19:48: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 1pC8zj-0002Qd-4j for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48: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 1pC8zi-0004gL-S2 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8zi-0007MQ-O7 for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 11/11] gnu: u-boot-rockpro64-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:48: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042728063 (code B ref 60224); Mon, 02 Jan 2023 00:48:02 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:07 +0000 Received: from localhost ([127.0.0.1]:42095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yp-0007IZ-C4 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:07 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:46974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yn-0007Fz-N5 for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: by mail-qt1-f175.google.com with SMTP id x11so21459402qtv.13 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47: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=yzdYZR6pQ6RJE5r4awWAw/YDqx1d+cyJY2KTG3qyMyo=; b=Awwv9cSC/4AtpKNPEcIXN2wORablJiOzDIIOlS5z3bryYSGkx5ZKMcjpJX1kYbvhXW vFsi+3vsV3V+dnlyzXI9RnkflPEblGmG6JEkvvxUiryhVdGS3XpNGslkOiGVsC7Skii+ nDn2TPae2ljVZfcdtvCrgPU8kMMlVcyGqO3T87+g15behC9qK1ojSu7ZWJZFfGbKSDjD 0vyxr8V4WETQVOYxwXbq5HOuFDFUnDLY2WgCbfvm6iPAnXED3MAPUbxydDUKRDOPdjb6 zaxOvHB3bxqfQcIxqdrEe8/V8mnVr8sX2+1xepAP8lp0dFj4lchdvcx4a7aU3V9og43m kblw== 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=yzdYZR6pQ6RJE5r4awWAw/YDqx1d+cyJY2KTG3qyMyo=; b=DIEnmo3yVmheCYv9+tuNkUsqrTjttZ+f8JgbbOZBauCHXWP93Dmwlovo14eUuDkVKV 3G1t5Vj6R9rhdVm8j35P8ik+ZNmKJV7XMEi5A//09SMbr38GTUKG7oAxZA9lfFXwYs+E vrG5zXf7AK45Y9VFmDybb5W/WKwgzC8AjwGqyk+tfVO8toiU3pXwxN4eAUBO4FOwpUUp FZqgU/NayuZqqHIVJcbmIxnMpRttLUY4y+IiDrkaQLGRDrLCCxROV44KhyS1IilHtQGu U84s7D03TJswagHWcgvgwqIdPV6v/NUrAIvsQ2SP3A1MNOkbPzGJNI41nxkqX9QDiRgr egCg== X-Gm-Message-State: AFqh2kp6TwQ949VI1uqBPnzd6VjJ2pyiFhFNayuZ54pOaOIu0+c4P1Mh RiNBVwtlm1UUe64BSRas9ZONTxZWkeH8Sg== X-Google-Smtp-Source: AMrXdXv1GDK7l+tqrUbEjXmjbrkkxHOADmbQQ7VrGMNlQxn5QOhrrqolFqq9YVyWgk6d4YnGsc+bSQ== X-Received: by 2002:ac8:6050:0:b0:3a8:84f:1d3a with SMTP id k16-20020ac86050000000b003a8084f1d3amr50359079qtm.9.1672620420233; Sun, 01 Jan 2023 16:47:00 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:59 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:36 -0500 Message-Id: <20230102004637.3920-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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. {set-environment}: Search native-inputs as well as inputs. [native-inputs]: Use modify-inputs. --- Changes in v3: - New commit. gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 18750c2ad4..6b985c4572 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1167,37 +1167,38 @@ (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 (or native-inputs 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))))) + ;; 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-inputs (package-native-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")))