From patchwork Wed Jan 11 20:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46048 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2FA5927BBE9; Wed, 11 Jan 2023 20:45:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 535C427BBED for ; Wed, 11 Jan 2023 20:45:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhy9-0001Uo-KO; Wed, 11 Jan 2023 15:45:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFhy4-0001RI-FF for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy4-0007dN-63 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy3-0007Hf-GE for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps. References: <20221220165038.25114-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221220165038.25114-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346989527904 (code B ref 60224); Wed, 11 Jan 2023 20:45:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. Do not bind OUTPUTS. --- (no changes since v3) Changes in v3: - No longer bind 'outputs' extraneously in build phases gnu/packages/bootloaders.scm | 181 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 84 deletions(-) base-commit: 5e4ec8218142eee8e6e148e787381a5ef891c5b1 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")) From patchwork Wed Jan 11 20:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46053 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A8ED427BBE9; Wed, 11 Jan 2023 20:46:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF82727BBEB for ; Wed, 11 Jan 2023 20:46:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyD-0001cC-Ez; Wed, 11 Jan 2023 15:45:13 -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 1pFhy5-0001Rt-QD for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy5-0007hR-I0 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007I0-D8 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 02/12] gnu: make-u-boot-package: Install .imx files. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346989927940 (code B ref 60224); Wed, 11 Jan 2023 20:45:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (make-u-boot-package) [phases] : Add imx to the regexp of files considered for installation. --- (no changes since v1) gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 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) From patchwork Wed Jan 11 20:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46051 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B72AC27BBEB; Wed, 11 Jan 2023 20:46:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3755B27BBE9 for ; Wed, 11 Jan 2023 20:46:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyF-0001eM-Ne; Wed, 11 Jan 2023 15:45:15 -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 1pFhy5-0001Ru-Rr for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy5-0007hT-JF for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007IV-Fm for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346990328014 (code B ref 60224); Wed, 11 Jan 2023 20:45:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (make-u-boot-package) : Rename procedure to 'native-build?'. [native-inputs]: Remove field. [arguments]: Specify the #:target argument, when not natively building. Adjust for the above renaming. --- (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)) From patchwork Wed Jan 11 20:44:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46049 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D615F27BBED; Wed, 11 Jan 2023 20:46:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B611527BBE9 for ; Wed, 11 Jan 2023 20:45:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyD-0001cK-Ly; Wed, 11 Jan 2023 15:45:13 -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 1pFhy6-0001S5-9B for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy6-0007hh-1M for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Ig-SV for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 04/12] gnu: make-u-boot-package: Allow disabling cross-compilation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346990428033 (code B ref 60224); Wed, 11 Jan 2023 20:45:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the TRIPLET argument to disable cross-compilation. Update doc. --- (no changes since v1) gnu/packages/bootloaders.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 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-" From patchwork Wed Jan 11 20:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46052 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F164C27BBED; Wed, 11 Jan 2023 20:46:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F56427BBE9 for ; Wed, 11 Jan 2023 20:46:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyI-0001fv-Pn; Wed, 11 Jan 2023 15:45:18 -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 1pFhy6-0001Sr-Od for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy6-0007ho-Gm for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy6-0007Iz-D5 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 05/12] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346990528048 (code B ref 60224); Wed, 11 Jan 2023 20:45:06 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- 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 From patchwork Wed Jan 11 20:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46050 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 33D4127BBEB; Wed, 11 Jan 2023 20:46:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF7DF27BBE9 for ; Wed, 11 Jan 2023 20:46:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyF-0001dM-EF; Wed, 11 Jan 2023 15:45:15 -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 1pFhy7-0001Tx-7W for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy6-0007hu-VW for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy6-0007J6-RQ for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346990528056 (code B ref 60224); Wed, 11 Jan 2023 20:45:06 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- 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" From patchwork Wed Jan 11 20:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46047 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E027A27BBEE; Wed, 11 Jan 2023 20:45:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1686827BBEB for ; Wed, 11 Jan 2023 20:45:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyB-0001Yq-Hr; Wed, 11 Jan 2023 15:45:13 -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 1pFhy5-0001Rg-Cl for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhy5-0007hD-2i for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007ID-Ug for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346990227981 (code B ref 60224); Wed, 11 Jan 2023 20:45:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't exist anymore for some reason. [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")) From patchwork Wed Jan 11 20:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46054 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB73327BBEB; Wed, 11 Jan 2023 20:46:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 63DBE27BBE9 for ; Wed, 11 Jan 2023 20:46:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzH-00027r-Ec; Wed, 11 Jan 2023 15:46:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFhz0-00027K-GZ for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhz0-00080F-8E for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz0-0007LU-3q for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346991328140 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [native-inputs]: Remove input labels and use modify-inputs, and turn into... [inputs]: ... this. --- 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"))) From patchwork Wed Jan 11 20:44:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46055 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BA2E927BBED; Wed, 11 Jan 2023 20:46:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2BFBE27BBE9 for ; Wed, 11 Jan 2023 20:46:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzT-0002YR-FU; Wed, 11 Jan 2023 15:46:39 -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 1pFhz0-00027d-Te for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhz0-00080R-LM for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz0-0007Ld-HH for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346991428149 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-sifive-unmatched) [arguments]: Use gexps. Use search-input-file. [inputs]: Remove labels. Use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 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"))) From patchwork Wed Jan 11 20:44:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46057 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8EB9327BBE9; Wed, 11 Jan 2023 20:47:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7FB0827BBEB for ; Wed, 11 Jan 2023 20:47:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzv-0002zF-Av; Wed, 11 Jan 2023 15:46:59 -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 1pFhz1-00027m-8w for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhz1-00080d-1L for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz0-0007Lq-TN for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346991428156 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399) [phases]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- 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"))) From patchwork Wed Jan 11 20:44:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46058 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 87CF327BBEB; Wed, 11 Jan 2023 20:47:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8645027BBE9 for ; Wed, 11 Jan 2023 20:47:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFi00-000381-Cc; Wed, 11 Jan 2023 15:47:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFhz1-00027v-Lv for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhz1-00080m-DL for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz1-0007M5-9L for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 11/12] gnu: make-arm-trusted-firmware: Simplify build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346991528163 (code B ref 60224); Wed, 11 Jan 2023 20:46:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Reuse knowledge from recent U-Boot modifications to streamline the package definition. * gnu/packages/firmware.scm (make-arm-trusted-firmware): Change optional argument ARCH to keyword TRIPLET. Default to aarch64-linux-gnu. [arguments]: Use gexps. Add a #:target argument. Streamline how the CROSS_COMPILE make flag is computed. [native-inputs]: Delete field. --- 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"))) From patchwork Wed Jan 11 20:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46056 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 53C9527BBE9; Wed, 11 Jan 2023 20:46:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5573427BBEB for ; Wed, 11 Jan 2023 20:46:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzk-0002by-05; Wed, 11 Jan 2023 15:46:49 -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 1pFhz2-00028L-77 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFhz1-000810-Od for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz1-0007MC-Ko for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167346991528170 (code B ref 60224); Wed, 11 Jan 2023 20:46:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- 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"))