From patchwork Tue Dec 20 18:34:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45469 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 4044F27BBED; Tue, 20 Dec 2022 18:36:37 +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 F362E27BBE9 for ; Tue, 20 Dec 2022 18:36:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSW-0008H7-Sk; Tue, 20 Dec 2022 13:35:25 -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 1p7hSB-00088q-Pm for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSA-000059-Ro for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSA-0004Ig-CH for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 1/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156128316440 (code B ref 60224); Tue, 20 Dec 2022 18:35:02 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:43 +0000 Received: from localhost ([127.0.0.1]:46457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRr-0004H5-4F for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:43 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:34422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRp-0004Gm-Sb for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:42 -0500 Received: by mail-qt1-f171.google.com with SMTP id g7so11771986qts.1 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:41 -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=jAikXiUFEa4QLTvqo15lPeXuhgPMQRNY8BojmHFaMzE=; b=Rorc3OqS6PEwCJuqOnStKM7DO3jXzZnrB1axj2VnEMFPxZbVRisaI7ajPDf2sZPAwa If26PvEleRqbPXX+jcL/zOFawu3blSsPXZHoyGO9LoVK68lNX1yQ+PHcIzeQr+WFCHyN nU48uksQfY0HomOxShyw0oIFqUKEtepOwhwE+jRzXSor407zipIWTfHrVmj5fzH1Qw/Q 2/kkRLRGi6P/lf3UUMkAnIPiMRNTtVrIfFswXuivuzJCnyB/UR1u2YS6iDuWXoO69pNB xLh9RCfIaEoXuU8B42sm8K+8u07NeOjthh4wsDipH9sTQGWb8heYVczJza1mi6JwO12g ZZYw== 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=jAikXiUFEa4QLTvqo15lPeXuhgPMQRNY8BojmHFaMzE=; b=TkIAcmBvbIqvEm4QJGJDXDN81k4RU8tJRmE1j2llHi/ynv5szvnqbgy2Zzc1wQTPoI J+0zBlr150YtsedCSiYXrOaBKHBybWIHikq03T/oZOyeJz4q6jfqG7NeVi3ldlenoJha l6x2llBr2DGVbZKFDHc6H6t0+pkhtwTD7kOZyBXzhgdF4jIve+PAGjM2GP+bb+Ywe4x2 f7+c9XrGCcGH2B+6STQxvi1+Ba6h61KvSAriaCU4+n/Mh+C+tBxCnTh/BR9a3bE2YD94 OmYcc9shwPefrBPWXliIlONqf6w4ZjNcCVnKiNaU77iJ43GvkaSSIJ55k+orJGv61RG/ w6gw== X-Gm-Message-State: ANoB5pmC03T5v8MQg3mTvIPYhAOWyGUHPw58QiPciMWfHrsVV+O/Kuk0 KcshQ92dkGX/ZMA/m62PGVEu+8b66mMq1MEZ X-Google-Smtp-Source: AA0mqf4IEYO+walQw/Pqkhc/bvvWB7O+VR5fL7ZMl9ZSnWxSYnBfaT6uPmUjeDz+ow6mv6R7H7F03A== X-Received: by 2002:a05:622a:488d:b0:3a8:14ce:73db with SMTP id fc13-20020a05622a488d00b003a814ce73dbmr57489493qtb.17.1671561275867; Tue, 20 Dec 2022 10:34:35 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:35 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:19 -0500 Message-Id: <20221220183427.31752-2-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. --- gnu/packages/bootloaders.scm | 182 +++++++++++++++++++---------------- 1 file changed, 98 insertions(+), 84 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b968ecd441..42f859c362 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -782,11 +783,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))))) @@ -801,91 +804,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 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 ((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 Tue Dec 20 18:34:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45473 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 09DB227BBED; Tue, 20 Dec 2022 18:48:02 +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 86F5727BBE9 for ; Tue, 20 Dec 2022 18:48:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSY-0008ID-Bq; Tue, 20 Dec 2022 13:35:26 -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 1p7hSB-00088r-Pm for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSB-00006z-BZ for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSB-0004Ix-6v for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 2/9] gnu: make-u-boot-package: Install .imx files. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156128416453 (code B ref 60224); Tue, 20 Dec 2022 18:35:03 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:44 +0000 Received: from localhost ([127.0.0.1]:46460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRr-0004H7-Pv for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:44 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:38852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRq-0004Gn-J6 for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:42 -0500 Received: by mail-qt1-f178.google.com with SMTP id z12so11756659qtv.5 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:42 -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=lpwAeiucd3Jyv4ydmETLibHXT/RqyS6VC6TBRpnricw=; b=I9G2Rb+lEDuV/WZdap3bdS1kIQ1+QxYjA0ftXAN0FWf51iKIR5+/GLrX4qWPm73kNP aut0U9Wu66hKS78NOPC8THRgszTrrF+9saZI+LsoOyC5JQijCIDOFCWRTwOX4PJIN72R a8e88XPt+iYHmokGLJyipXO0zP/lAfnFjUjMwJW+9JYBM9YiKGDlDdc0i6XOnR/+6XSq Z5f3KvDoA9kgfq8C08NZMRsUT5tROAm6GCPzksj3GMqsJC1NVDfq8SoqZL0/Eu9qeTk3 L1HI/wzz32pRuqHykBmKOa416XUAy++EJp0xMgYjSwbSBnpswwVGvR8/X2jEyP5tAqou mlZA== 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=lpwAeiucd3Jyv4ydmETLibHXT/RqyS6VC6TBRpnricw=; b=c9ALDyYVcgzOUdfqLIcBq6RrDd4QhW1LrQAVpkAAjTtrBvjxBacLSOz4OtLov6/KYj Mbj1bQWvxMIuiYtankLrLpC9/4UrQKsqDkQQyrmY1UsoQwJo7+ymYxmRqHjukVpEuzeg nN//N4VpNiofK68WkbA7nvKBDqt6x5FU9xDPFBVwJBylfYKfGHVJIiKGUMJvfDXpfmxF 6zCt8hAbjoatqrZ+idvfJJvciKt7/+q9LFe48+3VypzmKhJBHWzU+xXX5jctLMsadI8X Z3ngLcTk7+dlrSqf/U9fhoZyA5t0T0S9qhEBYm1j7XbnCJ3dbU9JhIByuaDruucpXfIx XaZw== X-Gm-Message-State: ANoB5pkAa651Dl170XRO66CNL56puOAq600vvUUdYc+CdiJxaLX6PaJy +oM5pWai+jP3XknIhK4SbDqmbNGWny93j8VI X-Google-Smtp-Source: AA0mqf4tTni68UkRyEY3VTPTpd/RLLaa50phkj1nD/fsAjpb01flnY7qdj0AQDha+x0qxe4j7xfBkw== X-Received: by 2002:ac8:7a92:0:b0:3a8:234a:3204 with SMTP id x18-20020ac87a92000000b003a8234a3204mr41161606qtr.23.1671561276900; Tue, 20 Dec 2022 10:34:36 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:36 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:20 -0500 Message-Id: <20221220183427.31752-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 42f859c362..bc9f32c9aa 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -888,7 +888,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 Tue Dec 20 18:34:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45470 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 5BF7B27BBE9; Tue, 20 Dec 2022 18:44: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 A5AC427BBE9 for ; Tue, 20 Dec 2022 18:44:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSL-0008Bx-Ef; Tue, 20 Dec 2022 13:35:14 -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 1p7hSG-00089I-ST for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSC-0000CH-15 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSB-0004JA-PT for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 3/9] gnu: make-uboot-package: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156128916487 (code B ref 60224); Tue, 20 Dec 2022 18:35:03 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:49 +0000 Received: from localhost ([127.0.0.1]:46467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRx-0004Hl-A8 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:49 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:37704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRr-0004Go-Lq for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:44 -0500 Received: by mail-qt1-f169.google.com with SMTP id j16so11760606qtv.4 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:43 -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=bBijlxiPp8kNZGoUWApCFIKp6OAc/lSDRtwgAKj0820=; b=A8P/eTtkWLtD98lsjK+PCMEzuaOmOkZ6kqL2uAjYunImJeAf/2KBe2+H3mgNigAVtk OapIBeEKHOe8gS+TQuh+GiAV2QXrmQRJJOF1JEUl/HoPUHGhi9+5zXMJxilYoM8Ys9t2 7InDtYtcGe41Wx6LJf3bFhnw/c+g/IjRvcijlCCi3H++qg3hCaZSZ1wOdChAcFRSookU VrulJJaU16+qbxlhHTi/Z0DdnM6kh90jMmxVowgPkZZ+Bqy9y7eUdTBYRArJGyyHbJ1U wIyh4IIiof9n1OzzslcqjhuuWazK3AOlfeOcLxwrNJ2A0c8gWZlDxyiwPhVf2R6eFRHa llLg== 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=bBijlxiPp8kNZGoUWApCFIKp6OAc/lSDRtwgAKj0820=; b=T25JR4poWHg4AaSFoE5lI5U5V8samu1lrhxKYrr54ITIqDksnzPgxHylEAQErXRWfD 4XCdcISqf9q3Do7nPmC7Fe5aalspvPoIeh4sjLgxzCcoGehrLqWJl64cUXuHeeEaAOc6 /oF1F84eMqk11VE5M2GEAUHOuWNHgBFV8uju/lpLGNmmD6nOqt5Xi92u4jdQE7lElejW /eRvAGdOA4VKILF/rQJjKsp/80r+XXhlC1FvJh4Mb9zYLvSerPCHf/XLoW377kAX+8S+ zvecTRwONS6X6nUw6Ho/DiPNHfAkqYQFYqbRzV2nzKZNERCo6A95640r2tjIM/Xx4t0p Xemw== X-Gm-Message-State: ANoB5plxHaE0fYJ+rRpi9SRJ8OlxQKisxH3cHqrPfsIFynf9S6ZD1cSY CSzGE1XcvS/UaSsaXXYSvsBx4BIWsYt0kOK5 X-Google-Smtp-Source: AA0mqf4HtSVYuzwufjWUtfCIsiIVrTwD3WvqO0HJkOWH1hM3eBUQ61KTYbN02rgclUxYIqL1eywLRA== X-Received: by 2002:ac8:6f16:0:b0:3a8:305f:2fb0 with SMTP id bs22-20020ac86f16000000b003a8305f2fb0mr34256644qtb.18.1671561278025; Tue, 20 Dec 2022 10:34:38 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:37 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:21 -0500 Message-Id: <20221220183427.31752-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 bc9f32c9aa..6893d12745 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -790,9 +790,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-target-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-" @@ -803,16 +805,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) @@ -829,7 +826,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 Tue Dec 20 18:34:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45474 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 B7F9027BBED; Tue, 20 Dec 2022 18:50:13 +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 3272E27BBE9 for ; Tue, 20 Dec 2022 18:50:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSR-0008Cz-CG; Tue, 20 Dec 2022 13:35:19 -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 1p7hSG-00089J-ST for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSC-0000Gd-BT for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSC-0004JH-6V for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 4/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156129016494 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:50 +0000 Received: from localhost ([127.0.0.1]:46469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRx-0004Hs-SO for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:50 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:35345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRs-0004Gr-Md for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:45 -0500 Received: by mail-qt1-f180.google.com with SMTP id h26so7915258qtu.2 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:44 -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=XmXI+n3NwzrulGFb5noGXlJMzCZEz3A1YQMLG4RxmDo=; b=hJFBnIRushoUEgeYro6mKRg1jv7j14b3OpRe7yNEYFxTJisszMdiYWoD9h02ExJ6j1 1o+RD/iHwTTT2A6msRpQyC7moFAgCyPa/bNx+b7sZeZa4XXzdCcjGMCmnbozHkKA5MTt Dqpb0mvdh5ViPTpdmi/CEi/aKETSD7kgWfcFpkHyLWO/5G+H1cYqEykLOcAV5F2VRGJg 3sXN0vCmNK8HXKXM4+H8lJ5Qj3sZQ1Dc0aIwohXw3v8g+vP6IBumDFlRAS/4TwFU9xgU tKvbrVvgRwOCa4ZC6FIIM4e2zydo055dVr9CUSd0/CAXjyWTBSeWCzqOY/iCJDQeoWuo tTgQ== 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=XmXI+n3NwzrulGFb5noGXlJMzCZEz3A1YQMLG4RxmDo=; b=S1T08oz2fNIrCHNDIYBhWo5+iRj1mozYyYpXWZ2taxRqfkkRO0QnYbUsCafbOsombZ G2Kmcbc8CpqPk2dyi7aCv5oJw51/YVglqP0ewhF9Aw0tdoIF0UI1MDmayAafLAX7oxW3 PTxfImfSsDdZuEnno0MvVuzV3nvHPc3fYsmoTs8QMXXun8LJOeQGhEwF2H3MxIWAZaua XUuSJjKJBZeSi9vnP7RK3TKzoJurU8W9bwUWwBNKpgFDGiFIlo9xnVPt1oF/CC7Gyt7D 8O7aNPxiCbJo3b3MmqFbMHfhJrIAIIdj+bYhCvhk5dv3kdPHW9Iv3xroHRifv2wkg87b UgXg== X-Gm-Message-State: ANoB5pn4x8UIefAogewpFD4xrNiD4Bbu4xyDrGxw2zY9X9W4u8sY8peT SycSJDqwluKRK5Awr3SAaneciPD2VmtfDaFp X-Google-Smtp-Source: AA0mqf5EPrdSQi7H8QG9/4558/8a+pt8P+lKr5IlYH7uMi9qk9BQR9y98YQo/aPR1SVk08uRq4FFvA== X-Received: by 2002:ac8:6e87:0:b0:3a8:2ab9:7f9c with SMTP id c7-20020ac86e87000000b003a82ab97f9cmr37600319qtv.57.1671561279064; Tue, 20 Dec 2022 10:34:39 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:38 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:22 -0500 Message-Id: <20221220183427.31752-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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]: Use gexps. [phases] {set-environment}: Look also in native-inputs (for cross-compilation). [native-inputs]: Remove input labels and use modify-inputs. --- 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 6893d12745..7e78b9af41 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1145,17 +1145,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 Tue Dec 20 18:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45475 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 3B27627BBED; Tue, 20 Dec 2022 18:50: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 CB02627BBE9 for ; Tue, 20 Dec 2022 18:50:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hST-0008EH-Hy; Tue, 20 Dec 2022 13:35:21 -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 1p7hSG-00089F-RP for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSC-0000Gh-Nq for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSC-0004JO-K2 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 5/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156129116507 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRy-0004Hz-Ax for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:50 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:44601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRt-0004Gs-Qh for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:46 -0500 Received: by mail-qt1-f176.google.com with SMTP id c11so3887146qtn.11 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:45 -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=3zCyxb5K5VdB2W8TGIbeGchvmYcJpl78QbfX399jlAk=; b=PartcC9qCkotdcmT3RRoT95Rkw/INWPrHodAfe1NZ3Kle376lZfXAbuk9rShwoSUAd OMCr1dn3njm9iCntGhE4XSy8RmNuHuRiuC3qa9kWl0PC4Ps4e1qXCpPNlt0TIPJGfrvq ZYcd1jMYhwKVH6MNqhl1YNUgMDXMyF8eZEKaPeb2jwps5T4vUmQN2M4wq9VXtslmQIrh LNqd3izIQKygAduiDBqKWDrosq40q2K++YPITwoSDW9nQ7ZMNxlySnE2b1yqLLsCKWK9 rX6RlfGGrkXcCDXH/1qYDMYZyIjwaqY/yBQK75wbu8y6XA4XMpz3++FuyKtfMvyluy0N EOTA== 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=3zCyxb5K5VdB2W8TGIbeGchvmYcJpl78QbfX399jlAk=; b=K1QueGkBjwamDSi9Ud+PkaLbL6UbcCQrmLTQxDfWOE7qsxFPlw156Kb+R3cImfhcqM BSJk319fb/7Ap6v8GH4907UP7SBgPcPyQpXcH/AB+gQh5vLdZzO1xqEoexogP3r9B7o5 TA3UgtQzpzB/r1R5+B1YIxVG7RogsD5i0cQCt0OHOmSAZje8vyu2J5n+/uDzOYZTyOL2 AsWqDDKlZOD8SFKlEoi2npXgVUJiZ778h/n2lIN4kbFZeW6NlakEMe2MboEaZG4NRj0P z441MRdpeihlRWeVP7JJN34xBTRh+hdUSNkqAWD3oVOwDftBa9/T1NKGDhufEpUoSSCL 0NxQ== X-Gm-Message-State: ANoB5plB+HlwZU/GzqgA8FIXz5hzllceMxxNQWmcVHi+LmfZAiFLGsPX nswXQZBJZfAu1Z04/JSc5TD6NwbKA1FxNBxH X-Google-Smtp-Source: AA0mqf7uFjwC946egqG0QsD8oMqDEUr0mwSYs1S6fsogsashH+Ps4oGV6maKVIZmsVjXxBZ4BMM3MA== X-Received: by 2002:ac8:5406:0:b0:3a7:eb2c:efea with SMTP id b6-20020ac85406000000b003a7eb2cefeamr62648215qtq.19.1671561280181; Tue, 20 Dec 2022 10:34:40 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:39 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:23 -0500 Message-Id: <20221220183427.31752-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 7e78b9af41..ae847080d0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1080,16 +1080,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 Tue Dec 20 18:34:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45478 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 973A727BBEB; Tue, 20 Dec 2022 18:53:24 +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 7444627BBE9 for ; Tue, 20 Dec 2022 18:53:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSR-0008D1-CI; Tue, 20 Dec 2022 13:35:19 -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 1p7hSG-00089H-Rk for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSD-0000Gk-46 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004JV-0L for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 6/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156129116514 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRy-0004IC-QV for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:51 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:40850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRu-0004Gt-M1 for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:46 -0500 Received: by mail-qt1-f171.google.com with SMTP id jr11so11739245qtb.7 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:46 -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=HM6NnJKbGSk6J7+g/gAHeaFV2qGk9YZ33AspqVW9ejU=; b=nNKJRoy4je2OSv0miRoGC1gyLqLD6spUMzDD8o92Wm6FdC83pni21O27LzACKbrGAx 71ft0XpzhMJpQyO48+cfKy0Uo+2dhJv7hmGXV8aGZYlx2KQATLTCrDjSlMB+ZDpilFJ0 NqNBl9AHaIvY292nJLERp/MnvrcB6G8TIgr8KV4O+V+GIVdEeT1P2O1FsEw/Dlc9LBzu eTilm2AG7oT6gbUlRqWq9fh2KfpeI67Q95bWUfWm2NrLxjgBokSjdW44ni62042/85Hj ktF4O2N42l1xGTr1s3TgC2hgoFzQBvGZO6nmPUc3yamdCIh2OdgJfXWJJUq8qH/L2JwT u+fA== 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=HM6NnJKbGSk6J7+g/gAHeaFV2qGk9YZ33AspqVW9ejU=; b=lFdE8EJyxSCXCsI7+TojY9aKSW5T3MOTzJGFDGnl4nSRk1zTI16uULSFvGWZCBJP9k 4IMJpU3EyBUyvWJZwZUXtx+hBDpNt0CZbU/6pU1aqt5f0mnrOHh3OXrJnK9MAw+NxTy1 tznUt7Ye1lxNdKWM/EfuxIH9bneiHmLTWnF/qWZ7t9iRF7hQC9BUNWcU5XZtRTxDI3Ua AYeKdlWRldJX9cJ+sQU2xabaYxepNGdDv420VI7anrmsUPyL+KNbNjejoK9jQHK8v1Jj kmFEXL4XjU8zIX8iyMXRF3NhiakVL7bmrksp0+jCmTcXPQHiRJS9Pvw50jzcklQrww2r Ic2A== X-Gm-Message-State: ANoB5pkMnDMxaeUKo8WxgfrY9M+0QbxPOYuVrFv7VRa5jlrOahEXgGBO 6isWDk5mA63+N3ksNqoG5wwTIPiyUSme+nEA X-Google-Smtp-Source: AA0mqf5nDmfH+OHOXg0uomXuLxSH3if03H4hzJsjTQzbXL08y3O1UOyzXPyTCJzAUxDGVG2KJOR1dg== X-Received: by 2002:ac8:5206:0:b0:3a8:496:19aa with SMTP id r6-20020ac85206000000b003a8049619aamr58566028qtn.4.1671561281188; Tue, 20 Dec 2022 10:34:41 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:40 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:24 -0500 Message-Id: <20221220183427.31752-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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 due to the package being a true cross-build. --- 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 ae847080d0..5f0182524d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -925,17 +925,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 Tue Dec 20 18:34:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45472 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 20A9C27BBED; Tue, 20 Dec 2022 18:47: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 8852F27BBE9 for ; Tue, 20 Dec 2022 18:47:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSV-0008FO-Ec; Tue, 20 Dec 2022 13:35:23 -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 1p7hSG-00089D-Qj for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSD-0000Gl-GD for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004Jc-Cu for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 7/9] gnu: u-boot-rock64-rk3328: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156129116520 (code B ref 60224); Tue, 20 Dec 2022 18:35:05 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRz-0004IJ-5k for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:51 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:43588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRv-0004Gz-SB for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:48 -0500 Received: by mail-qt1-f182.google.com with SMTP id a16so11730064qtw.10 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:47 -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=JF/ncMgHASMKxyznQusw5njhOOWQoxRdlp3MW/TUu9c=; b=CyVYsHBZ3cuL2pragLsiUN8vjA412fMs9pt2qXUQqBic4A6QjaZEUsLM8Ih/QeeNtl O8Efj971fAejscbDvI8Fd1mYUNAAKM6Ne7rhyvw2eaM3cQoB3+UVfTywIymXpDaccVs+ L7/f+SUusYr00gvSJeJmkFyAhxawe6GT0cnvIb7Zqxw79Ob8LNCdRDJ76zqoPZRdhm5R p1CeJ4YS6vxITTQhWL6qVKisPa7nb/wk05qRc7tz0Fer98xrYoQylpHbv6ZyznOJboIx mpVwK+pzs4pbAWo05OoahrQXf3CoVT/JBQ7YGAuhUFoNr7xsvhkqSpnDraiCJMGlaDqY wCcw== 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=JF/ncMgHASMKxyznQusw5njhOOWQoxRdlp3MW/TUu9c=; b=6tTz9xkDrtR3HyZAZd7u12jfM+n7GY2xNxVCVpwlKuNCWL6cSZdpKcvy3hMG9CwBez oVLARA5wgzF31GuMGrz1yqP6/DOLGI1EKSlKkmUwAQty10zMeg6eCZWrF//qLcbET9Km DqdYRdMxw7SERoPESBN+Z6F4RopPWFxcAh4ROd8GjLH3N/jUN1WceVDhVmrE36xrYbkJ SOSUdvjDYKBTPo/8jna6SZPDcnQK+YFFegvh+mPM7Fnms5kCOJ7c+GZyoR3fLyk0yUQA 3dhJ+7zvumbYgFBZSke1DAuKQ9MrTiGgWtC8G7MDIF6FPFwNdcLvNyHdkmKiScQ0zCLO rlZg== X-Gm-Message-State: AFqh2kpe5ac+mDRZqRzQgQ+pUdmZQEK8lnP4w+uCnT4IgAsvuGv+hm2m yIyKLGPNLd7udYDIVOGVmMhUOc6r/pREA0Tv X-Google-Smtp-Source: AMrXdXv2TAzQE230aRSL8lNdQgSzKQ6WYYjFuJP1gPm5hy2qGSDDJ0NM1XAccDznrcqv0aGWt8ynLQ== X-Received: by 2002:ac8:507:0:b0:3a9:7faf:d635 with SMTP id u7-20020ac80507000000b003a97fafd635mr15455467qtg.1.1671561282243; Tue, 20 Dec 2022 10:34:42 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:41 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:25 -0500 Message-Id: <20221220183427.31752-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 5f0182524d..ce7be6f7b1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1061,14 +1061,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 Tue Dec 20 18:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45471 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 AE0C727BBE9; Tue, 20 Dec 2022 18:44:29 +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 5678127BBEB for ; Tue, 20 Dec 2022 18:44:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSL-0008Bw-EV; Tue, 20 Dec 2022 13:35:14 -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 1p7hSG-00089K-Sa for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSE-0000Gm-0S for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004Jj-On for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 8/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156130316547 (code B ref 60224); Tue, 20 Dec 2022 18:35:05 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:35:03 +0000 Received: from localhost ([127.0.0.1]:46480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSA-0004Im-IE for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:02 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:42938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRx-0004HD-3Z for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:49 -0500 Received: by mail-qt1-f170.google.com with SMTP id i20so11737589qtw.9 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:49 -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=rLAbkqSUh3FJ0hRFx6EspuZRuc3JcG7Lb4vxiJCGejI=; b=dfE66axutUbOZsikIwbxPqp9sZmPs7ydAYXGLCNb1MH6xKcwrIUAIw85AEPiINSGyo cl/rgBE/x3BYhVlSEe1VAW405BL1EEhbwo8lciUCQWrdH9btJzhUxEIh2EJw7D1E+k7E mezoEUdOlOzlK76llFAlaQi14pmJ8EmfHm43dcLRc7DGQrE/q8wKsIwerUjgjnwPbjmS d+H62Wbxq8BA5bXulF2hK3VL4JLK+cT2j0nI/PlCm/XliLLMm9d4duzy1EKYS0xZvM+e ic3rPJvRNdiUcW70bjnc0LAlHstmIWdOG+L2AOqNRx+b0QTMp+sfplDg8zqUiJbDlB6/ M21Q== 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=rLAbkqSUh3FJ0hRFx6EspuZRuc3JcG7Lb4vxiJCGejI=; b=CwQbbkLhcNYjq14kf8h6g1DKGbuOn/1nLBFzCT+eJ4c9vSlZaqTfiHo2LccEVgp1XX LbeIsoaUd+aPOPI6gjWDz1hlecM4IZfKsh12CL3P2L3u3JetfRELKENT4ytO6Z+ySRFA htkmUrs7st3fNQ/cVff7r1hDLHpR91oNEn4qCPrbbr8LN+hOySjJJC6ByIX6dFG0yNv0 2kK8+F3yZiqeZr/GREgOnvBWwON2Q2mWZEpil260cEStcQCLPwNIWvDWUzAgCDMf1dQJ yrftw9WRb7WtmNbF7OHOw+1Ah6WrhC0gKLJ7hC4Mo8/bHo2O2v2Dvm0rEQ5zGkbqFJIp AGTg== X-Gm-Message-State: AFqh2kryJ3xSXnWYl2dL8Af8EARdwVvvItXGBzlNvuzw2YpAoUK+lcux sAAIRWqJJumzvHrsm+f0oKz1DuBeQAEKwK8l X-Google-Smtp-Source: AMrXdXvJWi73TG7OcNGxISuZYVgNQe291uGdMxMvDeISWkMV5AhuGrfV4eP18IZnwrw/Gr1NpkL3Vg== X-Received: by 2002:a05:622a:1f17:b0:3a9:8370:63d4 with SMTP id ca23-20020a05622a1f1700b003a9837063d4mr5238926qtb.42.1671561283494; Tue, 20 Dec 2022 10:34:43 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:43 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:26 -0500 Message-Id: <20221220183427.31752-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 ce7be6f7b1..fa11fa4bc7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1044,15 +1044,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 Tue Dec 20 18:34:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45479 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 D93AC27BBED; Tue, 20 Dec 2022 18:53:28 +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 6DE9027BBE9 for ; Tue, 20 Dec 2022 18:53:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSR-0008Di-N3; Tue, 20 Dec 2022 13:35:19 -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 1p7hSG-00089C-Q6 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSE-0000Go-Dm for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSE-0004Jr-AO for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 9/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156130316560 (code B ref 60224); Tue, 20 Dec 2022 18:35:06 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:35:03 +0000 Received: from localhost ([127.0.0.1]:46482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSA-0004Iv-W0 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:03 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:36501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRy-0004HQ-2A for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:50 -0500 Received: by mail-qt1-f178.google.com with SMTP id bq12so1596412qtb.3 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:50 -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=DTbynDdJn39J6XYmmLqr26vVkP/2mqny694wgyrtBFM=; b=fU/2g7UNzqA4URdVvpmeMQb5pXevtDb4cvjpEWaK2qLpSv729HcDiQK0caeIFPK4hE u8xmY8w4xEC5xvkJZpr7s0l4AEUDHmPcUWHJxswlPiNNYh8wqt0MRsagH9o/gmENqZUl XfV5hhOYzo7BpPu7iZvUUuJ2dtsPQPYZ2TkN08Y7fNhC9DAxUcxqEOL57UM/a/1XaAYd /TRfeJW0jMDhWOgVsRfBlnzzbapk5HrSaVXqn7oIlZsDh3OxIVes58q6DX25INrAMyH5 G9WexHi0eBmJuue1bd2Og7I5bn07BJhmSVITkdolAljFsMIQBntxXoZL50i2wUTt0q5a taRQ== 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=DTbynDdJn39J6XYmmLqr26vVkP/2mqny694wgyrtBFM=; b=KLWEUh8uLDS57qsQHztiY2iwfv7ZuxhVq1lS/psKpTlcTzpyNOiG6RxEGksjN2OLIK 0ep7itWbvnwnpIhSKbCBgUK8WO9XBMQWqjIIFgySWzttD2WOqRKXeRWO0C161K37pM69 eObVooiPpntnZsfmoOJ0E+zQqySyBZBFccPnsrPTOPq+uQYAtflQDTpwWkkVZAqpywXI VkyP3VXA7jBJQ4EfiJqozmft9jx+saCPfhWo9n+wXvkq/PMi/vbr6sza9udjjWrlG1SC oTN7AyTykPwFL8ym56WU6bOTOCiQ5olAZjjaqFs9WIaNaqWXftdm2Wqwv5OWkk/OoOvC xcig== X-Gm-Message-State: ANoB5pnMZgPGJ+RPjcqIym1Zh6uZk8qr/EVjhJQa0KGZcbwdasHJ5zpl rR89iApq3rPoB15CT9bP3Y0gzZoj4Vqa+dNx X-Google-Smtp-Source: AA0mqf6ndInfBkjgYCkTJoMJM2yPOzAfXpOc1ixjuo1f3FOBh3loJ4KLvezXkIT6IPKt+jTqgr87bw== X-Received: by 2002:ac8:72c8:0:b0:3a8:efd:2ef0 with SMTP id o8-20020ac872c8000000b003a80efd2ef0mr50737997qtp.60.1671561284560; Tue, 20 Dec 2022 10:34:44 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:44 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:27 -0500 Message-Id: <20221220183427.31752-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-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. --- 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 fa11fa4bc7..738f3975f5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1010,23 +1010,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"))