From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2NnwDFPExGOnOgEAbAwnHQ (envelope-from ) for ; Mon, 16 Jan 2023 04:28:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uLXpDFPExGODbAAA9RJhRA (envelope-from ) for ; Mon, 16 Jan 2023 04:28:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E6A551AE07 for ; Mon, 16 Jan 2023 04:28:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9I-0000EA-8K; Sun, 15 Jan 2023 22:27:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHG9H-0000Cz-14 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9G-0005oq-Pu for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9G-0007sU-9M for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 01/13] gnu: make-u-boot-package: Add a u-boot argument and use gexps. References: <20221220165038.25114-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221220165038.25114-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383956230046 (code B ref 60224); Mon, 16 Jan 2023 03:27:02 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:02 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8H-0007oQ-8A for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:02 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:34396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8G-0007o1-1C for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:00 -0500 Received: by mail-qv1-f44.google.com with SMTP id n2so2986032qvo.1 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=njBYzXhWpMyet/PUw8ErK4ju78CIYBGi8O5ZSMYIvodErHKTgLWijVjiDie3PQfj7U NfdjGK2DapNwQvYqpbJHm1e13OOCwcWpqOzKveaN7ueo7tgcwpNclvyKtc1WgAyCjJI4 o9C8kQweDOiT6c06XoIm/QwuYuqpXudXFORL8609cBQJa+OlBUvu231J4Evx2U4A70Ls ty2zVwqLrsYiBPLXXR/GPJFyu0Duhlog9UiN6cDB0OiGI2HghgOE3RUdEFhYWFr4E2qm c1nbKJS3xuVhb2lqxz/mTgUMLX9LXpcSAAvYO1Fjo/XdVM9wAVpZaxgdCPTg0JfxQHs/ bdKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=OIhin5DHqEgs/ZBwAJsIFtkvnvIJQYEX0CGB9wzea2FiexjIT3zk5nuZexQ17LWund UaqdyYQttO6Ye1fFuxNqfaOAOukkj92leOlSqZfi33Vi+SRwi5DNMw+k+BRj/+/jR+cY 38XnMXuFIAyuGwX9KUx9wjWsq5ASuhuI+fv9laOxb/ZgkKuPbBeroFwDcrHJT45J2sYt 88ODOqY96a0A1hAKxl/nU86MfEgSKbSizVTuNs9UU48cYuy4s+wpILtBjGD7EJO84UP4 8gQ0uGPL00/Jn8oo7y4D9WM81pc6Ix3p7G24JEuz4A1FV/tFdme14o7DXDGtonvAXEO8 0IVA== X-Gm-Message-State: AFqh2kr6AymA1pxRV0eKCMdR7w7/HKiNnBCh4/5KckO2NWfSgh72/1RT 3coCFxumF9zZexJCeMhlzKeLF1dajDt3nh/K X-Google-Smtp-Source: AMrXdXterIm95bHe48sb0vlyNtMw6pycr2Lh2vY+Jqi3AWFiXYjZjgYMftBmk4qj0zOT0l2y3C+3mg== X-Received: by 2002:a05:6214:5bc2:b0:4c7:62eb:145d with SMTP id lr2-20020a0562145bc200b004c762eb145dmr144239198qvb.25.1673839553861; Sun, 15 Jan 2023 19:25:53 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:53 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:32 -0500 Message-Id: <20230116032544.1378-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673839699; a=rsa-sha256; cv=none; b=SdOo6NCf3/STMiIHE2PzuSn6ArSbCKG164aXEv0gQp1QzDYxXH4uwaOu8g0n957XoqnSfE j9M1QDSETt90sZ8mQVNjXXI10hHefv3fpq8lnfkLUMoIfFnCYSHbEm9pXOCfka8A+8wjPF hGT1flv3YoN/ls4cBfaaiLrIg268KK4awSf+CV0w4JCEJdfKT9ntq+ePNEd4y5UjyD8HaY Gvl+Eku7JCr6DNnFLRWEsMYG3jMECmPe2UL1n5rip4H/2Oc8m/+WUodbjsc81X8zvUCcuk JQFeCatndPHLYyHX558o7B7JCrrgi+al+36aJfUXpSvGbsPQZA9/1z/P7KANdQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=njBYzXhW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673839699; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=96wIec++vaLBNjqHwMrTgy1vcRO918Ghf0SU27zP6RI=; b=VwgYJ6hjxcJM7uDzH0V6kIb7mMMVJ6ODq7w/QB1HGHP3uVWoM1a4is9K3A6YR+8qisS0++ 7mmIuCd/rN15540cRNS8eQqHWV9AJm40pJoVvkQzbKZaOySbkNl//aqfCmkC40h9W/O8jN HvRhje1Q8CC9luHUb5tvt1UQVHajizmniRorcdwZ3juLhZrthbItVAMdamV7hntw68S4u/ P2SsQzkpjdAblr4QGtaKC6bDRV10mE3tAgNUT0wBwR2koTXwODEWDwnjd47BmhXV1o0cRJ ft6VJuCEdSBlpCONuEZiHG08V8UwuPwr1zW/tp2bA+lcuho3udKqpccrHrMVHg== X-Migadu-Spam-Score: -0.02 X-Spam-Score: -0.02 X-Migadu-Queue-Id: E6A551AE07 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=njBYzXhW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: LXF5nX9pYpFz And have that u-boot argument used as the complete base of the template, so that a user can override it. * gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument. Document it. [native-inputs]: Move the native-inputs of U-BOOT first, so that the cross compilation tools can be overridden via U-BOOT. [arguments]: Rewrite using substitute-keyword-arguments, extending rather than overriding most arguments. Use gexps. Do not bind OUTPUTS. --- (no changes since v3) Changes in v3: - No longer bind 'outputs' extraneously in build phases gnu/packages/bootloaders.scm | 181 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 84 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8dc6ff698d..96dd65ae9d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -860,11 +860,13 @@ (define*-public (make-u-boot-package board triplet defconfig configs name-suffix - append-description) + append-description + (u-boot u-boot)) "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the optional DEFCONFIG file and optional configuration changes from CONFIGS. NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is -appended to the package description." +appended to the package description. U-BOOT can be used when a fork or a +different version of U-Boot must be used." (let ((same-arch? (lambda () (string=? (%current-system) (gnu-triplet->nix-system triplet))))) @@ -879,91 +881,102 @@ (define*-public (make-u-boot-package board triplet "\n\n" append-description) (package-description u-boot))) (native-inputs - `(,@(if (not (same-arch?)) + ;; Note: leave the native u-boot inputs first, so that a user can + ;; override the cross-gcc and cross-binutils packages. + `(,@(package-native-inputs u-boot) + ,@(if (not (same-arch?)) `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `()) - ,@(package-native-inputs u-boot))) + `()))) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build kconfig) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build kconfig)) - #:test-target "test" - #:make-flags - (list "HOSTCC=gcc" - "KBUILD_VERBOSE=1" - ,@(if (not (same-arch?)) - `((string-append "CROSS_COMPILE=" ,triplet "-")) - '())) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((config-name (string-append ,board "_defconfig")) - (config-file (string-append "configs/" config-name)) - (defconfig ,defconfig) - (configs ',configs)) - (when defconfig - ;; Replace the board-specific defconfig with the given one. - (copy-file defconfig config-file)) - (if (file-exists? config-file) - (begin - (when configs - (modify-defconfig config-file configs)) - (apply invoke "make" `(,@make-flags ,config-name)) - (verify-config ".config" config-file)) - (begin - (display "invalid board name; valid board names are:" - (current-error-port)) - (let ((suffix-len (string-length "_defconfig")) - (entries (scandir "configs"))) - (for-each (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format (current-error-port) - "- ~A\n" - (string-drop-right file-name - suffix-len)))) - (sort entries string-ci<))) - (error "invalid boardname ~s" ,board)))))) - (add-after 'configure 'disable-tools-libcrypto - ;; Disable libcrypto due to GPL and OpenSSL license - ;; incompatibilities - (lambda _ - (substitute* ".config" - (("CONFIG_TOOLS_LIBCRYPTO=.*$") "CONFIG_TOOLS_LIBCRYPTO=n")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec")) - (uboot-files (append - (remove - ;; Those would not be reproducible - ;; because of the randomness used - ;; to produce them. - ;; It's expected that the user will - ;; use u-boot-tools to generate them - ;; instead. - (lambda (name) - (string-suffix? - "sunxi-spl-with-ecc.bin" - name)) - (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) - (find-files "." "^(MLO|SPL)$")))) - (mkdir-p libexec) - (install-file ".config" libexec) - ;; Useful for "qemu -kernel". - (install-file "u-boot" libexec) - (for-each - (lambda (file) - (let ((target-file (string-append libexec "/" file))) - (mkdir-p (dirname target-file)) - (copy-file file target-file))) - uboot-files) - #t))))))))) + (substitute-keyword-arguments (package-arguments u-boot) + ((#:modules modules '()) + `((ice-9 ftw) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build kconfig) + (guix build utils) + ,@modules)) + ((#:imported-modules imported-modules '()) + `((guix build kconfig) + ,@%gnu-build-system-modules + ,@imported-modules)) + ((#:test-target _ "test") + "test") + ((#:make-flags make-flags '()) + #~(list "HOSTCC=gcc" + "KBUILD_VERBOSE=1" + #$@(if (not (same-arch?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + #$@make-flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (let* ((config-name (string-append #$board "_defconfig")) + (config-file (string-append "configs/" config-name)) + (defconfig #$defconfig) + (configs '#$configs)) + (when defconfig + ;; Replace the board-specific defconfig with the given + ;; one. + (copy-file defconfig config-file)) + (if (file-exists? config-file) + (begin + (when configs + (modify-defconfig config-file configs)) + (apply invoke "make" `(,@make-flags ,config-name)) + (verify-config ".config" config-file)) + (begin + (display "invalid board name; valid board names are:" + (current-error-port)) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" + file-name) + (format (current-error-port) + "- ~A\n" + (string-drop-right + file-name suffix-len)))) + (sort entries string-ci<))) + (error "invalid boardname ~s" #$board)))))) + (add-after 'configure 'disable-tools-libcrypto + ;; Disable libcrypto due to GPL and OpenSSL license + ;; incompatibilities + (lambda _ + (substitute* ".config" + (("CONFIG_TOOLS_LIBCRYPTO=.*$") + "CONFIG_TOOLS_LIBCRYPTO=n")))) + (replace 'install + (lambda _ + (let ((libexec (string-append #$output "/libexec")) + (uboot-files + (append + (remove + ;; Those would not be reproducible + ;; because of the randomness used to + ;; produce them. It's expected that the + ;; user will use u-boot-tools to generate + ;; them instead. + (lambda (name) + (string-suffix? + "sunxi-spl-with-ecc.bin" + name)) + (find-files "." + ".*\\.(bin|efi|img|spl|itb|dtb|rksd)$")) + (find-files "." "^(MLO|SPL)$")))) + (mkdir-p libexec) + (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) + (for-each + (lambda (file) + (let ((target-file (string-append libexec "/" file))) + (mkdir-p (dirname target-file)) + (copy-file file target-file))) + uboot-files))))))))))) (define-public u-boot-am335x-boneblack (let ((base (make-u-boot-package base-commit: a9a38f515e5770fe7d19052c761f0f5e839af4e6 -- 2.38.1