From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id OFtBDfsXC2YGyQAAe85BDQ:P1 (envelope-from ) for ; Mon, 01 Apr 2024 22:24:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id OFtBDfsXC2YGyQAAe85BDQ (envelope-from ) for ; Mon, 01 Apr 2024 22:24:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=ZKRV5drJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712003067; a=rsa-sha256; cv=none; b=S8uBxOYSf8mZ2bQhY3vDe/LsQiL7c6kXuNXRlX7twUeGRWZmqoW5SNe/PTk/mIRH7CT53L mFLJeNJ0bJB9alsVs2Qat/eYtrfAWE+bbGSQ4Z3ubSRUv1e1WovV0bg+dE4sRzjywMDb9b kaZfd+9eUePD6c+4JMRJ+1jnyj35mbXG3tkMG8pT3X5wLBJ3nNw8fAIaMIxwJwzG0BCvI4 MXE+BSJoeTTU1LMYcmLgl6hYDpWg0Unw4Ohv2gA9S/dL6TiKYOPPnhoEQckMh0YYNKotaI n48FgjzWsyh1FNLCeED3oA8JRhRAD70zzI5OHGgiGTxsf2qeBvgfvYNe1eVzig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=ZKRV5drJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712003067; h=from:from:sender:sender:reply-to: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=fDne5RyigCmsc3FIjCL+nr1emCsXz0R5jmORfuR25A4=; b=KcyuHl2eHZRE4dzkBk7jXiOZyfEzprp3I/cwnuGsIhR7XW0Ne3HVHgAPl+vtOhZM0ysOTg Lhxpc6qqvKK2Ax9Iwqo32rKgSfusHV/82fnU01p8vGqfXiTSRwWlunWeIvXjgZO90Flsy5 PKWCAi81kuc4bkDm0oMhs3n+L734KBsOAv7iJPLtNGrTxNLtaVkS+xB+LzYSA0UlNKtJXZ 68iSTLJHjaxmNXPPeDe74Jc0XoMjVCSf1KmazzBpLHxiORLGR946q4kCDm5KOzQhjrSnFf vxSsgoOL/WZGsjOn855qDi0UW8v6NOobtUI3pFsrQBNAJnXr4eFaMniOv7opsg== 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 DFEB51B5B2 for ; Mon, 1 Apr 2024 22:24:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrOCJ-0007Wk-0j; Mon, 01 Apr 2024 16:24:03 -0400 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 1rrOCH-0007Vs-RH for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrOCH-0006Lk-J9 for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrOCK-0007CC-Rz; Mon, 01 Apr 2024 16:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 4/5] gnu: u-boot: Update to 2024.04-rc5. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 20:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171200300127551 (code B ref 70131); Mon, 01 Apr 2024 20:24:04 +0000 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:21 +0000 Received: from localhost ([127.0.0.1]:51620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBc-0007AE-VO for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:21 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37241 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBZ-000796-Lz for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fDne5RyigCmsc3FIjCL+nr1emCsXz0R5jmORfuR25A4=; b=ZKRV5drJRCIsaqgIxiQ6onDKL78SgQpCpvvwZ41bDvO6/QQUleHGctzkUPCgjwzOBmGipm JboR0hTeLr/v471gDTO0mufgEM5HdRi7YYk7NIyNXTBMNnIBm3bn/Aoy+QhMPD4xctkJfp QifdjPedxlPNreYhsmnOF8wxrSEoyMSeXxoEISJSYJsKN+rwu42s5j8GlVne4zb5ik9hhZ 6N8hgTrgImwehxQ5LFUMLDU45rguzagV5Ck9Ih6wyq/T5CxS3xjS37US4PqXTPx4zOqsQ6 EdsNZIABvmDJUu40TT0CS4xD3anXgsrKkqkIfFJrbhL0g5N2TEsUkO0MVpxIAw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d4a71fa3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:04 +0000 (UTC) Date: Mon, 1 Apr 2024 22:22:32 +0200 Message-ID: <3edd407b36a5e6db5d51ba8d5ff6de8bac61437d.1712001963.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -6.35 X-Migadu-Queue-Id: DFEB51B5B2 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.35 X-TUID: 9exkjXZmADbu * gnu/packages/bootloaders.scm (u-boot): Update to 2024.04-rc5. [source]: Remove build-without-libcrypto patch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Disable sandbox tests and kwbimage. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. Change-Id: I85863adb0324461fabf164d3e936d922ade3aa69 --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 26 ++-- .../u-boot-build-without-libcrypto.patch | 123 ------------------ 3 files changed, 13 insertions(+), 137 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3c29b4a2b7..c6c6cf7077 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2122,7 +2122,6 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ - %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-nanopi-r4s-ddr3.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9443de0a1d..ae604ab5bb 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -716,10 +716,6 @@ (define %u-boot-allow-disabling-openssl-patch ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html (search-patch "u-boot-allow-disabling-openssl.patch")) -(define %u-boot-build-without-libcrypto-patch - ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. - (search-patch "u-boot-build-without-libcrypto.patch")) - (define %u-boot-nanopi-r4s-ddr3-patch ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot. (search-patch "u-boot-nanopi-r4s-ddr3.patch")) @@ -727,11 +723,10 @@ (define %u-boot-nanopi-r4s-ddr3-patch (define u-boot (package (name "u-boot") - (version "2024.01") + (version "2024.04-rc5") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-build-without-libcrypto-patch %u-boot-allow-disabling-openssl-patch %u-boot-nanopi-r4s-ddr3-patch)) (method url-fetch) @@ -740,7 +735,7 @@ (define u-boot "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) + "18bx7v7mnqs316idkbd5a7rsg4ahdyxl8mrynrac3dfwq06x0cc5")))) (build-system gnu-build-system) (native-inputs (list bison @@ -837,9 +832,11 @@ (define-public u-boot-tools (("\\./tools/patman/patman") (which "true")) ;; FIXME: test fails, needs further investiation (("run_test \"binman\"") "# run_test \"binman\"") - ;; FIXME: test_spl fails, needs further investiation - (("test_ofplatdata or test_handoff or test_spl") - "test_ofplatdata or test_handoff") + ;; FIXME: tests fail without kwbimage, i.e. openssl. + (("run_test \"sandbox_noinst\"") + "# run_test \"sandbox_noinst\"") + (("run_test \"sandbox_vpl\"") + "# run_test \"sandbox_vpl\"") ;; FIXME: code coverage not working (("run_test \"binman code coverage\"") "# run_test \"binman code coverage\"") @@ -862,14 +859,16 @@ (define-public u-boot-tools (("CONFIG_FIT_SIGNATURE=y") "CONFIG_FIT_SIGNATURE=n CONFIG_UT_LIB_ASN1=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; Catch instances of implied CONFIG_FIG_SIGNATURE ;; with VPL targets (("CONFIG_SANDBOX_VPL=y") "CONFIG_SANDBOX_VPL=y CONFIG_FIT_SIGNATURE=n CONFIG_VPL_FIT_SIGNATURE=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; This test requires a sound system, which is un-used ;; in u-boot-tools. (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) @@ -1071,7 +1070,8 @@ (define*-public (make-u-boot-package board triplet (lambda _ (substitute* ".config" (("CONFIG_TOOLS_LIBCRYPTO=.*$") - "CONFIG_TOOLS_LIBCRYPTO=n")))) + "CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n")))) (replace 'install (lambda _ (let ((libexec (string-append #$output "/libexec")) diff --git a/gnu/packages/patches/u-boot-build-without-libcrypto.patch b/gnu/packages/patches/u-boot-build-without-libcrypto.patch deleted file mode 100644 index d56588941c..0000000000 --- a/gnu/packages/patches/u-boot-build-without-libcrypto.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 03e598263e3878b6f5d58f5525577903edadc644 Mon Sep 17 00:00:00 2001 -From: Paul-Erwan Rio -Date: Thu, 21 Dec 2023 08:26:11 +0100 -Subject: [PATCH] tools: fix build without LIBCRYPTO support - -Commit cb9faa6f98ae ("tools: Use a single target-independent config to -enable OpenSSL") introduced a target-independent configuration to build -crypto features in host tools. - -But since commit 2c21256b27d7 ("hash: Use Kconfig to enable hashing in -host tools and SPL") the build without OpenSSL is broken, due to FIT -signature/encryption features. Add missing conditional compilation -tokens to fix this. - -Signed-off-by: Paul-Erwan Rio -Tested-by: Alexander Dahl -Cc: Simon Glass -Reviewed-by: Tom Rini -Reviewed-by: Simon Glass ---- - include/image.h | 2 +- - tools/Kconfig | 1 + - tools/fit_image.c | 2 +- - tools/image-host.c | 4 ++++ - tools/mkimage.c | 5 +++-- - 5 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/include/image.h b/include/image.h -index 432ec927b1..21de70f0c9 100644 ---- a/include/image.h -+++ b/include/image.h -@@ -1465,7 +1465,7 @@ int calculate_hash(const void *data, int data_len, const char *algo, - * device - */ - #if defined(USE_HOSTCC) --# if defined(CONFIG_FIT_SIGNATURE) -+# if CONFIG_IS_ENABLED(FIT_SIGNATURE) - # define IMAGE_ENABLE_SIGN 1 - # define FIT_IMAGE_ENABLE_VERIFY 1 - # include -diff --git a/tools/Kconfig b/tools/Kconfig -index f8632cd59d..f01ed783e6 100644 ---- a/tools/Kconfig -+++ b/tools/Kconfig -@@ -51,6 +51,7 @@ config TOOLS_FIT_RSASSA_PSS - Support the rsassa-pss signature scheme in the tools builds - - config TOOLS_FIT_SIGNATURE -+ depends on TOOLS_LIBCRYPTO - def_bool y - help - Enable signature verification of FIT uImages in the tools builds -diff --git a/tools/fit_image.c b/tools/fit_image.c -index 71e031c855..beef1fa86e 100644 ---- a/tools/fit_image.c -+++ b/tools/fit_image.c -@@ -61,7 +61,7 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, - ret = fit_set_timestamp(ptr, 0, time); - } - -- if (!ret) -+ if (CONFIG_IS_ENABLED(FIT_SIGNATURE) && !ret) - ret = fit_pre_load_data(params->keydir, dest_blob, ptr); - - if (!ret) { -diff --git a/tools/image-host.c b/tools/image-host.c -index ca4950312f..90bc9f905f 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -14,8 +14,10 @@ - #include - #include - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - #include - #include -+#endif - - /** - * fit_set_hash_value - set hash value in requested has node -@@ -1131,6 +1133,7 @@ static int fit_config_add_verification_data(const char *keydir, - return 0; - } - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - /* - * 0) open file (open) - * 1) read certificate (PEM_read_X509) -@@ -1239,6 +1242,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) - out: - return ret; - } -+#endif - - int fit_cipher_data(const char *keydir, void *keydest, void *fit, - const char *comment, int require_keys, -diff --git a/tools/mkimage.c b/tools/mkimage.c -index 6dfe3e1d42..ac62ebbde9 100644 ---- a/tools/mkimage.c -+++ b/tools/mkimage.c -@@ -115,7 +115,7 @@ static void usage(const char *msg) - " -B => align size in hex for FIT structure and header\n" - " -b => append the device tree binary to the FIT\n" - " -t => update the timestamp in the FIT\n"); --#ifdef CONFIG_FIT_SIGNATURE -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - fprintf(stderr, - "Signing / verified boot options: [-k keydir] [-K dtb] [ -c ] [-p addr] [-r] [-N engine]\n" - " -k => set directory containing private keys\n" -@@ -130,8 +130,9 @@ static void usage(const char *msg) - " -o => algorithm to use for signing\n"); - #else - fprintf(stderr, -- "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefined)\n"); -+ "Signing / verified boot not supported (CONFIG_TOOLS_FIT_SIGNATURE undefined)\n"); - #endif -+ - fprintf(stderr, " %s -V ==> print version information and exit\n", - params.cmdname); - fprintf(stderr, "Use '-T list' to see a list of available image types\n"); --- -2.41.0 - -- 2.41.0