From unknown Sun Aug 17 10:16:23 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60224 <60224@debbugs.gnu.org> To: bug#60224 <60224@debbugs.gnu.org> Subject: Status: [PATCH 0/9] Improvements to our u-boot tooling Reply-To: bug#60224 <60224@debbugs.gnu.org> Date: Sun, 17 Aug 2025 17:16:23 +0000 retitle 60224 [PATCH 0/9] Improvements to our u-boot tooling reassign 60224 guix-patches submitter 60224 Maxim Cournoyer severity 60224 normal tag 60224 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 11:51:02 2022 Received: (at submit) by debbugs.gnu.org; 20 Dec 2022 16:51:02 +0000 Received: from localhost ([127.0.0.1]:45912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7fpW-0006oK-78 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 11:51:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:36368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7fpU-0006o4-2l for submit@debbugs.gnu.org; Tue, 20 Dec 2022 11:51:00 -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 1p7fpR-0007Lm-In for guix-patches@gnu.org; Tue, 20 Dec 2022 11:50:57 -0500 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7fpK-0007yy-PT for guix-patches@gnu.org; Tue, 20 Dec 2022 11:50:57 -0500 Received: by mail-qt1-x82b.google.com with SMTP id h26so7560385qtu.2 for ; Tue, 20 Dec 2022 08:50:50 -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=j+6vPTiVtc1cGDCZy+F60tNHlTCg2hQOIoe+AUuwdRI=; b=GTbXQEAaUzCN8fPnaI1YCZpm8fr44bWnNzu9opf0FCvu2R1Sf+Taqaa1n8tsh4vPPC L9t0nXsDMfK6xniC6OySEImKCcl17XuFWL+mWLgqGIqiFL4/ld90wCaCFUY4L/9H400l ynB+zMkbkpVg71XqO49FnF4/ASlIcwr8zMUVsymem5/+qH7wVf6H6o95yiah21sRVarK X77geH0hn4EDZOuerO2E5o80LTJs+/s/S/+b9rCOV0WZC5oaapjhLCDsrVazlXyxEyjV Dp2I6ISDn/KzGuGUI0J2x7bbQNgma0/D2BsSmCaA+8aS8ERpJz9qFj5jNkT69ps4YzIs OuGg== 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=j+6vPTiVtc1cGDCZy+F60tNHlTCg2hQOIoe+AUuwdRI=; b=wYCnXcqnYLfjkGINJP2qtzcIR7LQ0dPUvggFkLc5ILUOK638vixtnZkWCfkGbA7yb/ Qbkt3c6rJxgFmt744veejzBe85aU6rJPwa3WangpIrQi+YJYLO50yAgbulGQ/fFwO2SK KJszMlTfsxyRARmvs8KF49VTgXWwFGlYubVze6Sqx+02H3R81INn1DiqedPcv9p3Ssqn P7ucJL/ZIM0JLNziK5EcLPsNi0FJpS1jEg7BFWzcQt6ejBXrkO0JvoyVt17T1SEqsmql Sf118BE/HYQkITBSQ0nkWU9McEiC7+LfojOPMkGQvYL2KWOVSs/yABE2+wrybellj8RS Z5dg== X-Gm-Message-State: AFqh2kr6XY2BcCN2eI/wO7TV19yXoVAla4YvCKK7TbZqywnjlo2E2le2 78jSqsmkdK5pT5SYQcn1uvZ4g7sx/agLaw== X-Google-Smtp-Source: AMrXdXuaeRZv1KzMHjsXkxL5rGCMyjO58T7uWNMB82apGus0uh9VVlg410ELcmNX6pBvPNA0w9XIUg== X-Received: by 2002:ac8:5403:0:b0:3a9:926a:4125 with SMTP id b3-20020ac85403000000b003a9926a4125mr6853128qtq.47.1671555047720; Tue, 20 Dec 2022 08:50:47 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id z26-20020ac8711a000000b003a816011d51sm7803538qto.38.2022.12.20.08.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 08:50:47 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/9] Improvements to our u-boot tooling Date: Tue, 20 Dec 2022 11:50:38 -0500 Message-Id: <20221220165038.25114-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This series include a few changes that were useful or needed to build U-Boot for the i.MX6, notably installation of the u-boot.imx image. It also cleans up things for cross-compilation, no longer explicitly adding cross-gcc and cross-binutils, leaving the build system taking care of that. The two first commits of this series were previously submitted as #59761, now extracted and submitted here for transparency, with fixes for impacted u-boot packages that broke because the move to use gexps. Maxim Cournoyer (9): gnu: make-u-boot-package: Add a u-boot argument and use gexps. gnu: make-u-boot-package: Install .imx files. gnu: make-uboot-package: Simplify build. gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. gnu: u-boot-rock64-rk3328: Fix build. gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package. gnu/packages/bootloaders.scm | 295 +++++++++++++++++------------------ 1 file changed, 144 insertions(+), 151 deletions(-) base-commit: 1a3d8b922863c22f612ea679d9419bb457874fdf -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:43 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 1/9] gnu: make-u-boot-package: Add a u-boot argument and use gexps. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:44 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 2/9] gnu: make-u-boot-package: Install .imx files. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:49 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 3/9] gnu: make-uboot-package: Simplify build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:50 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 4/9] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:50 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 5/9] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:51 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 6/9] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:34:51 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 7/9] gnu: u-boot-rock64-rk3328: Fix build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:35:02 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:35:03 2022 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 To: 60224@debbugs.gnu.org Subject: [PATCH 9/9] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 20 13:35:12 2022 Received: (at control) by debbugs.gnu.org; 20 Dec 2022 18:35:12 +0000 Received: from localhost ([127.0.0.1]:46493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSK-0004KD-HH for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:40614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hSJ-0004Jp-79 for control@debbugs.gnu.org; Tue, 20 Dec 2022 13:35:11 -0500 Received: by mail-qv1-f51.google.com with SMTP id h10so8773147qvq.7 for ; Tue, 20 Dec 2022 10:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=YycOApN1gvkmgdp+cziRc339Jin2QmY/xWDUcUVpdwE=; b=VgOPaXsF3G+b536VqBc1iWDgu8CPrj7YweVaXdVmngIoovQ0z/9U7n1KCZZK+y25Nf 935LwqZU3lzojNwcXEcPmxPzmd0JIExhLdUMMxb5ZSNkl6omfvT58o9rHqfxW3JJR7al qxGLpz9AGy1OAXNu6ecnuFlea25RMjg8+HfZKtyCDqaSDocyQa02CHpsdVwqOkEPZyRz NDD0lyeMB5DoKgPR0hTQ+zWuukv9H8C11H2NyrFTNCBAn8Pm6jCiVTiyJ0tWQSNz+lwM 88C57cwsrnHHoBewpx62p/moFu7KmyfmqxysLO0SCttXAZvc2TN4MYDo7fiEe1qeOmwt mISg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YycOApN1gvkmgdp+cziRc339Jin2QmY/xWDUcUVpdwE=; b=eMUoBedVdvszac8roNEhXQn+u3GyH9WeGXe0xIp/99K2NE8Ha4gVPV2hHOZpGixIkq O0RVB8f+B1JejeD9R/262GakzHc4ZoUkD0nx4E2JoH3JwgDKLU8LixRNcZ6w4bcpbv0S l4zagVn9kC9pSa0r7JQgT6Xe8lXGoV6hX8DP0ynP4NP1z8wY9cksmLNJuPAfHzWmrYxG pmF2OlSxqn7l7aOyUUAbxUaSaJi2U7UEzghpoZXitvoB1Wb9q/YGkh6VH5ToHfwfoNhC O+78Ol/MvnFzwh+fGjQ6IuKj9slU/7qERPqF8AVOeX423ftZ0AKBGwIchuGaeWIVRbpR zUMw== X-Gm-Message-State: ANoB5pnkFljpzCXmsysYn+MOh6G3KZX+kZe/OquAaM3eEdqbQMd2ikgO D405pCpVDvUKUEeM56CLkdSp6NG8jwXvO8M7 X-Google-Smtp-Source: AA0mqf7Qon7Z6mK07onz0/AtAb8UDEv8RryjbC2QZaI3DPFJGaEcafnVT8s5x52ze6Ky4FCq8Y/Bmg== X-Received: by 2002:a05:6214:2b92:b0:4c7:884a:9691 with SMTP id kr18-20020a0562142b9200b004c7884a9691mr64030032qvb.0.1671561305534; Tue, 20 Dec 2022 10:35:05 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id n17-20020a05620a223100b006fc40dafaa2sm8935166qkh.8.2022.12.20.10.35.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:35:05 -0800 (PST) Date: Tue, 20 Dec 2022 13:35:04 -0500 Message-Id: <87ili553fr.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #59761 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 59761 by 60224 quit From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 29 14:31:34 2022 Received: (at 60224) by debbugs.gnu.org; 29 Dec 2022 19:31:34 +0000 Received: from localhost ([127.0.0.1]:32932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAyco-0003FS-40 for submit@debbugs.gnu.org; Thu, 29 Dec 2022 14:31:34 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAycl-0003FI-LE for 60224@debbugs.gnu.org; Thu, 29 Dec 2022 14:31:32 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1672342288; cv=none; d=zohomail.com; s=zohoarc; b=GAfN3Aa0C8hFDHx2SSDlMuzCdp4AzJpRks2ixK6PYuifAX9K3TAgp6vGwTAdL/Zoa3uhZb1FAmdsnXy6bvs9/FYXpyLcKhBN0pC8qeW2s6nUPzB5NX0tUSnVKLoDmxPczoq6VUNvtnQ+LEDwqBZSli/wj6tk6VKcwp60Y3GEZL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672342288; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=oCgCA8EbJysi172w/JI+04+4z7w/5KlCyl9zQberwL8=; b=dIZ9qcYZhBAkrJgnjMkTHw6zJ6t5PMd8EvKAFUmPdfhmRKC/6n7HLwDXpRTSjMkGeXT5s/1ZbbtmAfip17WpUb0+QoRGqSvsXw4GwSTQGzb+hstbZtDPKSbja5XOBAjFUS78eMIE/jUFnNPLvoEDptUd6Pnwu3fkXJZzkdR3f28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672342288; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=oCgCA8EbJysi172w/JI+04+4z7w/5KlCyl9zQberwL8=; b=NMWLd1jztASVWyAHKxOTFF3F8d3i/mFAYSdyK7jyR3ttf43IsmR94/hAt30C0VIJ kZc/g9uudPb5mSSP5XdQLO4MyIT0vKv8fQvUX7P/Baqht31FcTTthppyZ0W+dDQzFa9 8SpghFwCYIzXixaP7DhfU9DG/msICNdOhOWNPIts= Received: from localhost (1-108-142-46.pool.kielnet.net [46.142.108.1]) by mx.zohomail.com with SMTPS id 1672342288359792.899864027087; Thu, 29 Dec 2022 11:31:28 -0800 (PST) User-agent: mu4e 1.8.13; emacs 28.2 From: Ricardo Wurmus To: 60224@debbugs.gnu.org Subject: [PATCH 0/9] Improvements to our u-boot tooling Date: Thu, 29 Dec 2022 20:18:57 +0100 X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <875ydu9fch.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, this looks reasonable to me. Some comments below. A minor comment about the first patch: you still bind =E2=80=9Coutputs=E2= =80=9D in the build phases, but since you=E2=80=99re using #$output anyway this value is = never used. [PATCH 3/9] introduces a comment in the definition of =E2=80=9Cnative-build= ?=E2=80=9D, which references %current-target-system, yet only %current-system is used. Is this a mistake? [PATCH 4/9] =E2=80=94 This one appends arm-trusted-firmware-rk3399 instead = of prepending it. This differs from how it was done with the labeled inputs. Does this have any consequences? Is the =E2=80=9Cfirmware=E2=80= =9D label used anywhere (such as downstream packages)? The same applies to patches 5/9, 7/9, and 8/9. [PATCH 6/9] =E2=80=94 The change from .bin to .elf confuses me. Is this du= e to the fact that =E2=80=9Ctarget=E2=80=9D is now actually set and the package buil= d thus behaves differently? [PATCH 8/9] removes a reference to =E2=80=9Cfirware=E2=80=9D; this answers = my question to patch 4/9, but perhaps other such references remain? --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:28:02 2023 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:28:02 +0000 Received: from localhost ([127.0.0.1]:42039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8gM-0006kc-AS for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:28:02 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8gK-0006kJ-1f for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:28:00 -0500 Received: by mail-qt1-f173.google.com with SMTP id h26so21475115qtu.2 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=7r0C5DKD3jPh5WQGJcj3Hp1yaCD+OUARAreqsh+jbd4=; b=Vjz4Vrl9NXmUfIAK/IbylMXlEGvjKiTvWNtR5/UrUGGCylQxKA0HH6qIbv9/uxDJZ6 nYcNUVf5L195DdSVuBO7odZACE5POi+N15Jz6QTRo5xf9HXsQC6TP34JuO5cG+eYrBSc s/yAlzmASkt07Ve1UR2pt6s67CJUmayhEaKAQaxTJ2TfbkBgV/HzxX+7yfIvJBAFsR+m aldAjUeyiyD+QJ8uzJJPiN1JA5qb9b6Wyevz1QLlHHWqOdM4aXyPC0fYbPLADWOwY8wV mhE/ldjeHvhY+Bqmu4+903leKg9ctzv67DI1CtDOFq2DnnlBUvIjqu3Kx56ZxcopM5jV wATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7r0C5DKD3jPh5WQGJcj3Hp1yaCD+OUARAreqsh+jbd4=; b=VLjrmcusxqAeMFHhYCESobs2pSn+ru51iCKLH4flC2MC23tGxvPr7vj7e+4Zljdgpt SeREDHAMnTPajYQBvsJ1TTOIWlCKpGef/7qBT6qdHpHyr+/YY2K7mpmpT85HZsDxOgwy BtIwx5BHrTZh61IvfaocslEmNkPBIYIYJOkq9QdHiBCc3iRZw9thJeHNAvr+DJRpUApv nWSwUgVAhVdeQjgv/UcpCBbUUJCNWGN0G+zyt//GqPQ2PbCy2pW2uahsOjVg+R3iTU1F ykYOnLTEDB5SgrJp/PPozwuhB9jBCtIYMF6sT2LxyUt94JQotqFU/A2E7kE35WpPpzwm d+pQ== X-Gm-Message-State: AFqh2kpMK3L2peN8N8a98COiWW2QtFjm8AAs/UIhc2Eqt6BbqzsENiQK WU8rDmCla8R/mcaR0NPaSdZT7tqPyDJiiQ== X-Google-Smtp-Source: AMrXdXvnq+X5aBdT59L7KLysZba1RONYlWrY273Dq9FxlCQ2M1cnYt0VdYJ9Jqb40YZU6qwJ6FEOVg== X-Received: by 2002:ac8:568a:0:b0:3a6:348c:5159 with SMTP id h10-20020ac8568a000000b003a6348c5159mr47227398qta.26.1672619274425; Sun, 01 Jan 2023 16:27:54 -0800 (PST) Received: from hurd (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id t1-20020ac865c1000000b003a7e4129f83sm16436302qto.85.2023.01.01.16.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:27:53 -0800 (PST) From: Maxim Cournoyer To: Ricardo Wurmus Subject: Re: bug#60224: [PATCH 0/9] Improvements to our u-boot tooling References: <20221220165038.25114-1-maxim.cournoyer@gmail.com> <875ydu9fch.fsf@elephly.net> Date: Sun, 01 Jan 2023 19:27:52 -0500 In-Reply-To: <875ydu9fch.fsf@elephly.net> (Ricardo Wurmus's message of "Thu, 29 Dec 2022 20:18:57 +0100") Message-ID: <875ydp4w6v.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: 60224@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ricardo! Ricardo Wurmus writes: > Hi Maxim, > > this looks reasonable to me. Some comments below. Sorry for the late reply, it hadn't reached my INBOX (please keep me in CC to ensure it does :-)). > A minor comment about the first patch: you still bind =E2=80=9Coutputs=E2= =80=9D in the > build phases, but since you=E2=80=99re using #$output anyway this value i= s never > used. Fixed! > [PATCH 3/9] introduces a comment in the definition of =E2=80=9Cnative-bui= ld?=E2=80=9D, > which references %current-target-system, yet only %current-system is > used. Is this a mistake? Fixed! > [PATCH 4/9] =E2=80=94 This one appends arm-trusted-firmware-rk3399 instea= d of > prepending it. This differs from how it was done with the labeled > inputs. Does this have any consequences? Is the =E2=80=9Cfirmware=E2=80= =9D label used > anywhere (such as downstream packages)? The same applies to patches > 5/9, 7/9, and 8/9. I don't think it matters; the base u-boot package which gets used doesn't include any "firmware" input, and the file provided via arm-trusted-firmware-rk3399 is searched via "search-input-file". I've grepped for 'assoc-ref.*"firmware"' and there doesn't seem to be any remnants except for u-boot-rockpro64-rk3399, which I've now fixed in the last commit. > [PATCH 6/9] =E2=80=94 The change from .bin to .elf confuses me. Is this = due to the > fact that =E2=80=9Ctarget=E2=80=9D is now actually set and the package bu= ild thus > behaves differently? I think so. I was puzzled by it too, especially since some packages already were searching for a .elf file rather than a .bin file. > [PATCH 8/9] removes a reference to =E2=80=9Cfirware=E2=80=9D; this answer= s my question > to patch 4/9, but perhaps other such references remain? Answered above. Thanks for the review! v3 will appear shortly. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:46:57 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 02/11] gnu: make-u-boot-package: Install .imx files. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:46:58 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 01/11] gnu: make-u-boot-package: Add a u-boot argument and use gexps. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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")) base-commit: d7a9d72bb02a2a3b1a99183655bf878547116032 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:46:58 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 03/11] gnu: make-uboot-package: Simplify build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:01 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 04/11] gnu: make-u-boot-package: Allow disabling cross-compilation. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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-" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:01 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 10/11] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:02 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 05/11] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:03 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 06/11] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:04 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 07/11] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:05 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 08/11] gnu: u-boot-rock64-rk3328: Fix build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:07 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 11/11] gnu: u-boot-rockpro64-rk3399: Fix build. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 01 19:47:12 2023 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 To: 60224@debbugs.gnu.org Subject: [PATCH v3 09/11] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 12:09:46 2023 Received: (at 60224) by debbugs.gnu.org; 6 Jan 2023 17:09:46 +0000 Received: from localhost ([127.0.0.1]:55733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqDx-0002vt-QW for submit@debbugs.gnu.org; Fri, 06 Jan 2023 12:09:46 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqDv-0002vc-6R for 60224@debbugs.gnu.org; Fri, 06 Jan 2023 12:09:43 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:40]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 17B3B1AB39; Fri, 6 Jan 2023 09:09:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1673024976; bh=eK6VtbaomKkYNdsOhgGuJzuHxsGujpTmSCdLin217SE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=D4kuMoglCP+r1fwepuPrgh23cb21Nd2UBQpTEzb2x7Tc99DReiVti3vvKy5O+5M01 9w1e470L5qJyPJTcY8gR0QqzHlGjURekTo0Bc6ejUS1gGKhVKsKKjnmvfOaqgUouzy yOznvLa4EJYp6fd5aBa6Vcdr6UwWFo2XF/fybyj5b+ol4m7nEZrX61qNwz1yLwGtR+ pUwxi9YPofMVyQy0eXZH0kEClCvOabWYxPWjrdRCztjRa/j4ZXYjqoTYMC/sJ7RJV4 yShABNyVjmRdB7PyNVXAXtAuxYg29j492ANJK0hq+4EziTMoVUWndrXaLCpTlhMM6i dCBsltWCPURIg== From: Vagrant Cascadian To: Maxim Cournoyer , 60224@debbugs.gnu.org Subject: Re: [bug#60224] [PATCH v3 10/11] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package. In-Reply-To: <20230102004637.3920-10-maxim.cournoyer@gmail.com> References: <20230102004637.3920-1-maxim.cournoyer@gmail.com> <20230102004637.3920-10-maxim.cournoyer@gmail.com> Date: Fri, 06 Jan 2023 09:09:31 -0800 Message-ID: <87mt6vk2t0.fsf@yucca> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-01-01, Maxim Cournoyer wrote: > * gnu/packages/bootloaders.scm (u-boot-puma-rk3399): Use make-u-boot-sunx= i64-package. ... > 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")) >=20=20 > (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")) This is definitely not a sunxi64 platform (sunxi ~=3D the community name for allwinner platforms, and rk3399 is rockchip based), so either the make-u-boot-sunx64-package has been overgeneralized and should be renamed, or this is just not right... live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY7hVywAKCRDcUY/If5cW qnqyAP9vBuOfZ4tqoGCaCVIM8e3hklrtO9KpP54dM57KQmnkLgD8Cv9PrB5QyPZc spE+s4RNtwsRq0svSr1GV/H2NevQJQk= =1B8i -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 12:17:27 2023 Received: (at 60224) by debbugs.gnu.org; 6 Jan 2023 17:17:27 +0000 Received: from localhost ([127.0.0.1]:55742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqLP-0005RC-0X for submit@debbugs.gnu.org; Fri, 06 Jan 2023 12:17:27 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:33988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqLM-0005Qy-Vn for 60224@debbugs.gnu.org; Fri, 06 Jan 2023 12:17:25 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:40]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 335801AB39; Fri, 6 Jan 2023 09:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1673025437; bh=64ohncF1819vx3QFc1c6tksOY4Kc6L8EkvbPPstej3c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=TOA3/BinjkcN2vmSc5Tc0UDFGkKD5Z/xCEUiUZZci6upSS0vDq4fFs/KNY8mhNM/0 oeX9KJjlphaXc+D6HzAvSajcuMq07rwC2FKXGoNTsMpZuTM8Bu76MwWSKh7WS7Q956 mVo9kWTs1MJkMDXzNOUjjLdOn0Oj8Ch/UpSN4iVhZbn0RIcKBCNKB0EZw6nf4cS2DQ AIRk6JvOv9GA8U0az2G19pShvpApK7VgZdamKKXm3NpkBsqBi+hMQUD+6LTaufXG6w GigIXcR/reijhl0ttlrjNavUwRcx2DW7uDI0V/UJjT61/CO49RE0Xl970BCIWt5mSV 1W0kkBROZlmiw== From: Vagrant Cascadian To: Maxim Cournoyer , 60224@debbugs.gnu.org Subject: Re: [bug#60224] [PATCH v3 07/11] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. In-Reply-To: <20230102004637.3920-7-maxim.cournoyer@gmail.com> References: <20230102004637.3920-1-maxim.cournoyer@gmail.com> <20230102004637.3920-7-maxim.cournoyer@gmail.com> Date: Fri, 06 Jan 2023 09:17:12 -0800 Message-ID: <87k01zk2g7.fsf@yucca> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2023-01-01, Maxim Cournoyer wrote: > * 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. Seems like the description is the inverse of what it is actually doing. But what it is doing is ... not right either. :/ This appears to repurpose a function targeted at sunxi64 platforms for rockchip platforms. Seems like you might want to make a make-u-boot-rockchip-package function instead? More details below... > 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")))))))) bl31.elf is built on rockchip platforms, but not sunxi/allwinner platforms. The sunxi/allwinner platforms need bl31.bin. > (native-inputs > - `(("firmware" ,arm-trusted-firmware-sun50i-a64) > - ,@(package-native-inputs base)))))) > + (modify-inputs (package-native-inputs base) > + (append arm-trusted-firmware-rk3399)))))) This is absolutely incorrect, as this forces it to be rk3399, which is not even a sunxi platform, and will break all the sun50i-a64 platforms (e.g. pine64, pinebook). That said, there are technically sunxi64 platforms that would use a different arm-trusted-firmware build, so this could use improving. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY7hXmQAKCRDcUY/If5cW qtkaAP91SxzfmPY/5ydhfgkR92XjYUosU3XxIMD08QaP7xmcgAD+L1SXPLb9HhEr o260mfwfz0XIeK/VDiLG6q51Y+0k0AQ= =MpCY -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 14:55:59 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 19:55:59 +0000 Received: from localhost ([127.0.0.1]:43938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhCZ-00062f-Cr for submit@debbugs.gnu.org; Wed, 11 Jan 2023 14:55:59 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:36426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhCV-00062M-MR for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 14:55:58 -0500 Received: by mail-qv1-f42.google.com with SMTP id t7so11321248qvv.3 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 11:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=96Czy8f8aEuwmkFxwAgyxW+9040QTmrsR3jvmzJHbyo=; b=RMoAYoJWm3nbYtxNW8xB3GW1NnErmZ4iJvPgTQ5o73ytaIpIPNGogNwm3zntaAM/Qs ZRDBwdIYzMUHdh+rLt7q7dEcl495hGSqb98BHFYlPMxz8a2JOFbkxVT/Em+45K7soqEg /X/2tKmDCBP6iqsXg+w09fQ45B0FgUtZE/uj2kiY2fyPjqAT13wOv5lBEKxMIiiWFn2R URT3ZmqOcE9lwqbPBLMY6ZDiHIhjhDuVvGFWPSqsY0aRzugi9gr8I2DtBbYJvOy5xB9c VXrGWNxr1v/w9RmfI/6yijIl0GtqbJcxErmdwtAjKrM9LByYAGwIprHm0IPTc7Tov25E WUhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=96Czy8f8aEuwmkFxwAgyxW+9040QTmrsR3jvmzJHbyo=; b=P5w/WW+gZyxpzV9RzgPxxXmpwPZ9y7j4+sOXus9uSamMGo8ZFLUIBpDwQdq8828euP x9fTqwJsY0zTUGyUzsZZHUdhQnM1dlEHaOnk1m3K1mTOgEkCmDvvLWEBdHVy079+Afhj kP+bm4GqYsaJ1uE2OSZGe7+cF6NYA2Kvq7ToSe9VE51Lb3PcAlOBW+Z0nv3X3P1SxZ3X ggdxtvZFWkHtGc5+WoH5xnG0jGsJWPvWRt4Qdq0iVdwxXvNU3cwk+1HsW6WQW4NhiBKp SkqRMgh4fzPO3uXLFryFf8NzmUWxKw0u4FoHAZHm6l4aOOEAtDsKRrJaT0BNxqCRr6In 5naw== X-Gm-Message-State: AFqh2koJwz5vrzZ/TGjgtcq+b+DjbgBhxiH+iPY6j4U058Ap2zlsZSvu x7lBUym23jK/c7mnsJs7xN0= X-Google-Smtp-Source: AMrXdXvDvqdEiFAK7BaGY19cwOVjyWYsw/IScthRNNwZfQUbr1OKxFC55ABOCJpfmn5qzhr9HTrqLw== X-Received: by 2002:a05:6214:5908:b0:531:94d7:a433 with SMTP id lp8-20020a056214590800b0053194d7a433mr88215752qvb.26.1673466950147; Wed, 11 Jan 2023 11:55:50 -0800 (PST) Received: from hurd (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id h9-20020a05620a244900b006fc2cee4486sm9617252qkn.62.2023.01.11.11.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 11:55:49 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Subject: Re: [bug#60224] [PATCH v3 07/11] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. References: <20230102004637.3920-1-maxim.cournoyer@gmail.com> <20230102004637.3920-7-maxim.cournoyer@gmail.com> <87k01zk2g7.fsf@yucca> Date: Wed, 11 Jan 2023 14:55:48 -0500 In-Reply-To: <87k01zk2g7.fsf@yucca> (Vagrant Cascadian's message of "Fri, 06 Jan 2023 09:17:12 -0800") Message-ID: <87v8lchmm3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, 60224@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Vagrant! Vagrant Cascadian writes: > On 2023-01-01, Maxim Cournoyer wrote: >> * 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. > > Seems like the description is the inverse of what it is actually > doing. But what it is doing is ... not right either. :/ [...] >> + #~(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")))))))) > > bl31.elf is built on rockchip platforms, but not sunxi/allwinner > platforms. The sunxi/allwinner platforms need bl31.bin. This ^ ... > >> (native-inputs >> - `(("firmware" ,arm-trusted-firmware-sun50i-a64) >> - ,@(package-native-inputs base)))))) >> + (modify-inputs (package-native-inputs base) >> + (append arm-trusted-firmware-rk3399)))))) > ... was the product of the above typo; thanks for catching it! > This is absolutely incorrect, as this forces it to be rk3399, which is > not even a sunxi platform, and will break all the sun50i-a64 platforms > (e.g. pine64, pinebook). That said, there are technically sunxi64 > platforms that would use a different arm-trusted-firmware build, so this > could use improving. I've now removed that commit; and undid the previous change to, which was based on that mistake. I'll sent a v4 shortly. I've noted something annoying though; is that cross-compiling doesn't work yet because U-Boot uses python packages, which barfs like: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build u-boot-puma-rk3399 guix build: error: gnu/packages/check.scm:1997:2: python-coverage@5.2.1: build system `python' does not support cross builds --8<---------------cut here---------------end--------------->8--- So currently the only way to build it is via --system, e.g. 'guix build -s aarch64-linux u-boot-puma-rk3399'. The complications I simplified were probably papering over that issue. That said, I see no reason we couldn't convince our Python build system to "cross-compile" Python packages, so I intend to look at this. Not sure if this should be a blocker or not. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:44:55 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:44:55 +0000 Received: from localhost ([127.0.0.1]:43985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxu-0007Fy-KR for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:55 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxq-0007Fg-Aa for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:53 -0500 Received: by mail-qv1-f42.google.com with SMTP id p17so11407422qvn.1 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44:50 -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=Ibbm4NwqYratgDAE/iCh3/Sh0HkJzoqYFvIaA90O0PY=; b=Eatvb6OrxrQQwgcqjJ1wBTVZoqW5XKkMzl+FG4VDsh5QmoDgodXRsvVBMUhWD/iObD dcjUB7HzjkhCD78Tdv46mN8NsNDcXvwhOlsNwGuL0rci+QqhSJOHYZLbNFyHEcFsLOQC 34AxK5WhIuzG+LFmM8TG2XS46LWBSPoVzKqSU4gcnWnpk6EnEebDUmJXx/3fVv+r5ybG apRrZqPSiKL1DtUxIGmaptzwwNUGCad+hGoD1ILwff8GSl+R894FxSdie1D9hQzVxidX jpaYPD+uWU1gGTRiae51Mp+ltD3M1dCPlRuD7gkWKLG0Wg9HfVPB+8Wo8JKlyyiyi501 IlVg== 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=Ibbm4NwqYratgDAE/iCh3/Sh0HkJzoqYFvIaA90O0PY=; b=LD7IC2Pl2bKlteGoz5rQ1i0T0Wq07GRUABT2bs09uLZbEzc9LtUoSmmIIk8DA3AZ/K MPHsE2cdVhhCBMbZNoE7dy5JgYDahRYaep/JQOy/lav9mIGPCrW+TKw27qK9Z9bS9shp OGtg1P4Qrkkx5s7CyBkQ2unGqm51z3UmPEi2C2ltAjfNPyQwJ/Z77FrQzKDEhRFbHCR8 2IibcV0O1m5nhixV+72pviL3EpQiRpqRsekCfhgOmyuAWK44QWhXZcvqUKqSsTQUcYpR buyfdWW8OLolwz9ZAVyCMf51quGSgQvGe8NLsAU/Hts46kfU0yryd2QMqMbvBmQXwXJE rWPA== X-Gm-Message-State: AFqh2krmBivxTGS/6tRkgLGPNv/Fr/4wDWzriq98FHRL7QaEaewessla IZl5aOPPCpjqU8CUB1+dLfKVq0tG2/Lk5KZF X-Google-Smtp-Source: AMrXdXsyOd6ijDSBwBgP548hfJISLyvwso98BsLX/dULauqAXtp/Sg0lNE5ibsooKpynM/1+JIpjyw== X-Received: by 2002:a05:6214:16c8:b0:531:86b7:41d1 with SMTP id d8-20020a05621416c800b0053186b741d1mr5524916qvz.8.1673469884510; Wed, 11 Jan 2023 12:44:44 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:44 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps. Date: Wed, 11 Jan 2023 15:44:22 -0500 Message-Id: <20230111204433.15305-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. Do not bind OUTPUTS. --- (no changes since v3) Changes in v3: - No longer bind 'outputs' extraneously in build phases gnu/packages/bootloaders.scm | 181 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 84 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 6e6bdb4c08..52427ca9d6 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,11 +860,13 @@ (define*-public (make-u-boot-package board triplet defconfig configs name-suffix - append-description) + append-description + (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description." +appended to the package description. U-BOOT can be used when a fork or a +different version of U-Boot must be used." (let ((same-arch? (lambda () (string=? (%current-system) (gnu-triplet->nix-system triplet))))) @@ -879,91 +881,102 @@ (define*-public (make-u-boot-package board triplet "\n\n" append-description) (package-description u-boot))) (native-inputs - `(,@(if (not (same-arch?)) + ;; Note: leave the native u-boot inputs first, so that a user can + ;; override the cross-gcc and cross-binutils packages. + `(,@(package-native-inputs u-boot) + ,@(if (not (same-arch?)) `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `()) - ,@(package-native-inputs u-boot))) + `()))) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build kconfig) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build kconfig)) - #:test-target "test" - #:make-flags - (list "HOSTCC=gcc" - "KBUILD_VERBOSE=1" - ,@(if (not (same-arch?)) - `((string-append "CROSS_COMPILE=" ,triplet "-")) - '())) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((config-name (string-append ,board "_defconfig")) - (config-file (string-append "configs/" config-name)) - (defconfig ,defconfig) - (configs ',configs)) - (when defconfig - ;; Replace the board-specific defconfig with the given one. - (copy-file defconfig config-file)) - (if (file-exists? config-file) - (begin - (when configs - (modify-defconfig config-file configs)) - (apply invoke "make" `(,@make-flags ,config-name)) - (verify-config ".config" config-file)) - (begin - (display "invalid board name; valid board names are:" - (current-error-port)) - (let ((suffix-len (string-length "_defconfig")) - (entries (scandir "configs"))) - (for-each (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format (current-error-port) - "- ~A\n" - (string-drop-right file-name - suffix-len)))) - (sort entries string-ci<))) - (error "invalid boardname ~s" ,board)))))) - (add-after 'configure 'disable-tools-libcrypto - ;; Disable libcrypto due to GPL and OpenSSL license - ;; incompatibilities - (lambda _ - (substitute* ".config" - (("CONFIG_TOOLS_LIBCRYPTO=.*$") "CONFIG_TOOLS_LIBCRYPTO=n")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (uboot-files (append - (remove - ;; Those would not be reproducible - ;; because of the randomness used - ;; to produce them. - ;; It's expected that the user will - ;; use u-boot-tools to generate them - ;; instead. - (lambda (name) - (string-suffix? - "sunxi-spl-with-ecc.bin" - name)) - (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) - (find-files "." "^(MLO|SPL)$")))) - (mkdir-p libexec) - (install-file ".config" libexec) - ;; Useful for "qemu -kernel". - (install-file "u-boot" libexec) - (for-each - (lambda (file) - (let ((target-file (string-append libexec "/" file))) - (mkdir-p (dirname target-file)) - (copy-file file target-file))) - uboot-files) - #t))))))))) + (substitute-keyword-arguments (package-arguments u-boot) + ((#:modules modules '()) + `((ice-9 ftw) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build kconfig) + (guix build utils) + ,@modules)) + ((#:imported-modules imported-modules '()) + `((guix build kconfig) + ,@%gnu-build-system-modules + ,@imported-modules)) + ((#:test-target _ "test") + "test") + ((#:make-flags make-flags '()) + #~(list "HOSTCC=gcc" + "KBUILD_VERBOSE=1" + #$@(if (not (same-arch?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + #$@make-flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (let* ((config-name (string-append #$board "_defconfig")) + (config-file (string-append "configs/" config-name)) + (defconfig #$defconfig) + (configs '#$configs)) + (when defconfig + ;; Replace the board-specific defconfig with the given + ;; one. + (copy-file defconfig config-file)) + (if (file-exists? config-file) + (begin + (when configs + (modify-defconfig config-file configs)) + (apply invoke "make" `(,@make-flags ,config-name)) + (verify-config ".config" config-file)) + (begin + (display "invalid board name; valid board names are:" + (current-error-port)) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" + file-name) + (format (current-error-port) + "- ~A\n" + (string-drop-right + file-name suffix-len)))) + (sort entries string-ci<))) + (error "invalid boardname ~s" #$board)))))) + (add-after 'configure 'disable-tools-libcrypto + ;; Disable libcrypto due to GPL and OpenSSL license + ;; incompatibilities + (lambda _ + (substitute* ".config" + (("CONFIG_TOOLS_LIBCRYPTO=.*$") + "CONFIG_TOOLS_LIBCRYPTO=n")))) + (replace 'install + (lambda _ + (let ((libexec (string-append #$output "/libexec")) + (uboot-files + (append + (remove + ;; Those would not be reproducible + ;; because of the randomness used to + ;; produce them. It's expected that the + ;; user will use u-boot-tools to generate + ;; them instead. + (lambda (name) + (string-suffix? + "sunxi-spl-with-ecc.bin" + name)) + (find-files "." + ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + (find-files "." "^(MLO|SPL)$")))) + (mkdir-p libexec) + (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))))) (define-public u-boot-malta (make-u-boot-package "malta" "mips64el-linux-gnuabi64")) base-commit: 5e4ec8218142eee8e6e148e787381a5ef891c5b1 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:44:59 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:44:59 +0000 Received: from localhost ([127.0.0.1]:43991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxz-0007GY-5m for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:59 -0500 Received: from mail-qv1-f43.google.com ([209.85.219.43]:44911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxw-0007Fm-7S for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:57 -0500 Received: by mail-qv1-f43.google.com with SMTP id y8so11362425qvn.11 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44: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=nZnxR5JIuJRwFKp+X9zvnpoD950Cr8+MpAbUM4rZsOw=; b=SKUBzLqFaHwCyYn0OmMMPA+4c4HhX65MW9pryhYAf46TdrdAKfHRsrfLFYNWOr2XIP r6oM/JW1H0nCI/DjPfrMwkDRM3vffF5KRWFGPHRRGRM5Ayub6vTkkubpHlady65WKy+M AkTpagRyf90oHBVZqA/EC/6pC1op5aFcxRkiqu/Vf+Jp+RWjAanWE2b2DRH7ozrA87HY FkFPtlrJUL7eNbNx1KfDq9C2HAVblluF/IpIybZ5D3CEFqkopG2cHh7GM+1wKr1YUqsX Lg3/ugK6aVEPeHONikuwmgpwBuqY2elGX4bo10sPkTPz+dGbpFTEJJ09xA94OZoEzVdN tUmA== 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=nZnxR5JIuJRwFKp+X9zvnpoD950Cr8+MpAbUM4rZsOw=; b=t2dVKcyIcPfNRKCzG2TncW5KzufOBNJVmcyVx7JIrugRccIeakbxJaU6RSOAsjBhe9 pdpnHmpR3gns8++Vno5NFQRlsyYtaJFCw3O6Dh6R+6LVWYQWqcnfETwaKWXUT11eE7Me i9orT8lq8p7LnPrIjHvsZ37xpaetgA7v3tQlWxeQ5CsG1A/j/8uI8maxG+v/4RUDGSIi 8PO/KA1333olfIk9l97SKrgRbbr5AqJGVe76dFJRSXSKjRlzMjt0RS4LjpfmlfAwQb8E mkeXaMElEWYmVJfqNsrn8MFiQBAHiktYOgFa7AtzChYnb4GTReE5Lx9bO5CijCws21Ma nVWQ== X-Gm-Message-State: AFqh2krWMeS9jK+1fynj2JdU+QlS91foqBNvpbCuqu36LZwzRGCC653E DLytV0RGfx6UlQMWk6cZjqYFSZWEbfE1dYdM X-Google-Smtp-Source: AMrXdXvTG+ghex3Ow+W4kcOLI+P8zY8YzDWspvUEaDNF9R+TxZMGAYVUSVf68scUQoL2mbGWkNfkEg== X-Received: by 2002:a0c:eb47:0:b0:530:95c6:e951 with SMTP id c7-20020a0ceb47000000b0053095c6e951mr5028086qvq.4.1673469890538; Wed, 11 Jan 2023 12:44:50 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:50 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 02/12] gnu: make-u-boot-package: Install .imx files. Date: Wed, 11 Jan 2023 15:44:23 -0500 Message-Id: <20230111204433.15305-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 52427ca9d6..10750e0448 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -965,7 +965,7 @@ (define*-public (make-u-boot-package board triplet "sunxi-spl-with-ecc.bin" name)) (find-files "." - ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + ".*\\.(bin|efi|img|imx|spl|itb|dtb|rksd)$")) (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:02 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:02 +0000 Received: from localhost ([127.0.0.1]:43997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy1-0007H8-SG for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:02 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxy-0007Fg-6G for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:58 -0500 Received: by mail-qv1-f42.google.com with SMTP id p17so11407811qvn.1 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44: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=/KflUoNsIw6sUg2Erl+ljEDs/mMBqaFoqLSyGE81NjM=; b=LpwKf0iqAojev+Ezef9UbGciJEBepP6WWMAl2WWppKAFsVQDXtjLbbhXQf0d7BAGeu 9lKdk+XIv9v3WYTTRkbnGEi8yNVAeW7JtBpDu1mVkFdb5zxZLzncp87S2UOBaj14cxss V0ZbiiEF0brC9PI4JrJZ3IgEC0qyWDw8fRek8xBPy7BFvkFM7BP9Y4u/f88fPi1LxNi9 e5a9qdPLqZQ58VzpKvej3M7W+3TgH0pnx0C+s8aj2qkxIBKPIiJALebw6jn/0LiRIC/+ xrCBTW5rMDqcR2XNbu+O99Y5vBy2VJB7k0VTpXOLvyad/bYobHRRjvUdw38tP1YVluvg W8LQ== 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=/KflUoNsIw6sUg2Erl+ljEDs/mMBqaFoqLSyGE81NjM=; b=qMVV9dLlRwVMzGTA3ZjKgRDk7ZbzYuT3XKOzBHlXnv5qJbqNrPGYbsQ9KxeCTaTq65 QjRQZHO6zvQddhvwBgtC77Go9CUBba4hkqzYbGj5OihICe5ZLJ5Col9ncfk7cLBmxYb/ +eoiO8HkXXx3SR9E/D7MaJFrGHkFkHdGA31yadO9F1T0sQFwK1IgDzGtWET4W2fpMm+e 8IIHCkvy8LNOwLl0A9cTGZO957S/k4U+YcF5fy/qCpe8+DexLuBaqZFRh0szN/QqrsTl VvB/93/unr1FWzvMVZ/JUby8ogg7haTGmToeW7jemg7DtJOsdbLEMNAAI7rtO5houY0i Zx6A== X-Gm-Message-State: AFqh2koswQsnAIsbi/3HGQtsjGcPDAZyAPyikUTtHPngL/SlYwCtkmqK gBzqzTy+gEez397OTlnIwRCnvrIsIpa+YXOe X-Google-Smtp-Source: AMrXdXuPQVRNEiooxIYIetgvb8N1dKYMafZIDQ/L0u3ihWKhiM+oXn4ryVaH2ZM//l2DCyQqzc1Mog== X-Received: by 2002:a05:6214:4947:b0:52e:6f33:ec2 with SMTP id pe7-20020a056214494700b0052e6f330ec2mr94372471qvb.31.1673469897741; Wed, 11 Jan 2023 12:44:57 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:57 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. Date: Wed, 11 Jan 2023 15:44:28 -0500 Message-Id: <20230111204433.15305-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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. [native-inputs]: Turn into... [inputs]: ... this. --- Changes in v4: - Revert erroneously replaced firmware package - Revert bl31.bin -> bl31.elf change caused by the above - Make the arm-trusted-firmware-sun50i-a64 a host input gnu/packages/bootloaders.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 87d5bcb824..0c5205fa86 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1010,17 +1010,13 @@ (define*-public (make-u-boot-sunxi64-package board triplet (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((bl31 - (string-append - (assoc-ref (or native-inputs inputs) "firmware") - "/bl31.bin"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-sun50i-a64)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:03 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:03 +0000 Received: from localhost ([127.0.0.1]:44000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy2-0007HF-DZ for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:03 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:45579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxx-0007Fo-GL for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:58 -0500 Received: by mail-qt1-f173.google.com with SMTP id h21so14684663qta.12 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44: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=Lmc+Cm3h+GlAjIgO1kqN6MREVXLlYyiwB3Js2tIQah8=; b=FlVwuLmicT9bjnGi7LLfa4jNRpVCsM9IF9TZGZ96GsoXQZK7XG6bMZymCtyKMA6OSW kTICF20eGOaCjQ4Ja9A35iF8SKvPhSqHNBWgsHkpENDqTpcs1/5m35it546L5HREbq5z JuIF6SYHMqRUSCpA2g5XB8po/X8tvcJWSGzN6dlFSMPTl7huCbrIStW10TynkTIqncEc wPDNUY61jnctECpURbmzlBfLlKo5eHEUjyxBgJoCNHpxoXIo6FYV+QAQgfKb9K7wCtQg 4HZyUr8fWTmiIJNoKyz/1RwyA8fdyndGmyLDODB1WOGCL+u7P3NQUjxcGzGIGkstuIQC EzXw== 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=Lmc+Cm3h+GlAjIgO1kqN6MREVXLlYyiwB3Js2tIQah8=; b=avU4zNdq1uFfAYqILGp2Ksf4VRj00RaBjrNk0vi7Z5HFFuBRNTfLEZohTLZ1I2f/tR c+vgHs0XSYvwTuSqYH93E01Yay8SspcpaiVMuE7OJsQfriAmmINRVPssDReCW3eFQURp bzx2MRc4n/WqEX2wbLqsMWP3W+m+6V7UoKNw2wI0xs1rh2yDs7bo2rEK1KRb5ovFcPAN /m3U1F318OM7IpKZ3LVbxXXh2nwVftAUm+soUtqkWChRE8PcNX1WiJ0G/3hWJ5RS9yHZ qOTN74sD+27b3+1IkJxEOX0cjrke14ambJIt0FWBusb4KmjTi9wp+omQrYAm6gARaEpR dfhA== X-Gm-Message-State: AFqh2krIIYbpPMFZ73ohGeeHZFfHKB7XYSvN6fOo61hV01Hfa1W/hKQT HCl/mBSAku0FLbkdAFLkcwDWc/CB+P2i0tL9 X-Google-Smtp-Source: AMrXdXsdC1aexFDyQVOmeTmgSMx/tC3bx48xo6Gsf7/E3U5IF2Msdt0AjeQ5CKCb7qY7/qogRwY7ow== X-Received: by 2002:ac8:4793:0:b0:3a8:1c63:7603 with SMTP id k19-20020ac84793000000b003a81c637603mr107317025qtq.57.1673469891856; Wed, 11 Jan 2023 12:44:51 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:51 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 03/12] gnu: make-uboot-package: Simplify build. Date: Wed, 11 Jan 2023 15:44:24 -0500 Message-Id: <20230111204433.15305-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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. --- (no changes since v3) 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 10750e0448..4a27a36d78 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -867,9 +867,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-" @@ -880,16 +882,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) @@ -906,7 +903,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)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:04 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:04 +0000 Received: from localhost ([127.0.0.1]:44005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007Hx-6f for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxz-0007Fx-KL for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:00 -0500 Received: by mail-qt1-f182.google.com with SMTP id h21so14684737qta.12 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44: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=ILU4Wz1bHMxXkNR2GaBUvWsHaoi0acuVI+aXhZqLlqs=; b=iY4SWqqxvhsmuqwu5TKDnvnpXp8/KHfGPkLILCcirnI7JuiOwLr/LZvW/34TkdsDH9 fI1AqrgZpMWNQuUXiUDIO9LTyeEJiplzwKbnqTuBDwBNW8p31bOfoTT+YtoPWz6nNjP0 yWAKrZ34O8lsUVEljLJ3R/eKfKQwkyNr/vwvcm7Yleq+dDWjP23Rat/BPissw4Fa7kHj oHkg5450UR9oLCEFeXjsPf+pMXNVzphZuITEqSIVS49xUhFkGpQfemswDkbb1SwTMRA4 gvDKmFCXEoL1QewAvhTjbiyxeurZyXRWAe+0FkyVBx51H2OcNeV622jBgINYpw3/rc2y SiEg== 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=ILU4Wz1bHMxXkNR2GaBUvWsHaoi0acuVI+aXhZqLlqs=; b=NJI9L3J2MW8MwpPlxlmE9WjRZTF/HvOMTDndqMBecIqWao9MHKmbP12KTfZduAOp4k Tt/IaPupSo6RVvUonliwv8yCOPHXIithHUb6eC3dtzFntav2Imm5qAvYK/WK10VCsuiC CckViEQWIZCY1dk/ue2vh00sN3FVb/WnPHK2ljBGVDYudScxlJqarsuPM0SKU5hs5pZ+ mgGCYjmo6/ggYpN7nlNIBuIVpaBORcAkxdXREVaydShZHBsTJMpQXqOW4N7IiQD528Af +/AE5l4POP541nJTHBKDLZCI+gOHE0q+8+JsgGma9e26Weguocm070beHZSoS99TKE2t 4UEQ== X-Gm-Message-State: AFqh2kq0YsihRdJyWedFZJ+uf6w4yRIZ7oHyUhncO+PKFfsQVhf5FtDw ok/q7ht2FBKmXQKLvPGv6d+dBAXy8Bn2BRkX X-Google-Smtp-Source: AMrXdXuvN7MfQ1iBGyTx++G6+UoU7ar8PThKZB06LBEY/jBBjWgACGjBFZzAryZa/sJNS2CaFszMPA== X-Received: by 2002:ac8:6f07:0:b0:3ab:c8c6:51c2 with SMTP id bs7-20020ac86f07000000b003abc8c651c2mr44812787qtb.62.1673469894074; Wed, 11 Jan 2023 12:44:54 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:53 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 04/12] gnu: make-u-boot-package: Allow disabling cross-compilation. Date: Wed, 11 Jan 2023 15:44:25 -0500 Message-Id: <20230111204433.15305-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 4a27a36d78..e48b55018b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -864,14 +864,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-" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:05 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:05 +0000 Received: from localhost ([127.0.0.1]:44008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007I6-Ld for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from mail-qv1-f41.google.com ([209.85.219.41]:42705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy0-0007G7-Rk for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:01 -0500 Received: by mail-qv1-f41.google.com with SMTP id m12so9327553qvt.9 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45: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=2KS2ghGrg8G4eNG1qdIUPrWIzppWkyfxRrFdJGv+6Fo=; b=nUzyNEYOkLJKyyNbXcHX1uSWRuzmjD06uF79rXBSRhhs/LwNn3DxavF/ngFBgIZ3lM bmGP+Xc04t3czfltmYPujExyeK/gZZ6qHnpwiVS3X/DZrx0zbfp1O6NeJRCOySdptTDw qmeIqhBKY2UpXw3m0caPCO0xEfIJoEYbvA5yUsmCo9fqz2FW6bnVJQBgq4/E3xwXv+GC AQU/u2mC4JCWXggmLNSCSe2Xe/dIIyQZIkMQCD1W9Mf6z+zVJ/lERLys9epJ+F6zt4P3 0LxWmqO9dbi3OF+D7ujvHwmIMHMST+vP0LRXbl+q6v2LI8gb8WDs+R68vOipnHB1b3r6 DLDg== 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=2KS2ghGrg8G4eNG1qdIUPrWIzppWkyfxRrFdJGv+6Fo=; b=TYJk05tpGQAw8ghihw1IiOcZro3XjrGBYP+Oxh8fg4vtPQpfm0srmq6GvKj4cQVERG dv7Yo7cHTGeMbtfSnEQRkW4bVm88K6Dm32lvyZmhOBGtY65NNfmHO8lbu8ctHPQxHvjB NZsrBK1CXjkB3GNx31bLBdHU0wkOtqpGYigHAMx1C69EQiMmYHArW46AG5d3IoQyWCP5 M8JZ509A0Y/RiDdAlYO9IdogoravjrdppBIQweZ+velR9WV++rcRTRyKDtqxZ2EaeYbe +LE+4OC3IM/+3YMgJeiJzbTI1ydSvLfzbUFDgHlfNhYjhBRdJJM5BkuSYiAlwh7dKFdM QjNw== X-Gm-Message-State: AFqh2krtOjqmfP/XgPXhONg6XDE9xm8hpvL6M5mXMZlJl4WqVJzp3abE 4R9engdF1MRtzE3Oqd9r6yCum94YKQyXB9D7 X-Google-Smtp-Source: AMrXdXsLQ+V8/wtVkm3YNih8kiCi1SCt9GZ69OK5OseSduh622ccxRK42iCSF11i1NCtBtSml97cZg== X-Received: by 2002:ad4:5428:0:b0:532:1f17:2ce7 with SMTP id g8-20020ad45428000000b005321f172ce7mr27875691qvt.16.1673469895259; Wed, 11 Jan 2023 12:44:55 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:54 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 05/12] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. Date: Wed, 11 Jan 2023 15:44:26 -0500 Message-Id: <20230111204433.15305-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e48b55018b..3ac29a844b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1230,17 +1230,16 @@ (define-public u-boot-pinebook-pro-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define*-public (make-u-boot-bin-package u-boot-package #:key -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:05 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:05 +0000 Received: from localhost ([127.0.0.1]:44011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007IK-1Y for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:41760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy2-0007G9-35 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:02 -0500 Received: by mail-qv1-f50.google.com with SMTP id d13so11373218qvj.8 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45: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=HWMDZjv/QNOvrmvQMYiRmg8GEMr0QcInTGadyWGc/9A=; b=aDeG1lRm1jxwBkcTxGlIeQLQNTUe1i+M1Eo2UJ7QlOVmgDb+42MZGnSN7fDccxzb5A 5GBgnarwROFTMwChJx3lXkm4Lx9ZTGWz2EZQAPa9j9G1SBog5UZHNrivCwXcM7DQymEq HZYg6q9sEXy7oSfNjc5cnAKcSGrs85skNeYM24f/1I+ZnDMphXQA2RpJWpaad0qkcEmm 0ukd1JWmCQDkyAh+pScWJlexUMpIfqwnKQuEdkJDHU59YkdiWzHS3kooMbl+1sJovmxh JieGUKlccIfM8DDQB7byTXqPXrMsO4mqln585RjFFQjLIQlojl62mULApbhtmIwZtc8Y qY1A== 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=HWMDZjv/QNOvrmvQMYiRmg8GEMr0QcInTGadyWGc/9A=; b=lmTfXQrhyS6rbueoFux839/aS0bKMGH2T/pohCwcxJBc1JIlStJacFPqz6ofYUkWFR 1z8Sb9zKE+ilqaUUnyu3u+1m4JQb57LuC8ojIOhfCwqDvORjSf9WQarJ8AkSIU6eJGBo agvZA/cQWy/UzyVKz2qfdCw7qrwi4y5ipyjy7ZV1kYw/7oI8HdKPzaX08iuJ74OMtFpc qhIiEraFGxpYkpbDa7GpnIjFZ7tsr/m9pbWxzaKPuiTradUbyyaTzv3e6zrVWig1O5DC yVbnE0Ab8ealzPEqqceBTonF3ImV4BNLRKxuYHYiM0001vq9UTxfPQB7/aL4Wt0fkks1 ObQw== X-Gm-Message-State: AFqh2kqEUE3TNH/gBIFYa3zC6CvTmAm+jYSLByKZ9HUGmFJQddQsFCOv eWGc1hk7gJJ6fc1RXkUopatJMJyzxNQgvzWo X-Google-Smtp-Source: AMrXdXuEjQ+BxFN8EbrKeQHOR7/8t+i28k+aK8bj07+vE1j1V1GOPEceFlOWmACT1+m5La1HLa7oNA== X-Received: by 2002:a0c:c783:0:b0:531:c27b:8ab3 with SMTP id k3-20020a0cc783000000b00531c27b8ab3mr50117958qvj.41.1673469896461; Wed, 11 Jan 2023 12:44:56 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:56 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. Date: Wed, 11 Jan 2023 15:44:27 -0500 Message-Id: <20230111204433.15305-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3ac29a844b..87d5bcb824 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1165,16 +1165,16 @@ (define-public u-boot-firefly-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:13 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:13 +0000 Received: from localhost ([127.0.0.1]:44023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyD-0007Jo-Dn for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:13 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:47089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Gc-I4 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: by mail-qv1-f51.google.com with SMTP id l18so10612999qvt.13 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45: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=xPPo2fHoFli95t2OVS/9dBdM5E23XTRdB3assKTD+qY=; b=W0TYRE8UIrk7+oSovLq6g+Sg5De0Sb6ACz3BmFIB61ukIPhhKeizwZBLUTBQIG5LNB Yv+m+Si7vXDxNNJDbnWt8xZ67YMrpyw/Ub08t24RN0qr7/FzVpG/wIlZsjJxO1Wz7Qrp cK1p2PStQ5ql2a8m7Mp+r/oR2IuN+FQzrUvbGx5pJsnwpxDHVwIaEtyTNs4j1rQBwZg+ hG5Dh2sgGDUPYSHKT4J4lJASBhtMT+Ba2D2tM7Dh7dkyeYrFlvVzj7wzpmH7fkbBhyxV VWByUHXP0UQfEgE6olJgWxEAtVdc9tqV0tjqybnNQqN4MqWP73bNrZXtk4WMrKvm67CU V98w== 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=xPPo2fHoFli95t2OVS/9dBdM5E23XTRdB3assKTD+qY=; b=cQ8QY7sPtmfa0jpBKJrBivFHoBYCyfrgOOL/pKX78VcyeBM9OUknT9KYx9O/BsROkS x6ZwDGFVnouGIzpcgpu5JAcFBmmwouFt2FPIjiV1LB2X8n2kMzK0LbFQJs16MoXo+Shk GPuGbbLLR6xh4vHktdaNDQDD21Ijk/DNWEWnhXIUilcjpXc3F6OPg1icydQAl74lc1Or eWQp+W6IfKEwm8FXBzDwOtFRk01jXjS4IhkB0MLdeJgfBq6OKvOMGAOv2s2Z886DbWcB UcwGgMXnEZ+eCh0wCkGfx6lhC4Ga3nl//TDmeKn6JUzm+P0X9/MhLBI6mBMvoTkZY/VF +mNA== X-Gm-Message-State: AFqh2krmyhrdeUgNo82id9DbDSbsTyM3pTWxoyo83kGcq65ot+FjoAEC Mq4rmFKkEQV1LemKqXQS7O/jaXXbzsaN+od5 X-Google-Smtp-Source: AMrXdXsilZBz4X/7hQLVYgXQVWb8KdD8mTyXv3d4FCFxJFeL46IwRH+/D5SUY9Ra62t+m0XN0z3pEw== X-Received: by 2002:a05:6214:5443:b0:4c7:80fa:755c with SMTP id kz3-20020a056214544300b004c780fa755cmr107110922qvb.45.1673469898948; Wed, 11 Jan 2023 12:44:58 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:58 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build. Date: Wed, 11 Jan 2023 15:44:29 -0500 Message-Id: <20230111204433.15305-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [native-inputs]: Remove input labels and use modify-inputs, and turn into... [inputs]: ... this. --- Changes in v4: - Make arm-trusted-firmware-rk3328 a regular input gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0c5205fa86..464c1f5729 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1145,14 +1145,13 @@ (define-public u-boot-rock64-rk3328 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (search-input-file inputs "/bl31.elf"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:14 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:14 +0000 Received: from localhost ([127.0.0.1]:44025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyD-0007Ju-P8 for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:14 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:36501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Gs-M4 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: by mail-qv1-f51.google.com with SMTP id t7so11399192qvv.3 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45: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=f2G53Xx/xVIXpkpOxXjAdS03IItIyPZ8WMtu/vitWjo=; b=VsF221i9CJAObY6HeME4mvsedq9MbBv6Qc5yPf+w5u4vLvlHF74618jf0VzIviUzhO BfE+gD/FvP/kbEWhbCOOz37zk8NVBSxLf+3sShWI5AO3a9UqB/s5eddzn1ClTfM2U/ch L+MvuAX+okSmTVhopXiHEvLWA8s/eBqO73JHB10HRjfVXSt8MVaL2nUvFyRm3/vf5BFN i6ySME9QIXeYux6RIC4MKWuuKqawy40aU2R0NMZXkMgPrkUq0o7m6nyIWyyJJJXUHhP3 Y+HHvkczMLzCRPvhFF5Yi0+iP2/Yn3ILK+8VBooOyG5/Zr/1OD5FlpN/qyW18GHBfUE+ ochg== 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=f2G53Xx/xVIXpkpOxXjAdS03IItIyPZ8WMtu/vitWjo=; b=CD4BSaoMmk1C/q8OAchpMw98LJRGurIawgmyrdMYlocGFRvXS+9hR616Fl+3P309WO wmSVJVhn9kBf505jnk3LOMCyc0HPskTB+MhumJIhivnW7Kb8AvvIDXHMFGq7OHpQwmIj LIrjSbCdRJITznvFImT4l4ajvXiq1J9s4ra2WKY+xVixKdbgs33hMF+xWe7WKJoY4kfv uzyg8ib84x6b2ktFpQlgtk5/OdOkQ2MaL5qHtTMZuv8UtideVkSBdf/WvzcI9Roa4n3D lm90VI133LthxJPxa1ROpUCvfJ5NXxt6ChqIAdrkMAQym9IoJU8fkVDgg4Y6QOKbX3G8 A4Vg== X-Gm-Message-State: AFqh2kroSlPT4nCUMQY3TGjp7AjA1H/QHkymIugg48H9MnJfexNl7tvf 6IvVBYzdYVLnArKAxYGT4UWAdnkukdDoBqvE X-Google-Smtp-Source: AMrXdXujK2HZu57KOp2KAZcZn+gEszPYgiKCDgBNBH+HA5Yqgd2cV9+PEiVyVRUd3X5pYnBcUVpn4A== X-Received: by 2002:a0c:f78c:0:b0:532:31e5:1566 with SMTP id s12-20020a0cf78c000000b0053231e51566mr16236479qvn.12.1673469900142; Wed, 11 Jan 2023 12:45:00 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:59 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. Date: Wed, 11 Jan 2023 15:44:30 -0500 Message-Id: <20230111204433.15305-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 464c1f5729..b2e15b88f1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1128,15 +1128,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"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:14 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:14 +0000 Received: from localhost ([127.0.0.1]:44027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyE-0007Jy-3c for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:14 -0500 Received: from mail-vs1-f52.google.com ([209.85.217.52]:37497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy7-0007HB-B0 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: by mail-vs1-f52.google.com with SMTP id k4so17015931vsc.4 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:07 -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=GTFkrf7A+Q8r0lxMHw4sE51ECtfd9Bhk87/xfTvdoY8=; b=NuJo1uJ9yTuCQk85F6lIlTEZzvkQgwagBK4VtGXqmskTVxNZCOlhgYO9Qd/RQBUiRW +tOuTZbepbjhIajZ8uw/hmnNuo4ypdE4RnrHQFpTgdfUpGkhy8prUkkzRfIHrhmB8znD PLhG9OvXNG3SsJd6W8jJvGY70UlHoZx4n4BaXurQafzLtuCArQFSdnHW/zOBSQFIwpZ7 vGrjr+3r6h8pkS35sgTGK9heAqtrRCLndJ2l2XOWX1moywOfioWrilONB5+/I8fb1kHs 7HC6upgZl1GTaAglOM6JbXS32zucuKgDaw22BPVP/9AscxuzKUPWK5Uo0dRl21DKTSKJ a9hw== 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=GTFkrf7A+Q8r0lxMHw4sE51ECtfd9Bhk87/xfTvdoY8=; b=A9T1wbceOeEGWvrkvdswGWQD0Zt/kS6YAIFRGS+iTjft4gOQUbDjlyuea0j35zB/+U Acs5MVniOhpMiWZ8Si3/VmXaIVkkAPVmOftdi19ba3JCmE+Ae2kooyQtJnNvVEQ7bRR2 NtRdnlojEQyctlhYNdgJjBVnL9wgz17w6z1tyDiHGnW3qS908mAt1tsoF03d4lF2IPZZ atqQMYufvtR2Ix9+9HTkK7d+mQgcyTn1akaFfaDSOStF0Y72kalC0Hlc4KeomNrcy2vu I2lw6g7xcDgiPSkdoXuy7RruhGFA71FnPmXTpJzdfhnNnaLkLOKSshN+gh6niukdBXG7 /zOQ== X-Gm-Message-State: AFqh2kpowz2QHWmM7eG/vzyOcIApJuSgUWciIxIy4xhPpNVheEgZnzik 84br4i5NUQegaG2D7ryMdx35XDUbiXxAn+vV X-Google-Smtp-Source: AMrXdXud6aD+lt71TqE++ICJ1VW4ciMTgbwUM5hzGq9VpExvGakEIt4TGKLEmZX61vs/IoBF3mZbYg== X-Received: by 2002:a05:6102:4b1:b0:3ca:3446:2cb2 with SMTP id r17-20020a05610204b100b003ca34462cb2mr32386824vsa.10.1673469901397; Wed, 11 Jan 2023 12:45:01 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:45:01 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build. Date: Wed, 11 Jan 2023 15:44:31 -0500 Message-Id: <20230111204433.15305-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- Changes in v4: - Make the arm-trusted-firmware-rk3399 a regular input Changes in v3: - New commit. gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b2e15b88f1..0878dd3168 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1185,37 +1185,36 @@ (define-public u-boot-rockpro64-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - (add-after 'unpack 'patch-header - (lambda _ - (substitute* "include/config_distro_bootcmd.h" - (("\"scsi_need_init=false") - "\"setenv scsi_need_init false") - (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") - "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) - (substitute* "include/configs/rockchip-common.h" - (("#define BOOT_TARGET_DEVICES\\(func\\)") - " + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + (add-after 'unpack 'patch-header + (lambda _ + (substitute* "include/config_distro_bootcmd.h" + (("\"scsi_need_init=false") + "\"setenv scsi_need_init false") + (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") + "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) + (substitute* "include/configs/rockchip-common.h" + (("#define BOOT_TARGET_DEVICES\\(func\\)") + " #if CONFIG_IS_ENABLED(CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func) #endif #define BOOT_TARGET_DEVICES(func)") - (("BOOT_TARGET_NVME\\(func\\) \\\\") - "\ + (("BOOT_TARGET_NVME\\(func\\) \\\\") + "\ BOOT_TARGET_NVME(func) \\ BOOT_TARGET_SCSI(func) \\")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:15 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:15 +0000 Received: from localhost ([127.0.0.1]:44029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyE-0007K5-EU for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:14 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:33787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy8-0007Ha-B7 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:09 -0500 Received: by mail-qv1-f47.google.com with SMTP id j9so11444350qvt.0 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k5nBLOUhzviiIPpYmUhe206apJDhFnL5+uwoBfKcBPo=; b=m8fIxRj3I6RyyAiI8MX75sbuHnvPQXyNBIhghWVW0L8tNte9+M4lEsSin+o613iMPo ZYnjDJ/vYpV/3KiqoCDXzAROXAOE/IThJP5mOhnFrQTvZisTVN++NKcm2o8mVLlxlM3S RZkhQLMLFIvUEIlIBCRIRD6UeNv9G0z0zQ+tHGNPk5/GPo532yHy4bPnntNewMa5ZTcB ShEeBNcMLP+zy22cpUhxv4FARo0aiPpqVHxm2x4pVJE7YMskigf1UcFbFgQRh14rUn6/ jvaPcukOuHfuixfta3KmPrQGFZ5MXDhic+Qw+Q/4fOKTnRJICE58Uy9aDO+XvVfj/et2 cTPg== 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=k5nBLOUhzviiIPpYmUhe206apJDhFnL5+uwoBfKcBPo=; b=WHhv5oQAKStjnqL66TZpE73ziSxFfXaJ/50iK8wWL4wGwtxLTx7xTVQjlHbLttWI7V V6CMeAmK00XFplPX1pe5rkhPAtWAjh8dn1zirlBh8retdyQLNkFxZDsDv/QLb4cAKwcU MRRlD8Hl9Z0OHUJQo96SlZpVtEzOULYujhDlV0Y9L8FJtP0f1y075mW/4HaRtSQPBZqi LoDTeYspuVG/DJggetccZ0wYJaCkagaOgyg4u4No30G1qIzyi0J2suBmHjk+O8Fp7SCd S/Cyer0UyaI0vanu/owRwmkacHSNmv/mREk0fbI5ScNnTxGKjt7bE1W4IHYd00hISUhi 71pw== X-Gm-Message-State: AFqh2kqgFkmvLfTYn7RCYQfO/RpPnfV6K2t8A1bkrYz7ZTfV4HKKNvHR HCLi/p74pyT1LXKNePrKDUGXFJREboJ1P9Mu X-Google-Smtp-Source: AMrXdXufYn4Lvq+DJLDMXDNFMeDSHqT/nf/BDzEQqD2RjmlZ1BniLwnnDeqGPJuIemuIl1fQW8HcxQ== X-Received: by 2002:a0c:e7c1:0:b0:531:9fb7:979 with SMTP id c1-20020a0ce7c1000000b005319fb70979mr5191269qvo.27.1673469902594; Wed, 11 Jan 2023 12:45:02 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:45:02 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 11/12] gnu: make-arm-trusted-firmware: Simplify build. Date: Wed, 11 Jan 2023 15:44:32 -0500 Message-Id: <20230111204433.15305-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Reuse knowledge from recent U-Boot modifications to streamline the package definition. * gnu/packages/firmware.scm (make-arm-trusted-firmware): Change optional argument ARCH to keyword TRIPLET. Default to aarch64-linux-gnu. [arguments]: Use gexps. Add a #:target argument. Streamline how the CROSS_COMPILE make flag is computed. [native-inputs]: Delete field. --- Changes in v4: - New commit gnu/packages/firmware.scm | 116 +++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 64 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f08d59752a..bd20ee81d9 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020, 2021, 2022 Marius Bakke ;;; Copyright © 2021 Petr Hodina -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -944,70 +944,58 @@ (define-public ovmf-arm (string-append fmw "/ovmf_arm.bin"))))))))) (supported-systems %supported-systems))) -(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) - (package - (name (string-append "arm-trusted-firmware-" platform)) - (version "2.8") - (source - (origin - (method git-fetch) - (uri (git-reference +(define* (make-arm-trusted-firmware platform + #:key (triplet "aarch64-linux-gnu")) + (let ((native-build? (lambda () + ;; Note: %current-system is a *triplet*, unlike its + ;; name would suggest. + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) + (package + (name (string-append "arm-trusted-firmware-" platform)) + (version "2.8") + (source + (origin + (method git-fetch) + (uri (git-reference ;; There are only GitHub generated release snapshots. (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") (commit (string-append "v" version)))) - (file-name (git-file-name "arm-trusted-firmware" version)) - (sha256 - (base32 - "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) - (snippet - #~(begin - (use-modules (guix build utils)) - ;; Remove binary blobs which do not contain source or proper license. - (for-each (lambda (file) - (delete-file file)) - (find-files "." "\\.bin$")))))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (find-files "." "\\.(bin|elf)$"))) - (for-each - (lambda (file) - (install-file file out)) - bin))))) - #:make-flags (list (string-append "PLAT=" ,platform) - ,@(if (and (not (string-prefix? "aarch64" - (%current-system))) - (string-prefix? "aarch64" arch)) - `("CROSS_COMPILE=aarch64-linux-gnu-") - '()) - ,@(if (and (not (string-prefix? "armhf" - (%current-system))) - (string-prefix? "armhf" arch)) - `("CROSS_COMPILE=arm-linux-gnueabihf-") - '()) - "DEBUG=1") - #:tests? #f)) ; no tests - (native-inputs - (let ((system (%current-system))) - (cond - ((and (not (string-prefix? "aarch64" system)) - (string-prefix? "aarch64" arch)) - (list (cross-gcc "aarch64-linux-gnu") - (cross-binutils "aarch64-linux-gnu"))) - ((and (not (string-prefix? "armhf" system)) - (string-prefix? "armhf" arch)) - (list (cross-gcc "arm-linux-gnueabihf") - (cross-binutils "arm-linux-gnueabihf"))) - (else '())))) - (home-page "https://www.trustedfirmware.org/") - (synopsis "Implementation of \"secure world software\"") - (description - "ARM Trusted Firmware provides a reference implementation of secure world + (file-name (git-file-name "arm-trusted-firmware" version)) + (sha256 + (base32 + "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Remove binary blobs which do not contain source or proper + ;; license. + (for-each (lambda (file) + (delete-file file)) + (find-files "." "\\.bin$")))))) + (build-system gnu-build-system) + (arguments + (list + #:target (and (not (native-build?)) triplet) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install + (lambda _ + (for-each (lambda (file) + (install-file file #$output)) + (find-files "." "\\.(bin|elf)$"))))) + #:make-flags #~(list (string-append "PLAT=" #$platform) + #$@(if (not (native-build?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + "DEBUG=1") + #:tests? #f)) ;no test suite + (home-page "https://www.trustedfirmware.org/") + (synopsis "Implementation of \"secure world software\"") + (description + "ARM Trusted Firmware provides a reference implementation of secure world software for ARMv7A and ARMv8-A, including a Secure Monitor executing at @dfn{Exception Level 3} (EL3). It implements various ARM interface standards, such as: @@ -1018,8 +1006,8 @@ (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) @item System Control and Management Interface @item Software Delegated Exception Interface (SDEI) @end enumerate\n") - (license (list license:bsd-3 - license:bsd-2)))) ; libfdt + (license (list license:bsd-3 + license:bsd-2))))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 15:45:15 2023 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:15 +0000 Received: from localhost ([127.0.0.1]:44031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyF-0007KC-25 for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:15 -0500 Received: from mail-vk1-f178.google.com ([209.85.221.178]:40930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyB-0007Ii-1o for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:11 -0500 Received: by mail-vk1-f178.google.com with SMTP id w72so7804584vkw.7 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S5SLEwlkzVnelb0AqsZ/Hk+Ptl+a04guB8w7hKuzQoY=; b=CBv6roa8e6NFul6kdqmZwhUnaOV4gvqlh3wTsOzjXKWxQC9+NaL4TBjTmIkDDVDcAs A9Uc0ShqIOsrwmQL5XCyzwx+NPNBfkg7s+YwlM2n0g+jdgsNe66MMLUJIAxtSuSiVR8x /w8O5bS7bIJ2aql4Mw+IClhBxfbXO6nFdeq98ZUFigcfBNlUk+rMaqv+2743z8ZB4L3G zQWf+vSOkPLGQrDwg+LwfMKlFKGly33aLTk0HlImUbM0VQmEOYYP+ihVLRhF2Swk8XBV R66wUmZ4oho9XqR17a7UYk4Jk+bWvH75ZIYyxmBvGgnB1cnVSYFqmP2KPFFcCMwpLxBT KpIA== 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=S5SLEwlkzVnelb0AqsZ/Hk+Ptl+a04guB8w7hKuzQoY=; b=EmJECm9H530wOLxMBTdopl9fsebsq/9DP6IB4xt/AibNLJGA86hqGsnPjPB7icG7NB Q6INfkxuSp8Fy6bKFMTiQqQg9L0H/YNi+DrunzV2lUBwve73tKzrNiyJ89/6LMxCX83/ qwWtcrmYmbRG8pntlHpdpRNQdE8EhJUD7GmqtMcvNgz53XTTTe+NxqYEYh3QhbgmbteI n49Uhdeax8K/42FI8wiRvCCD4CgmUqo8mE7RGppsPdA5HgCkiU4LJ+8Qel4oZ18o84/R rmKDVC8ziXSs45/7JaKQJlU1Bd7Gy/PY3VfyMES7fmt1EpY6oVcC206BGUfRu2luU4lQ gw4A== X-Gm-Message-State: AFqh2ko6/0cm7KKgFV5y3oDW8jfDOB1dGgiyi5n5FywXSjz3HCX5vAAc uhbotvaa0E3skPMDKVciMjvLpzCeR/Vi38JT X-Google-Smtp-Source: AMrXdXtF9UTuzJ0c5BIN31rE9tiqaIthJ5IHrZnl+9+yUrm6ho0no63M5U9gMpfcJ4RPycnXqBGzUQ== X-Received: by 2002:a1f:a8c7:0:b0:3da:f53f:8fc0 with SMTP id r190-20020a1fa8c7000000b003daf53f8fc0mr2412598vke.4.1673469903990; Wed, 11 Jan 2023 12:45:03 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:45:03 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build. Date: Wed, 11 Jan 2023 15:44:33 -0500 Message-Id: <20230111204433.15305-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- Changes in v4: - New commit gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0878dd3168..c3f254cf0b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1100,17 +1100,16 @@ (define-public u-boot-puma-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 17:12:25 2023 Received: (at 60224) by debbugs.gnu.org; 12 Jan 2023 22:12:25 +0000 Received: from localhost ([127.0.0.1]:48761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG5o9-0004BI-34 for submit@debbugs.gnu.org; Thu, 12 Jan 2023 17:12:25 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:52372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG5o6-0004B3-JS for 60224@debbugs.gnu.org; Thu, 12 Jan 2023 17:12:23 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 61CF01AB7D; Thu, 12 Jan 2023 14:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1673561536; bh=0VTxDMsix1gP52h+YaC9YIV/sjsjTBpSqz0+ZxaYLSU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VjnmO8eg4/wQd3BZ0YVMapagJB0rCYZHAgzmLVtL10OQjypAgn7hGxyiJhBS7k2Mt 0Cq4JGPPNvT+RPYIXSX+YckoobpfjCBqiEZt3WdWRy6xC1dT4G2xpeZPjYAboLlmzl RAsr6tb/B1/elZ2kOCHciiksdfDUcSKlttqNLTf+q0CVhLP3vnr/2z/0cKqhVaffYF XLE9LVsSYpJrx3XRakiPUSD9vEIX8WrrPatyOy5o5TDERQmYsorYwNBpkd+gwzzf8v 7eJucSenCTAuYqumv+ddKiYJIvbbmoA3qPcx43srz4fCm8fasPF21GMrj6I4npX8r6 eqiJloIQhA1fA== From: Vagrant Cascadian To: Maxim Cournoyer , 60224@debbugs.gnu.org Subject: Re: [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. In-Reply-To: <20230111204433.15305-7-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> <20230111204433.15305-7-maxim.cournoyer@gmail.com> Date: Thu, 12 Jan 2023 14:12:12 -0800 Message-ID: <87tu0v7683.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-01-11, Maxim Cournoyer wrote: > * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) > [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf does= n't > exist anymore for some reason. The code no longer mentions bl31.elf, but the commit comment still does! > [native-inputs]: Turn into... > [inputs]: ... this. > > --- > > Changes in v4: > - Revert erroneously replaced firmware package > - Revert bl31.bin -> bl31.elf change caused by the above > - Make the arm-trusted-firmware-sun50i-a64 a host input So fix the commit comment to reflect that... > gnu/packages/bootloaders.scm | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 87d5bcb824..0c5205fa86 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -1010,17 +1010,13 @@ (define*-public (make-u-boot-sunxi64-package boar= d triplet > (arguments > (substitute-keyword-arguments (package-arguments base) > ((#:phases phases) > - `(modify-phases ,phases > - (add-after 'unpack 'set-environment > - (lambda* (#:key native-inputs inputs #:allow-other-keys) > - (let ((bl31 > - (string-append > - (assoc-ref (or native-inputs inputs) "firmware") > - "/bl31.bin"))) > - (setenv "BL31" bl31)))))))) > - (native-inputs > - `(("firmware" ,arm-trusted-firmware-sun50i-a64) > - ,@(package-native-inputs base)))))) > + #~(modify-phases #$phases > + (add-after 'unpack 'set-environment > + (lambda* (#:key native-inputs inputs #:allow-other-keys) > + (setenv "BL31" (search-input-file inputs "bl31.bin")))= ))))) > + (inputs > + (modify-inputs (package-inputs base) > + (append arm-trusted-firmware-sun50i-a64)))))) >=20=20 > (define-public u-boot-pine64-plus > (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) > --=20 > 2.38.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8CFvAAKCRDcUY/If5cW qjsIAQCzceVg54TqcPCMuIUYQyhHQ21NkajdBa32N+EcSUzaWgD+Im8Snkih8c5a a6O2VmJBZXwWWQ073J11If5psJqJ7AU= =dEEF -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:02 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:02 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8H-0007oQ-8A for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:02 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:34396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8G-0007o1-1C for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:00 -0500 Received: by mail-qv1-f44.google.com with SMTP id n2so2986032qvo.1 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=njBYzXhWpMyet/PUw8ErK4ju78CIYBGi8O5ZSMYIvodErHKTgLWijVjiDie3PQfj7U NfdjGK2DapNwQvYqpbJHm1e13OOCwcWpqOzKveaN7ueo7tgcwpNclvyKtc1WgAyCjJI4 o9C8kQweDOiT6c06XoIm/QwuYuqpXudXFORL8609cBQJa+OlBUvu231J4Evx2U4A70Ls ty2zVwqLrsYiBPLXXR/GPJFyu0Duhlog9UiN6cDB0OiGI2HghgOE3RUdEFhYWFr4E2qm c1nbKJS3xuVhb2lqxz/mTgUMLX9LXpcSAAvYO1Fjo/XdVM9wAVpZaxgdCPTg0JfxQHs/ bdKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=OIhin5DHqEgs/ZBwAJsIFtkvnvIJQYEX0CGB9wzea2FiexjIT3zk5nuZexQ17LWund UaqdyYQttO6Ye1fFuxNqfaOAOukkj92leOlSqZfi33Vi+SRwi5DNMw+k+BRj/+/jR+cY 38XnMXuFIAyuGwX9KUx9wjWsq5ASuhuI+fv9laOxb/ZgkKuPbBeroFwDcrHJT45J2sYt 88ODOqY96a0A1hAKxl/nU86MfEgSKbSizVTuNs9UU48cYuy4s+wpILtBjGD7EJO84UP4 8gQ0uGPL00/Jn8oo7y4D9WM81pc6Ix3p7G24JEuz4A1FV/tFdme14o7DXDGtonvAXEO8 0IVA== X-Gm-Message-State: AFqh2kr6AymA1pxRV0eKCMdR7w7/HKiNnBCh4/5KckO2NWfSgh72/1RT 3coCFxumF9zZexJCeMhlzKeLF1dajDt3nh/K X-Google-Smtp-Source: AMrXdXterIm95bHe48sb0vlyNtMw6pycr2Lh2vY+Jqi3AWFiXYjZjgYMftBmk4qj0zOT0l2y3C+3mg== X-Received: by 2002:a05:6214:5bc2:b0:4c7:62eb:145d with SMTP id lr2-20020a0562145bc200b004c762eb145dmr144239198qvb.25.1673839553861; Sun, 15 Jan 2023 19:25:53 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:53 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 01/13] gnu: make-u-boot-package: Add a u-boot argument and use gexps. Date: Sun, 15 Jan 2023 22:25:32 -0500 Message-Id: <20230116032544.1378-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. Do not bind OUTPUTS. --- (no changes since v3) Changes in v3: - No longer bind 'outputs' extraneously in build phases gnu/packages/bootloaders.scm | 181 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 84 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8dc6ff698d..96dd65ae9d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,11 +860,13 @@ (define*-public (make-u-boot-package board triplet defconfig configs name-suffix - append-description) + append-description + (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description." +appended to the package description. U-BOOT can be used when a fork or a +different version of U-Boot must be used." (let ((same-arch? (lambda () (string=? (%current-system) (gnu-triplet->nix-system triplet))))) @@ -879,91 +881,102 @@ (define*-public (make-u-boot-package board triplet "\n\n" append-description) (package-description u-boot))) (native-inputs - `(,@(if (not (same-arch?)) + ;; Note: leave the native u-boot inputs first, so that a user can + ;; override the cross-gcc and cross-binutils packages. + `(,@(package-native-inputs u-boot) + ,@(if (not (same-arch?)) `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `()) - ,@(package-native-inputs u-boot))) + `()))) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build kconfig) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build kconfig)) - #:test-target "test" - #:make-flags - (list "HOSTCC=gcc" - "KBUILD_VERBOSE=1" - ,@(if (not (same-arch?)) - `((string-append "CROSS_COMPILE=" ,triplet "-")) - '())) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((config-name (string-append ,board "_defconfig")) - (config-file (string-append "configs/" config-name)) - (defconfig ,defconfig) - (configs ',configs)) - (when defconfig - ;; Replace the board-specific defconfig with the given one. - (copy-file defconfig config-file)) - (if (file-exists? config-file) - (begin - (when configs - (modify-defconfig config-file configs)) - (apply invoke "make" `(,@make-flags ,config-name)) - (verify-config ".config" config-file)) - (begin - (display "invalid board name; valid board names are:" - (current-error-port)) - (let ((suffix-len (string-length "_defconfig")) - (entries (scandir "configs"))) - (for-each (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format (current-error-port) - "- ~A\n" - (string-drop-right file-name - suffix-len)))) - (sort entries string-ci<))) - (error "invalid boardname ~s" ,board)))))) - (add-after 'configure 'disable-tools-libcrypto - ;; Disable libcrypto due to GPL and OpenSSL license - ;; incompatibilities - (lambda _ - (substitute* ".config" - (("CONFIG_TOOLS_LIBCRYPTO=.*$") "CONFIG_TOOLS_LIBCRYPTO=n")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (uboot-files (append - (remove - ;; Those would not be reproducible - ;; because of the randomness used - ;; to produce them. - ;; It's expected that the user will - ;; use u-boot-tools to generate them - ;; instead. - (lambda (name) - (string-suffix? - "sunxi-spl-with-ecc.bin" - name)) - (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) - (find-files "." "^(MLO|SPL)$")))) - (mkdir-p libexec) - (install-file ".config" libexec) - ;; Useful for "qemu -kernel". - (install-file "u-boot" libexec) - (for-each - (lambda (file) - (let ((target-file (string-append libexec "/" file))) - (mkdir-p (dirname target-file)) - (copy-file file target-file))) - uboot-files) - #t))))))))) + (substitute-keyword-arguments (package-arguments u-boot) + ((#:modules modules '()) + `((ice-9 ftw) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build kconfig) + (guix build utils) + ,@modules)) + ((#:imported-modules imported-modules '()) + `((guix build kconfig) + ,@%gnu-build-system-modules + ,@imported-modules)) + ((#:test-target _ "test") + "test") + ((#:make-flags make-flags '()) + #~(list "HOSTCC=gcc" + "KBUILD_VERBOSE=1" + #$@(if (not (same-arch?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + #$@make-flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (let* ((config-name (string-append #$board "_defconfig")) + (config-file (string-append "configs/" config-name)) + (defconfig #$defconfig) + (configs '#$configs)) + (when defconfig + ;; Replace the board-specific defconfig with the given + ;; one. + (copy-file defconfig config-file)) + (if (file-exists? config-file) + (begin + (when configs + (modify-defconfig config-file configs)) + (apply invoke "make" `(,@make-flags ,config-name)) + (verify-config ".config" config-file)) + (begin + (display "invalid board name; valid board names are:" + (current-error-port)) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" + file-name) + (format (current-error-port) + "- ~A\n" + (string-drop-right + file-name suffix-len)))) + (sort entries string-ci<))) + (error "invalid boardname ~s" #$board)))))) + (add-after 'configure 'disable-tools-libcrypto + ;; Disable libcrypto due to GPL and OpenSSL license + ;; incompatibilities + (lambda _ + (substitute* ".config" + (("CONFIG_TOOLS_LIBCRYPTO=.*$") + "CONFIG_TOOLS_LIBCRYPTO=n")))) + (replace 'install + (lambda _ + (let ((libexec (string-append #$output "/libexec")) + (uboot-files + (append + (remove + ;; Those would not be reproducible + ;; because of the randomness used to + ;; produce them. It's expected that the + ;; user will use u-boot-tools to generate + ;; them instead. + (lambda (name) + (string-suffix? + "sunxi-spl-with-ecc.bin" + name)) + (find-files "." + ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + (find-files "." "^(MLO|SPL)$")))) + (mkdir-p libexec) + (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))))) (define-public u-boot-am335x-boneblack (let ((base (make-u-boot-package base-commit: a9a38f515e5770fe7d19052c761f0f5e839af4e6 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:04 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:04 +0000 Received: from localhost ([127.0.0.1]:60047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007p2-3O for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:38804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8G-0007o3-QX for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:01 -0500 Received: by mail-qv1-f47.google.com with SMTP id qb7so18874517qvb.5 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YKgWrovAAyKwXCZygjDa6eqtNhTxtwfa79aKsR8MAdo=; b=joRF7Ahs7zdmgy7uyQVhbGFLnBmiP738inKWtnlfhCh0vXlpHLkRKBYMoJrhwMjtVp Rhad3XypudUCXr05Isqp2Q0xDMNdHRsHocIq4yBjrYlwxMWdxbrfN5tlZNVXI1MzIXVR aKgt21qNdI+40mx7cXVSI90MbIKMx26WNRwgn5P0v3q2oVK+WWRlzDL/uMi6TzkXhqhL eCXEchMQnTCTVe4VEQCNhvE5GfGEAUStzUvLHpmwknZr+nAvPsUFjmRvvRoimOG24fXq 6Oa02z8DCb1le05Eu7GbjgleiOq5asy4JDlw7GTuYmleUGYsX3SnIshynoKwgxiNcr28 H50Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YKgWrovAAyKwXCZygjDa6eqtNhTxtwfa79aKsR8MAdo=; b=j16ntzwoRKGbwEAPHyF4RBiZS/hXvQvOvy6yZKTChuzO7r9GpfPiNEUijQGqBDAU9z R6lclHlMsEUA52CuDDM5VWsINA1THNHJmrY5pQSY/1Fuy4kiNczdpoXy1EK6kEGLCcPE okDNwh54tdRZRZ+QlRJ4L40CQKYozcVeqy+LWc2Imm9OjVQvmqi8fPbXEvg/6yADzDGR xCJ0fRlmcBAguU1r5G3O85EM0e3n1drwsufPgdTYxJ4RnpGA1QD9EExlxQnAn3BCjxDq 2yJfAAnq9Vf5yYahl1/4B9bXKXFsGfVuapdoaiZxsHkY3GzsU4HgSCUYKqNEod0bSt6j +A2g== X-Gm-Message-State: AFqh2kodF+n59oX1Se1wZ2RDSdniU/D7joJ3UY66n87iFyYGAhsEhTPj 1hhbsizwyRzINqdg3dbco6Iw68GvZORZGL58 X-Google-Smtp-Source: AMrXdXtyAP/NaafhEOmha1ylJEjuV0DJVY8XF+p9rZCSU7eLadRi5l2tCNtgqYzYxynUC3ukyaXIvw== X-Received: by 2002:a0c:fa51:0:b0:535:90a:48c1 with SMTP id k17-20020a0cfa51000000b00535090a48c1mr4173524qvo.18.1673839555224; Sun, 15 Jan 2023 19:25:55 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:54 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 02/13] gnu: make-u-boot-package: Install .imx files. Date: Sun, 15 Jan 2023 22:25:33 -0500 Message-Id: <20230116032544.1378-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-package) [phases] : Add imx to the regexp of files considered for installation. --- (no changes since v1) gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 96dd65ae9d..b17f8b1a9f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -965,7 +965,7 @@ (define*-public (make-u-boot-package board triplet "sunxi-spl-with-ecc.bin" name)) (find-files "." - ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + ".*\\.(bin|efi|img|imx|spl|itb|dtb|rksd)$")) (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:04 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:04 +0000 Received: from localhost ([127.0.0.1]:60049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007p5-CV for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:41675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8I-0007o5-55 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:02 -0500 Received: by mail-qv1-f47.google.com with SMTP id d13so18849201qvj.8 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lo3qoBY7CBTH0Mo2rlMlePlK8rsfm21g2R4hc3L3CVU=; b=Kxkb+/FVIkg1ig4Zf6YbnsZPmg1tOPIM0V8lATm4IaquzLNtmoyNGmbeZmVsTMsmQk MN1Eqas+7OO2NkHExvnhBSAGWDckirNO7KEKYs1tFAno+OqgPJjID9lwbOfY8DA/rTvp hg6B1/XoGQfYyBBHAXA0dKjPC4uFms7pm69Fsqb5uwwEswyLUG55AgB+9fLv7Si4s2yJ hE7NDLVyBF56yc6F37Kwgcxu3My26Xa6xbZS63qaOkyd3V+A5fauzaHr0FMMwGF6SQc1 A5cmy7nYKlajI9M0Ab6JlthMXYJa15lLLsK22vP5G8ljJzPUNkNTGt5nzal4p88u7bkV 9cvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lo3qoBY7CBTH0Mo2rlMlePlK8rsfm21g2R4hc3L3CVU=; b=J03zaaZbSwLMzBYUOV3lNLiNCkQoQeYvnEXQVmD40rx/XErkzyt94o1/N5mbWLmtoz dVfLN/ZSyG3U7gKvMZfMl6rNmsSICJAj1kAw95J8Ct/q6n5xqWlxFm+XKp41PvLyy4QY +QNPS2WxhspRr65RnkbHqYpmbCkd6iSAS+KzeCv4MAh3M3gFpEXjD6DgUBLio02lFRMZ KQVxCHJ5xUF0D/0+V2wA3xqjFgj2z8LIUpslLWT3Qcfic3dAnk6tCZ9W5w0UjTcwFKZK U533kP4HkNJ5Fz8CYitId/oEE51fawA8Y907lcv/GUIaPK+aG/ze6YFrIzzvAoaK5+CK CjXQ== X-Gm-Message-State: AFqh2kpZTVN0D4uS4aLOWHs0fTQfPwuTmnd2wTF1wPWQT5vwWz+N++xH 5NxCPPdpCauIbTNNWoRV98QPwnjdWI/i5HgC X-Google-Smtp-Source: AMrXdXu+QVtMpftQO0vOoVVdQw5Z67WrTTWDTjdvLAM5HkX6PapsW/piRZMHJUeAiRfklKQeA4N/tw== X-Received: by 2002:a05:6214:1186:b0:534:a801:112f with SMTP id t6-20020a056214118600b00534a801112fmr12630261qvv.46.1673839556635; Sun, 15 Jan 2023 19:25:56 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:56 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 03/13] gnu: u-boot: Reduce the number of native inputs. Date: Sun, 15 Jan 2023 22:25:34 -0500 Message-Id: <20230116032544.1378-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, U-Boot Mailing List , Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The extra python inputs are only needed for running the u-boot-test-tools test suite. This lowers the requirements for cross-building the various u-boot packages. * gnu/packages/bootloaders.scm (u-boot) [native-inputs]: Delete bc. Move python-coverage, python-pycryptodomex and python-pytest to... * gnu/packages/bootloaders.scm (u-boot-tools) [native-inputs]: ... here. --- Changes in v5: - New commit. gnu/packages/bootloaders.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b17f8b1a9f..7ec26dda05 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -662,8 +662,7 @@ (define u-boot "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h")))) (build-system gnu-build-system) (native-inputs - (list bc - bison + (list bison dtc gnutls flex @@ -672,9 +671,6 @@ (define u-boot perl pkg-config ;for 'make menuconfig' python - python-coverage - python-pycryptodomex - python-pytest swig (list util-linux "lib"))) (home-page "https://www.denx.de/wiki/U-Boot/") @@ -725,7 +721,7 @@ (define-public u-boot-tools (name "u-boot-tools") (native-inputs (modify-inputs (package-native-inputs u-boot) - (prepend sdl2))) + (prepend python-coverage python-pycryptodomex python-pytest sdl2))) (arguments `(#:make-flags '("HOSTCC=gcc") #:test-target "tcheck" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:10 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:10 +0000 Received: from localhost ([127.0.0.1]:60056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8P-0007pp-OP for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:45624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8J-0007o7-FU for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:03 -0500 Received: by mail-qt1-f176.google.com with SMTP id h21so23615430qta.12 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fv4ZwJnjOAMf+hgZd2D51OTW7vjya62HbX+G+hqzdfc=; b=Z7IiyBXePj3pZZj0maVOZ69/dqr0mYE3U2RsKYzH4Kdue6J1UxhTDRECwnir2FjgRw R+ALI9N2V4XSfsuB2lzMXqvSBdFC+zMU2O0UXm7L7Qs2FNXauO/AxF7ZEqxzHWSX04br /Rz/M1WPWTCdJ6AfujuoE+pPI2vfyddGor6YzQC+eqxWDyBJAeNUxQbs9pwZsJ+jGgt8 G9JWqtJh3SZnOMjCjh3S7ihAwKIDYW+P/UD6hjuMaf6UgdXJuni1ZzjRZtWV52lbLZWm Eu505voTJ2UQWtXJw9q3Cp6ixtNu4+0vtf+JAQ7U9eElQGP+qcFKasaJCLVpmR/Y9JfJ 9CeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fv4ZwJnjOAMf+hgZd2D51OTW7vjya62HbX+G+hqzdfc=; b=kGdFj6qTtr3TFpLDxkJurTAD7mx/mMH/VTHExmYs5S0HeEoN+0T6ZmqmtH2nNvIgVu rHIOOYBhLz0oerI+FdVExDM79DVaI2m45tXGA5gDVdBXMuNfSMGU76aOwOdQ7Xg6T8f5 LvGp9bIfCckqjkCVQxIFmOREfWrKEdf9+sYlATxsso+HXpRnC4UVpeB3LPHjptx25kc0 76AamAdOhLcF+K1CPDZA9wj3ZHZSmYWjnUuEvbG+QJ0E3L7LzKgFtGOZCQIj04xORjTW XSNZYfQZ+6igHsGva8Vo+8gg+xt2QSGufvmb7LsgJ1/V/qNN1Y2y4lScTTDO8nN2OkA+ QACQ== X-Gm-Message-State: AFqh2koywwLlna63+Bg/2+YWsG2wf7uQqhhIdOTVh1d/wDRwRe4LvJrM zFFTlXRb2gg8383QWjTUaiG62xsIMlkUJZvV X-Google-Smtp-Source: AMrXdXvq6VrkzjsGsUs0ErqLkTiwCMvrMzJOYfonHWLR+YGEgu7JJT4TFOIvrCCX1jeN8boaGf3rhg== X-Received: by 2002:a05:622a:5d93:b0:3ad:dd32:3410 with SMTP id fu19-20020a05622a5d9300b003addd323410mr31884674qtb.21.1673839557786; Sun, 15 Jan 2023 19:25:57 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:57 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 04/13] gnu: make-uboot-package: Simplify build. Date: Sun, 15 Jan 2023 22:25:35 -0500 Message-Id: <20230116032544.1378-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-package) : Rename procedure to 'native-build?'. [native-inputs]: Remove field. [arguments]: Specify the #:target argument, when not natively building. Adjust for the above renaming. --- Changes in v5: - Remove bogus comment Changes in v3: - Rename %current-target-system to %current-system in comment gnu/packages/bootloaders.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7ec26dda05..b7a31c8b48 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -863,9 +863,9 @@ (define*-public (make-u-boot-package board triplet NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is appended to the package description. U-BOOT can be used when a fork or a different version of U-Boot must be used." - (let ((same-arch? (lambda () - (string=? (%current-system) - (gnu-triplet->nix-system triplet))))) + (let ((native-build? (lambda () + (string=? (%current-system) + (gnu-triplet->nix-system triplet))))) (package (inherit u-boot) (name (string-append "u-boot-" @@ -876,16 +876,11 @@ (define*-public (make-u-boot-package board triplet (string-append (package-description u-boot) "\n\n" append-description) (package-description u-boot))) - (native-inputs - ;; Note: leave the native u-boot inputs first, so that a user can - ;; override the cross-gcc and cross-binutils packages. - `(,@(package-native-inputs u-boot) - ,@(if (not (same-arch?)) - `(("cross-gcc" ,(cross-gcc triplet)) - ("cross-binutils" ,(cross-binutils triplet))) - `()))) + (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments u-boot) + ((#:target _ #f) + (and (not (native-build?)) triplet)) ((#:modules modules '()) `((ice-9 ftw) (srfi srfi-1) @@ -902,7 +897,7 @@ (define*-public (make-u-boot-package board triplet ((#:make-flags make-flags '()) #~(list "HOSTCC=gcc" "KBUILD_VERBOSE=1" - #$@(if (not (same-arch?)) + #$@(if (not (native-build?)) (list (string-append "CROSS_COMPILE=" triplet "-")) '()) #$@make-flags)) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:10 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:10 +0000 Received: from localhost ([127.0.0.1]:60058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007ps-43 for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8K-0007oC-HK for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:04 -0500 Received: by mail-qt1-f174.google.com with SMTP id x5so141572qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=T5bQAegduhe4oEmuLD2FMzTnHuj2YUiICLA9RIA2tSdfBLoGpQVHGamKCGw0QNYpuP /HXfEeTyiCDzH8XQ7OAGjh3dDQO1gbB38RTXeQm0tsClwpFVb1YyeAJmwzTTircRUGIR 21enXvfviTAzlioD0luiGxEQtc8oEYWbAQo727jStEhKPLrPULRsvBRjY2fn/VWCok0k JrTPAQSa0mwGO1kN6jtGAkQwGAu836/UGRg4O6HhKcs9XReZgTp+lQ9efGGbYA7I7EED q6Gq9FArRI6Atgle7bybExNkFBajMDwFdewH3v0d4GINQxHU7amebqChxg4WxwtGEkMW kGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fDtzNjXRQEQ/FtltpH7Y2ETPCCP0JWIg+abDkgsAPP0=; b=bF6Xa1dwZ+m96irZLVMITyd61UclJDakjckcA03KEVQPjLxjlRRxn4er4RdyzK6cvD 7dDBTusP+TnlCbRASCXPEV5g1HRneUAL1GYV5VWj6UqAg7vINJFNrFcCyAs8az598mdV LMOMfmiizI/dGw97ghnRHy+dcTblOsR9nb7/RxyQVHOXUrbaAiJJJimhydlC0LOL9hFB yVkitb05ZTQfJ+wL4w9pynDny74eGeGAbsxgbVc/49VwRvRLGFg6XVyCYy+Xfpj6YbND Jtz43pdBtvV4XHL6Aww/racZ+eeDGD/YLGW0Yr/QjZcoezMOs85MqCF0zmmMe3wUZTxX QnKw== X-Gm-Message-State: AFqh2kqRLQ8QEFDFju/yYUT+VcQPSvhOp/VaiCJDTi3R3mzaz7gP+SuQ 0ZCx7F08ZaIA6QUzLPk+vdUFWBgTitzO5KZn X-Google-Smtp-Source: AMrXdXvuzz93hjOFMAfpcj1ku71hQ+nSzvsOh1k9aZ2s5fZ1n1NnIxe+DbE2EA2XjkBlUae1NK/iiQ== X-Received: by 2002:ac8:7766:0:b0:3a5:f9cb:886f with SMTP id h6-20020ac87766000000b003a5f9cb886fmr118465442qtu.29.1673839558996; Sun, 15 Jan 2023 19:25:58 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:58 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 05/13] gnu: make-u-boot-package: Allow disabling cross-compilation. Date: Sun, 15 Jan 2023 22:25:36 -0500 Message-Id: <20230116032544.1378-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the TRIPLET argument to disable cross-compilation. Update doc. --- (no changes since v1) gnu/packages/bootloaders.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b7a31c8b48..290d832a83 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,12 +860,14 @@ (define*-public (make-u-boot-package board triplet (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. -NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description. U-BOOT can be used when a fork or a -different version of U-Boot must be used." +TRIPLET may also be set to #f to disable cross-compilation. NAME-SUFFIX is +appended to the package name, while APPEND-DESCRIPTION is appended to the +package description. U-BOOT can be used when a fork or a different version of +U-Boot must be used." (let ((native-build? (lambda () - (string=? (%current-system) - (gnu-triplet->nix-system triplet))))) + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) (name (string-append "u-boot-" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:10 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:11 +0000 Received: from localhost ([127.0.0.1]:60060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pz-EE for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:41483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8L-0007oE-N0 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:06 -0500 Received: by mail-qt1-f178.google.com with SMTP id d16so10793465qtw.8 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=edUwSHd0rBjUJZnp3zvmryDuuwufJYQVfYslim3QNooe/ZQzI2dpB0AIpAwAfL1O9N 8Qa7oUBFDh6jePjWPpGttz7JJ7FbHKcuDXLbgbez6VfhVUNP1VhuKoix+jHQfA5spp6u GAgaDdXJ0I7gv5MP2T/BngZ/p5+F7SGDwF/BZoV/HA7SWnaBH6CR/5/IZ3WvjOOMVUvR 4/WQrbrBI5G3ZwzwF84K2HgMCFJntnHxhgwefF68rpjNuA6hmEWRPmBi+aAG3RMq7a83 g3juvZaORXGRm3gg0icbPMmO3MJNSkgLHOm79/4zgGgxr04NGABElpF3zCK6Iuuwis5r SxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=uaVCg19TjhZNjaX7r7tfVvT9mcGlohZ0quRFeFuFdnxFnyN4hZoSdS7S4rap6vepay NSfs4vAJHoq/US8zmAThhX2gqB7LwC4l8JE4Em3GQSZTfYN9kJC4RG/1q3v2cmaXLK5K fY8eFgtml2rTpplfRqW9zKzrf4uRuQmyZvZ0TY7hFl29JP3XHX7VPrD9b71w/6X6vu6D NBnZEqU7KQPx9ANEaKErUw/m7rxKfM9kr/DSHujqWtFnwwCUb0OiY9m2mQ/TfToCmtg/ zHzJGJcKvuqwjTEQjfet6i5NgRRwIBUjvnkGqbXZUpznWU2yTqv0lZLUYkBoqAogXlxz r4wQ== X-Gm-Message-State: AFqh2kr3DUnI8GlgfrNw36RnHrSJXw8mrqjBv+49ea0f4IZCyCAIZnMr QdrR+x0jFBZm5Tof79MOxvDQOm5fanmOXxW7 X-Google-Smtp-Source: AMrXdXumFSijtXxSuvNVGfLWPyv774Zd9nXX5qmCPsXFHUolCXcKI8RWjaJvlzZOVvooLfpl7vHZFA== X-Received: by 2002:a05:622a:1cc6:b0:3b6:33c6:c5ac with SMTP id bc6-20020a05622a1cc600b003b633c6c5acmr1704254qtb.4.1673839560161; Sun, 15 Jan 2023 19:26:00 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:59 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 06/13] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. Date: Sun, 15 Jan 2023 22:25:37 -0500 Message-Id: <20230116032544.1378-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 290d832a83..f3b3c91c47 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1221,17 +1221,16 @@ (define-public u-boot-pinebook-pro-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define*-public (make-u-boot-bin-package u-boot-package #:key -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:11 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:11 +0000 Received: from localhost ([127.0.0.1]:60063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007q7-TW for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:43000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8M-0007oV-UI for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:07 -0500 Received: by mail-qv1-f50.google.com with SMTP id m12so16808712qvt.9 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=eJYkrzbhk5UlVeNZRItupK2j2gjt0HssIe28NJUKqqOCresPzu3SoBvs8hlxb7+ane rMEgMU3WLLKVWUFBFYk/F87wyS7/qZubTlSsSFwQO+LdFCA7cjss1P9evwWKKhKIDBAM xFJXYqhRsCyHA3M18C2y7BrT/OmdKCi2VeZptF/C3SjA1QWUMfTDMcFS1eRSg4Wn/E4S RARiO25KoITjlaIfoGxfjg+kATV0xaJQCmEAoEp84y4wOXLYmg+C1sUST7UwWOpy2hfK tVwB1+l4XmowCYvbiEPfjVHKJPxHnqUKFFDAs0SEyRnGDuWJT/GmC9l8BuRHMG8YRk1J 43VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=ZHFz2FD1y3J0GoMv2TipWZ8iANMfejo0cLtlUb/Kyx6ESMDnwzUbqNhMjjdlY/u0JG qVAyOwb6w0k/wvSEFLLvYWomvzqnoqGb6DteOQTb/xpgjdUy+j6uB25VAIOloWWp9M8h qiy8YQ0kSnid872MqxHpvwnjM/xe6FmZVFVdB0VJ9sGnDApQRabXJE8O/Ef+khB75UY3 bIo9qBbCda+9Ar43mm086Sofc1v+W7J/scSnq5yjW9RXByvZ2tYIkSnsuXe+/f3lLt3K Z4Xq6duPweUgx61+kldIwgikYehfCgdVbLUQod++ZQeLeg08sCKkkDL7x7YSVzILW2bt dbGw== X-Gm-Message-State: AFqh2koYx1kMjGkpFmLfVH+Z8W9rpkkheQX7MKI7Spp8EY4nrFlcuHZ7 vCUKERZtrcSsKlzGMvr+exnbdKcbcxpaWeUC X-Google-Smtp-Source: AMrXdXslG+/1c9z6qY5F+H6T2XZAaiFJe1qEWQygfyS9i3FaRvv6Hlyj7Utk1Vvu4OOIwuiq79iY/A== X-Received: by 2002:a05:6214:11a6:b0:534:1d7d:a290 with SMTP id u6-20020a05621411a600b005341d7da290mr30057334qvv.36.1673839561322; Sun, 15 Jan 2023 19:26:01 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:01 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 07/13] gnu: u-boot-firefly-rk3399: Use gexps and fix build. Date: Sun, 15 Jan 2023 22:25:38 -0500 Message-Id: <20230116032544.1378-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f3b3c91c47..624a832802 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1156,16 +1156,16 @@ (define-public u-boot-firefly-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu" -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:11 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:12 +0000 Received: from localhost ([127.0.0.1]:60065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qL-GV for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:36861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8O-0007ov-4a for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:08 -0500 Received: by mail-qt1-f175.google.com with SMTP id x5so141647qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=iyNZ6efkx35AlTxuruZFSsO+E3lznjrq+SiZurr5ikUtrGLiPyGnh8mWd13Dm9/KQ1 LudFQ4vUJMXGN6uRhfaAyeRD3NGLP7wvOrPnTClGErYsN3unpFSUO/6JTF3q4RHEN/LQ m4xeL3XYcmHe90cBLTeKjR2vUI6qCi9kaTstACkZLfzE38u6uZTYrzXqw0bchGIf5KcX Qq1EDHwsBJ8gaV7hzqvw0y33T32STvyRA3cpLKQtPQSKib7WeVbzm2NHCnGB1ltyw6xN aL1Ht/k7OYgnQbfwIsx4rcp6mVqh+Bn3xcIH4EwoC9QJcWITB34i74WuzxF7i9nPNRvw IPvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=nBlG8B3rXEfBgoq77V6B35jwLE7Rgu7Nuunxr/oiL/304+h+tyL0dTOpxsK6oCl3fc jXQ50ZsqdoyMSwdMk1Lv4kYLw2q6xLJL8IiXK9jmUwoLQxHd6+GiDKShFpAJMQT7C+Rh kGXAvHPbafKJPGlOo1xu/kxE3GnqN72JMR3DVAGbJ30jOKAd/+pDcWxInZGRZZLNr8HV utt+z1JtsDis6x22FJaIvGmlKu+gN/kSC5lGMDY4RiKjcLqNlr6zOQ8RSGUM7WTuzuiL WjziiATl/sUJQVT3CPvORg41CdQfdMWzGoBp+xd4hBguSXg83+B86lHfz9ORux4nxGoN 1CVA== X-Gm-Message-State: AFqh2krbBvw4iC51A7jb6ElprdGpviOIj3CKeULYfCzggtyq9tY6tBff 4B6tlOjmL0WLBddkn08Bqta7r8ZY7+5MK7BA X-Google-Smtp-Source: AMrXdXs6Lk+NcKwdbrYgK7V4DZpLJYgimoFYQsoICIdY9c49C9QzVJhHfkbZlAMbWCjr8jhS2VKITg== X-Received: by 2002:ac8:4cc8:0:b0:3a8:e528:dab5 with SMTP id l8-20020ac84cc8000000b003a8e528dab5mr99625670qtv.0.1673839562525; Sun, 15 Jan 2023 19:26:02 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:02 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: Use gexps and fix build. Date: Sun, 15 Jan 2023 22:25:39 -0500 Message-Id: <20230116032544.1378-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) [native-inputs]: Turn into... [inputs]: ... this. --- Changes in v5: - Fix commit message Changes in v4: - Revert erroneously replaced firmware package - Revert bl31.bin -> bl31.elf change caused by the above - Make the arm-trusted-firmware-sun50i-a64 a host input gnu/packages/bootloaders.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 624a832802..53e6557ac7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1001,17 +1001,13 @@ (define*-public (make-u-boot-sunxi64-package board triplet (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((bl31 - (string-append - (assoc-ref (or native-inputs inputs) "firmware") - "/bl31.bin"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-sun50i-a64)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:12 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:12 +0000 Received: from localhost ([127.0.0.1]:60067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qS-RI for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8P-0007p3-Aa for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:09 -0500 Received: by mail-qv1-f51.google.com with SMTP id y8so18846946qvn.11 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=REutzbTResn2mreTbezE632ZghhpgMN7sFJjABPrdVBfFfqVJJO6MQ4wMUm0lY170X seLbiJWFygcjBBnrxgtrU9VaGZZiU8Zpi6kEQnQoQFXpc945DUDy/A+EkE8fPsP2Tqoh /ZfQTjO1Xn0kFyqPe5HpwkHKnv7UNW2IZOu/JfWS63mjD+R47jxDNA5Y+hBpyqOCXMbe PsluKbpNrJqPCSBj5YHlmxr9iSupRbMj7/tOZc5GP43RS2plXD8+Wkk5GwKD/r9kaihA uaqwuhMIrsMe9yZadd9DYglDPxO7WryH2yvTQnSsrEHMCnfdXdZnnNg/6aRMP526vsgZ ZYJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=bCT8r+tJYwCB803k/1FqHR+uku7eFoy84IL5vzT1HHZAt0HRxuWNVPd97kEtF4gLwN 4QOCuq6VVYTGKlipGYmqzo8IRR8AE60sHsuZK6DiiHimX2Y8tpakhTxgeN/tmA5JDsGS FoYgjGynhhxlnVolEGMnNoGJ0QEOpseV4NDtlaUOyiszrLhUrZmUvHjzb6rsfK2HYcQk 8YaeqFYOpIgGVdo0mZOCpgtRO+3QE7cDkalEGzfqm8wXN1jXebsRo47cIzhlLfvxEiY9 OvtxdUtkoTNZyjXdlBZzPdwOHRDassoY6BNo3aiVNuTsynSTyx3TRsoDWM2VSeW9Bqll BceA== X-Gm-Message-State: AFqh2kqshfzepQiJWtEgBXtxXl5ghguhZVtyz/XFcbBQOlTsg867sp8d BXYidrfIe+bhRrAqn9i+aDfSKTBb3m4xeWAI X-Google-Smtp-Source: AMrXdXsaVZQ8n4E2tHcv/a3ebALoLKcgbMpDW3pJFd1mzvfk7gBJ5KqBjBuNsy1Xbaxk7EZQ9+tcIw== X-Received: by 2002:ad4:4bc3:0:b0:4ca:28e3:27a2 with SMTP id l3-20020ad44bc3000000b004ca28e327a2mr117149146qvw.49.1673839563772; Sun, 15 Jan 2023 19:26:03 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:03 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: Use gexps and fix build. Date: Sun, 15 Jan 2023 22:25:40 -0500 Message-Id: <20230116032544.1378-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [native-inputs]: Remove input labels and use modify-inputs, and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Make arm-trusted-firmware-rk3328 a regular input gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 53e6557ac7..64af453844 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1136,14 +1136,13 @@ (define-public u-boot-rock64-rk3328 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (search-input-file inputs "/bl31.elf"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:22 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:22 +0000 Received: from localhost ([127.0.0.1]:60072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r7-Bf for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:22 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:43808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pN-Fw for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: by mail-qv1-f53.google.com with SMTP id q10so18842052qvt.10 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=nrVQPO5ttOHtEXwtGnQdK/dAFHiI50WGT/XeKwQ3iruxNgvYs9s/7kZqpML7r3Bzqo cAiBAcKNAaBmV4itCg19lUgbgJoQ9gdrec5W5xVwPBM9xpjDVCY19bf5EIyhX/miuimf Ka49x0Rxvp2zXiqBHiE4r7rXv4fqdTBkDZz9xnzS9/tIzIzDjBBoXq5qGymEJsd14jBm nh+5Df+Vow7Cb78/UDGZBoEwBcRW7Le3Y+CEnHIaMALM2v8IOVFsoV5mbfRPiC5W1uvy VBDhParB85ex7FKqWoZcm1xI258NXronKtYBiGUuwU/bJ3k/oj3roycMg6JYjcoZCeCl L5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=ZajWq5gUHzginDWHpDYIvs/J9e7WMytO0Gojnl0Pvorekn5h8LO425iIKgCe+ojDBj 4p18BrFWbocVWi5KEcYd9/I1G7hrVgEg0hvNRPQq0vvhYUeCVYqcTeOF0NmBMNwdTA4y G1Ig66CntI+c/AbOydI3Esp3hxJfgR4DhvpifrEMKTKTC13GM3aEAR1WpE6egsyXv8Qa 1cmS2XeTIBbK/7bjGGa5zrVWgHGcKsUOVp+0Ef++T5/7tkYLWrEEEm5S4aY9qS1Q8IeM gZDHTkd7wr5xhpwR99pFq2iCiECs7c6ius+4sXHwF/GO3jtnaCqHBDHbX78Y9elS1tXR wWCQ== X-Gm-Message-State: AFqh2korX8Phdf6lE8cV0r9p0iTkFZ0UG6cOA/t3d7gFqdMAdU7tu5gP Bz2nbjFISk5H40FYxyhQzhMoeifSsw7DPnlO X-Google-Smtp-Source: AMrXdXvyfsDc3vV1tB6XjRVX2DLfRz+Vpz5V5p8Tn3/JNpgqGOkRI8WumwOsC0sO8rsuA8gJlspaQg== X-Received: by 2002:a0c:f688:0:b0:532:d40:1eb0 with SMTP id p8-20020a0cf688000000b005320d401eb0mr59972966qvn.30.1673839564926; Sun, 15 Jan 2023 19:26:04 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:04 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 10/13] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels. Date: Sun, 15 Jan 2023 22:25:41 -0500 Message-Id: <20230116032544.1378-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-sifive-unmatched) [arguments]: Use gexps. Use search-input-file. [inputs]: Remove labels. Use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 64af453844..d9f9672f77 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1119,15 +1119,14 @@ (define-public u-boot-sifive-unmatched (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((opensbi (string-append (assoc-ref inputs "firmware") - "/fw_dynamic.bin"))) - (setenv "OPENSBI" opensbi)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "OPENSBI" (search-input-file inputs + "fw_dynamic.bin")))))))) (inputs - `(("firmware" ,opensbi-generic) - ,@(package-inputs base)))))) + (modify-inputs (package-inputs base) + (append opensbi-generic)))))) (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:23 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:23 +0000 Received: from localhost ([127.0.0.1]:60074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r9-Lu for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:40926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007pV-Sm for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: by mail-qt1-f181.google.com with SMTP id jr10so16467155qtb.7 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=H83keKuAa2FPPWfrbAc1skM2WrNQw4IhLvJ8FWIfXTC+A8VGS5fdjDI4tpV9jjeOiU Ol0JPThdel8KgZ8OCf5NlrqXUxOzQVJ24wt6EsxQQTXFxxyi3ycz4VFNj4E8HxA7aso3 P+uHt5LJrDCnY1j+jxIQAjsufSO6e1BHxRpYFmzld6s9MSOfAx9QLZUzLIqxHUGDQ8xw eMbAFteUEueDu7ZTq2fvdEpnacLGV2pLTLDYNchsxsbsI3WQmf+J4iLlso0udH/VC2rj bTK3q7vivQOz7NQdsF6Z1MeHw1p/erNpxDfya0hc9ime6LPHrToMH0ZihCS4uB9hbBSw AjUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vMnnyqvc1WmPs7eKBIh9WVuvVcTB+tCa/NVI9WymVU=; b=BdPKKJIJLM0XcDbvv59H7Dq/D0Tx1iz6W48zvZvijMqvYrsOAcGwVZzuG0NCzQGN0+ l9PYkhntEdI1oLZJ2Rf/NRtD9U75hmyWVVK6OPg49W+MRASbGphXXMAfvdUwPImdWIwN 92omqTkPfO9RdT5q+qWjLaEH/z54rwBJg5ouDLD1NZ/Q8K6JRdDuQ1/9bqnXZLayms/6 ePQU5rkjFWIO7oJmAHfkbig87Yv0xJrMGQgA4JqZTnIC8UMvpRjNzTIcQZlgP04uqFWj F5E7GS8inpHM9IBDw1CdWEkCn3QBHsQN3jg5BU7qzXRRxi5HCdewMqSiVwmj73mW/9mG lVJQ== X-Gm-Message-State: AFqh2kpdrLDal8X5DR4Bv6l3AgZ5KsOmchhFJU3H1GV+ptug++5PKDvF u76fh5WlepZUPEOJBXtTqwsZDNkpSib61NPz X-Google-Smtp-Source: AMrXdXsePiM4Qim3RNDO8xjTSytg37d9YpC6qMlNUn6cSdU2v1ni3guU1vgQ3bUrsZOtwVY6R/L0NQ== X-Received: by 2002:ac8:73da:0:b0:3b6:2f46:937c with SMTP id v26-20020ac873da000000b003b62f46937cmr4858298qtp.37.1673839566192; Sun, 15 Jan 2023 19:26:06 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:05 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 11/13] gnu: u-boot-rockpro64-rk3399: Use gexps and fix build. Date: Sun, 15 Jan 2023 22:25:42 -0500 Message-Id: <20230116032544.1378-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Make the arm-trusted-firmware-rk3399 a regular input gnu/packages/bootloaders.scm | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d9f9672f77..9da97232ea 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1176,37 +1176,36 @@ (define-public u-boot-rockpro64-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - (add-after 'unpack 'patch-header - (lambda _ - (substitute* "include/config_distro_bootcmd.h" - (("\"scsi_need_init=false") - "\"setenv scsi_need_init false") - (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") - "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) - (substitute* "include/configs/rockchip-common.h" - (("#define BOOT_TARGET_DEVICES\\(func\\)") - " + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + (add-after 'unpack 'patch-header + (lambda _ + (substitute* "include/config_distro_bootcmd.h" + (("\"scsi_need_init=false") + "\"setenv scsi_need_init false") + (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") + "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) + (substitute* "include/configs/rockchip-common.h" + (("#define BOOT_TARGET_DEVICES\\(func\\)") + " #if CONFIG_IS_ENABLED(CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func) #endif #define BOOT_TARGET_DEVICES(func)") - (("BOOT_TARGET_NVME\\(func\\) \\\\") - "\ + (("BOOT_TARGET_NVME\\(func\\) \\\\") + "\ BOOT_TARGET_NVME(func) \\ BOOT_TARGET_SCSI(func) \\")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:23 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:23 +0000 Received: from localhost ([127.0.0.1]:60076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8d-0007rI-2n for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:46818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8T-0007pc-34 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:13 -0500 Received: by mail-qv1-f42.google.com with SMTP id p96so6779751qvp.13 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KnVnQzOCLcdDgRhzVY9QmrfHk/ZdBqjvbOlC3jMiHEE=; b=VskrAZVAZMnDYe0H7HU5t9SDDEni0BR5jRFmpDrdnAPijMYq1BlVvoxa2X2/HCcRZh hVNYh5+CY5B0f8SdK+YlSjsN2f5l6anLZN5bdJtiAWH/g/Hn4nnTQrIgvF/ocC9sV3K1 fvbiLMxPopqB7m70yVTUoQgeihCR4z6JZyzIYeEyBQsX9kKYAI8RPIrh+GUjLSk1jldi 1YjIk0gyes/hgwc2aOI/WC9wH0igqY7FLelW/FoE86UsEj1W/Fuine+IdUs1LV3uhba1 /MIDEM1Fyd1u6b4VNwtNy98kVUzQqr5FGWBKzDkUGqMBGyv1I7GaJwEz6Wc5e3v8aE/F 22qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KnVnQzOCLcdDgRhzVY9QmrfHk/ZdBqjvbOlC3jMiHEE=; b=lTcc9gxPG066pWZ9Jfv9fV/EjdfH+cEQu15vpOzbQNucIapQ+X1CJpX35uUMxO53St Zfqv8qEGk0JBbbqfZji7c8vpIgLaJjIqtCGxUIlA/0kCAIiz7jmSKYb5pGIi+ejjDvCo GPZkV5+nZ6T5M9yH0FVYb0Jasv1T5LASVHY5K1oG8iyWm7fsYL2UvjEMqb8ZRqhQZGV6 srfsQG/B8p4QaMbbaeHDEy5QvngNG1Ca3fC/5ZOwZn1x3CU2FQo1tqRPJxa5nTLFRTow Y2Vy+jk73UnuIr3t+m2VUUqXePrv4aYXj5PbZeCcuwmEv4BQXOix/cqEiwBXD/uzapa3 OPtQ== X-Gm-Message-State: AFqh2ko6stpFe/8UQZl3UF40g6uJcuCFsi0UqrFZLKBsGMX1n97IAhoS v3muZ2Jcwqsmfu3iXqRbsMRuHFqlAX6tpLB7 X-Google-Smtp-Source: AMrXdXv0YHORfVdjZN8MPWF4mjZyLihtH1108fGzOWbs7+nvuSZ7ZdJRae8o3/wVExbGWuTaVaAliw== X-Received: by 2002:ad4:4a0d:0:b0:4c7:595c:9940 with SMTP id m13-20020ad44a0d000000b004c7595c9940mr110672699qvz.51.1673839567446; Sun, 15 Jan 2023 19:26:07 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:07 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 12/13] gnu: make-arm-trusted-firmware: Simplify build. Date: Sun, 15 Jan 2023 22:25:43 -0500 Message-Id: <20230116032544.1378-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Reuse knowledge from recent U-Boot modifications to streamline the package definition. * gnu/packages/firmware.scm (make-arm-trusted-firmware): Change optional argument ARCH to keyword TRIPLET. Default to aarch64-linux-gnu. [arguments]: Use gexps. Add a #:target argument. Streamline how the CROSS_COMPILE make flag is computed. [native-inputs]: Delete field. --- (no changes since v4) Changes in v4: - New commit gnu/packages/firmware.scm | 116 +++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 64 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index b6ee4c0565..029e84d5c2 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020, 2021, 2022 Marius Bakke ;;; Copyright © 2021 Petr Hodina -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -944,70 +944,58 @@ (define-public ovmf-arm (string-append fmw "/ovmf_arm.bin"))))))))) (supported-systems %supported-systems))) -(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) - (package - (name (string-append "arm-trusted-firmware-" platform)) - (version "2.8") - (source - (origin - (method git-fetch) - (uri (git-reference +(define* (make-arm-trusted-firmware platform + #:key (triplet "aarch64-linux-gnu")) + (let ((native-build? (lambda () + ;; Note: %current-system is a *triplet*, unlike its + ;; name would suggest. + (or (not triplet) ;disable cross-compilation + (string=? (%current-system) + (gnu-triplet->nix-system triplet)))))) + (package + (name (string-append "arm-trusted-firmware-" platform)) + (version "2.8") + (source + (origin + (method git-fetch) + (uri (git-reference ;; There are only GitHub generated release snapshots. (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") (commit (string-append "v" version)))) - (file-name (git-file-name "arm-trusted-firmware" version)) - (sha256 - (base32 - "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) - (snippet - #~(begin - (use-modules (guix build utils)) - ;; Remove binary blobs which do not contain source or proper license. - (for-each (lambda (file) - (delete-file file)) - (find-files "." "\\.bin$")))))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (find-files "." "\\.(bin|elf)$"))) - (for-each - (lambda (file) - (install-file file out)) - bin))))) - #:make-flags (list (string-append "PLAT=" ,platform) - ,@(if (and (not (string-prefix? "aarch64" - (%current-system))) - (string-prefix? "aarch64" arch)) - `("CROSS_COMPILE=aarch64-linux-gnu-") - '()) - ,@(if (and (not (string-prefix? "armhf" - (%current-system))) - (string-prefix? "armhf" arch)) - `("CROSS_COMPILE=arm-linux-gnueabihf-") - '()) - "DEBUG=1") - #:tests? #f)) ; no tests - (native-inputs - (let ((system (%current-system))) - (cond - ((and (not (string-prefix? "aarch64" system)) - (string-prefix? "aarch64" arch)) - (list (cross-gcc "aarch64-linux-gnu") - (cross-binutils "aarch64-linux-gnu"))) - ((and (not (string-prefix? "armhf" system)) - (string-prefix? "armhf" arch)) - (list (cross-gcc "arm-linux-gnueabihf") - (cross-binutils "arm-linux-gnueabihf"))) - (else '())))) - (home-page "https://www.trustedfirmware.org/") - (synopsis "Implementation of \"secure world software\"") - (description - "ARM Trusted Firmware provides a reference implementation of secure world + (file-name (git-file-name "arm-trusted-firmware" version)) + (sha256 + (base32 + "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Remove binary blobs which do not contain source or proper + ;; license. + (for-each (lambda (file) + (delete-file file)) + (find-files "." "\\.bin$")))))) + (build-system gnu-build-system) + (arguments + (list + #:target (and (not (native-build?)) triplet) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install + (lambda _ + (for-each (lambda (file) + (install-file file #$output)) + (find-files "." "\\.(bin|elf)$"))))) + #:make-flags #~(list (string-append "PLAT=" #$platform) + #$@(if (not (native-build?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + "DEBUG=1") + #:tests? #f)) ;no test suite + (home-page "https://www.trustedfirmware.org/") + (synopsis "Implementation of \"secure world software\"") + (description + "ARM Trusted Firmware provides a reference implementation of secure world software for ARMv7A and ARMv8-A, including a Secure Monitor executing at @dfn{Exception Level 3} (EL3). It implements various ARM interface standards, such as: @@ -1018,8 +1006,8 @@ (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) @item System Control and Management Interface @item Software Delegated Exception Interface (SDEI) @end enumerate\n") - (license (list license:bsd-3 - license:bsd-2)))) ; libfdt + (license (list license:bsd-3 + license:bsd-2))))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64"))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:26:24 2023 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:24 +0000 Received: from localhost ([127.0.0.1]:60078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8d-0007rQ-MU for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8U-0007pj-6l for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:14 -0500 Received: by mail-qv1-f49.google.com with SMTP id p96so6779765qvp.13 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=qK73+VxovCkgLYsmV1tyK7vMRXNosM2JyzNnvE+8wocNa0nVEnK1PuG9SmzSbdtqga thCfoE9TdbwLRcYSZAbwLq38BvqGoibFoZboLIgM8fDrx3YbUK/hLC0xqGKAM/f1wLqC RJhaUwQ2+tXNiE9rWXqZIykJkU8unVNycUBhUmpkCuncViMYeL3eDeU4aWO+TyKLGFgC VqzoiNkvg4B8+GfEIikQNI3QrTPtLfIfGJQbX45fDdnbbKCGlpnSLekf1PVboV6v3ddT 565YB4IiwjQZaxEVTdAZ1TCfD56iVWMAjBfVhQJ3OFGPRPJ+/YqW1K0wnbLUqhfq0qyf R7Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=cX81U/4BrFq4a88+r9XsYfjE43CiZirCMl6Fu8SECZUwQ9b7LNUUKB1pnloQu63pv4 /ogKf31a5qvKIjqAea7n/FDvrD2sOWqWRvnjd2WAi5FfESas5hQkXB0X46aiSfcHdo6J OqstvZjMNElWYscftQj/tEFPKdr20T6lrvoEGUDKmxl1VTW1Tp73efjyL48KNRrs9XLL t8auEeqVXiUDlb2HnokZlhs4thIdRtCQAi7veelNsBmxAjFkDIkgw+9s2xARjnzAj78V rhXvP2YMZYc0Q8wfYG0qf1SCmluNgWtWT+FcyZT+QWXkjt3twWXZsuql/r9unFLFkVv6 Edgg== X-Gm-Message-State: AFqh2koCUJgw3rLW8GxBU0uaZ+g1bizyEOs08v6loUXLDAckfIqQAfIj mBbWykNufL7ZUAWfx+u3wBOR6N484URCe8U1 X-Google-Smtp-Source: AMrXdXs1QkRkKNDBBdhVH/QW17qep1FO+jwEIyUK1JDXrZaL6sZRUyH2SGLYxP71G+iADLkz0OJPBA== X-Received: by 2002:ad4:5308:0:b0:532:25ce:8ae0 with SMTP id y8-20020ad45308000000b0053225ce8ae0mr45703373qvr.10.1673839568597; Sun, 15 Jan 2023 19:26:08 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:08 -0800 (PST) From: Maxim Cournoyer To: 60224@debbugs.gnu.org Subject: [PATCH v5 13/13] gnu: u-boot-puma-rk3399: Use gexps and fix build. Date: Sun, 15 Jan 2023 22:25:44 -0500 Message-Id: <20230116032544.1378-13-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224 Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- (no changes since v4) Changes in v4: - New commit gnu/packages/bootloaders.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9da97232ea..4cf6a74022 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1091,17 +1091,16 @@ (define-public u-boot-puma-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" - (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 22:27:06 2023 Received: (at control) by debbugs.gnu.org; 16 Jan 2023 03:27:06 +0000 Received: from localhost ([127.0.0.1]:60091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG9K-0007tk-4O for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:34442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG9I-0007sI-1x for control@debbugs.gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: by mail-qv1-f50.google.com with SMTP id n2so2986925qvo.1 for ; Sun, 15 Jan 2023 19:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=419g0anCUlaH2Fiifq6vcHWe3yNDN5QA4YjWBM6xkos=; b=a5DCcKsbQznbK4bcHNKQBQIuaq2/wQVv5KW6I4i8+hNaT2RZWUQELNNIaam9JB/gkb Ls1xyZyojDYypLHW7oeeyISmGSnTY+LvnBqtdJpCpsBTGai5o5Zh3MJB5c0WRQp1D6CV +K8m7lRSxh5de2DXp48ijPKo2oWJ5Fy7LdfCbiuSZws+tHUesX5z3ltSMyENS4Y3mFRr ONewL4KpXoxXZSbN9ZmHGR9dYK/KkeTXs7BXr/KH6lNXYGO0J6pGkTvnUhHExEAe9P0/ PVUBYWZLdCH6vmhEFDRsruJ/3j9qdUBwhkWWlQDNRPH7aytd0V2ost8kH6U4vpG7+tBq rAPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=419g0anCUlaH2Fiifq6vcHWe3yNDN5QA4YjWBM6xkos=; b=3LbWZO5P4mSspptBezk3UFiE/D85NkbxtBXlhpo9/Hu6jksf7sXCAVWQiiIyJfKl1a xCSl1G0H4VQ2w9jR7lSj42ssARgpyz0iyeoxMn4bWQcxMofBfxl2LMh6tWT4PTXkKgqI kjv77xDoXq9ipRV1cp3/W4aWnZcifpS4F9VG8dIVgAPz0vs64ifw3JMuYh2NeGrt/JN8 8zmpJHrB9Le8CJyYeRLjnsG/x6kUIt/cm8h+zkcXX1djASLxv4kiyq4JEd+qRCsYNR/e jZjnBKlJ+SrjDsXmUdtsPSGpWGkztz/1wwTTkU5ABJ2dqTIlCAu1TZVjatjry1Ijmc5R DMcw== X-Gm-Message-State: AFqh2kpKauxixu1W3DPBOb5Ox61dQX6MAclKMVYbdbxCVrEx71kLtPJp q7zSC9Osg/s7YhXC4UX+OP0WBtLlhw9YgGwc X-Google-Smtp-Source: AMrXdXuB6wN4xGa9VCtmfpOaU6QlDRZXXn1eKFlqlPYSxAF5L+o+P+i1FFcywonEhVQ4vfhiy2TFRQ== X-Received: by 2002:a05:6214:1cc4:b0:4c7:5b:75ba with SMTP id g4-20020a0562141cc400b004c7005b75bamr153918442qvd.31.1673839618598; Sun, 15 Jan 2023 19:26:58 -0800 (PST) Received: from hurd (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id d6-20020a37b406000000b007049f19c736sm17123006qkf.7.2023.01.15.19.26.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:58 -0800 (PST) Date: Sun, 15 Jan 2023 22:26:57 -0500 Message-Id: <87bkmzcg72.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #60224 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 60224 by 60802 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 21:10:28 2023 Received: (at 60224-done) by debbugs.gnu.org; 19 Jan 2023 02:10:28 +0000 Received: from localhost ([127.0.0.1]:42182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIKNo-0002Tl-H7 for submit@debbugs.gnu.org; Wed, 18 Jan 2023 21:10:28 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:45987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIKNm-0002TQ-SA for 60224-done@debbugs.gnu.org; Wed, 18 Jan 2023 21:10:27 -0500 Received: by mail-qt1-f176.google.com with SMTP id h21so505596qta.12 for <60224-done@debbugs.gnu.org>; Wed, 18 Jan 2023 18:10:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6nsEoBwa9SzQiv5BbVVieOgkkapm7i/otX4tLeK1tog=; b=DTIkLzYYWmvhT8KpeYu57cq9mHTBDn4rUBRKbQiDysj1E3fPnatqrRyLaD80WVg2O0 Byuxey66uS7YPhX5McdKYpYhHpzjgujjISB81ANqUAzapP4auNmty+wgJExtUIP3a0jU vee6kz6KOVtCCc3cbwJDrJdsc1rX1FN64YJuu130DV9C8QLc+4cPmfTWPHk+tIKMlzHO +OzXFycJGpnjBP+BtPK1raNyjCZut4wRWf9woIem3B/hk793KH4LlHFpKe2b5RJAHi/N srUhjlMZq0uzYRCQsYvhEYimQIvFiKoVWZrctUfV8aD1x2ZFB/bYt76LKuJtcUuScrsp tZ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6nsEoBwa9SzQiv5BbVVieOgkkapm7i/otX4tLeK1tog=; b=fO2a+3gM0MeDPzjcE1aiIl7PeT11EKR0Hmr7obq+sAMiiwwJUmAc5RjNx856PQQ3az AEySTT4GtM5j7o+WJHHXbLnMAuUM6r1gg5oa+WnhcTzC5yun7/fJbSDO8x/xqA06pZ6j GuTxttwYBjQVNsXhPr0TBlFdAAk/bpz3h3D07mL8vJq1VdSFRSIbe4eLCR+WUgDg2unE dNzH2z6eFKwxqYF+Xp+UceYxXHtE/9N/cAQv7vNd4UM/tXfeKCMA/fhj/W2GhDm8fTw/ QB8eJ17jinSUZD8CxQaI1dnI4uraG0rFDROMTX1iaCjiKpdXX4VVgu+AA5wZeJ0IYgoF +gKg== X-Gm-Message-State: AFqh2kpzheKB49suS3JZxeHQceC1wmRLYWwiuOuYG8mA3ZSTBVZ+f7tm pbgJErDoVoiSQgTav9Wr5GM= X-Google-Smtp-Source: AMrXdXsp/N93bESBPqPm06BqHTSkiIPT/oXvZRRxeeyBbZVIDK5Lc5hMKya+8S1nYcPY4nOxTv10+w== X-Received: by 2002:ac8:6ecd:0:b0:3b0:fe24:9b89 with SMTP id f13-20020ac86ecd000000b003b0fe249b89mr11876187qtv.63.1674094221154; Wed, 18 Jan 2023 18:10:21 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id f26-20020ac86eda000000b003b63c55c299sm3325024qtv.81.2023.01.18.18.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 18:10:20 -0800 (PST) From: Maxim Cournoyer To: 60224-done@debbugs.gnu.org Subject: Re: bug#60224: [PATCH 0/9] Improvements to our u-boot tooling References: <20221220165038.25114-1-maxim.cournoyer@gmail.com> <20230116032544.1378-1-maxim.cournoyer@gmail.com> Date: Wed, 18 Jan 2023 21:10:19 -0500 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 15 Jan 2023 22:25:32 -0500") Message-ID: <87cz7be0l0.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60224-done Cc: rekado@elephly.net, vagrant@reproducible-builds.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > 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. As suggested by Vagrant on #guix, I've checked some outputs md5 sums matched with the new build style (they did!) and pushed. Thanks for the reviews! -- Thanks, Maxim From unknown Sun Aug 17 10:16:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Feb 2023 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator