From patchwork Sat Nov 2 20:39:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 51668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0EDBE6780F for ; Sat, 2 Nov 2024 20:39:21 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.41]) by mx.groups.io with SMTP id smtpd.web11.24571.1730579960408673677 for ; Sat, 02 Nov 2024 13:39:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=Z1y4/aJh; spf=pass (domain: axis.com, ip: 40.107.21.41, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WYYzrX5hHpMNKtdBiQwpsyJ1EtY44SRylwdzU4hawC+QdtxstVyUHaASDpT/c6wDErDsd6ODB/GzujTXHroiWX/YOjHoVnDaDnwoEdMdpSTtGuYKjnkdEb2B6DeC+VeBYnDOVUMCT7rZa0EVDBrDZf9YtQSLQjtXzt3WpD2XlmKoEGtMYxInQWc0VE+3fLMU4hKCXYKc60oi0OrD8Mj1dHNdLU32UyYy8jsrkS5olwTYg9PnwNl/HeMudXnozLZX0E8thkVex9RDB0yB/jt1NdihXHx8OOBUik1etitaHcMYcZSA88Cinzhp+pbA+BsH+76ElXnBAJ7y+WJk2/Yasw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=571hK7qKp3knKUAsobQz3I0TaLR2941VO2Gfuz/BOhc=; b=wgHu3jdqrzfLxgLt9Hmphwz2YunjzdFeK1faULbUNaomQ6MWTsXoLodsLOrYAGTKbL0eprRwXgD0Km2dsTgxAVO9VIUe2/6mJWHRY4tyMyrd0zGofo+FI7QOWDZIzkZlcvGcS7aN6Mhkvjt1J57aRq5cJY2MTdILSHlsIi00Cb/gzsNDd2HT4GiJ+nKpKTcP9yxBvymlHau+Wm7KJQT96IJHHRL1HbFfGNQ8UZexgMg86DrpCFqCVNWIOZnqe77ahwvi2KUIeTqRGmGPr/ojzrPhJO2VLhNBXBz6LyB6A7mB7gAovAoi7BkVBnOP4WPJTlKYnrmNFLdrp9tdlS7LVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=571hK7qKp3knKUAsobQz3I0TaLR2941VO2Gfuz/BOhc=; b=Z1y4/aJhlcCXfj5gf//v/ZAjsuwMuoVMDkz/ax6oOyr3Wvnjus0IqmvjH17UQlWvhCu9S68GDjhmOJayxI6oRjhYKF7PElutDPOwJNVvIn6mNjPA1pTRmY2iebLmDdB7YaPxNP4UFWQv5Z3f6QZDYhgtb5X57hLQsBLypjCD53k= Received: from AM8P251CA0020.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::25) by PA1PR02MB11103.eurprd02.prod.outlook.com (2603:10a6:102:480::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.32; Sat, 2 Nov 2024 20:39:15 +0000 Received: from AM3PEPF0000A79B.eurprd04.prod.outlook.com (2603:10a6:20b:21b:cafe::12) by AM8P251CA0020.outlook.office365.com (2603:10a6:20b:21b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.28 via Frontend Transport; Sat, 2 Nov 2024 20:39:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A79B.mail.protection.outlook.com (10.167.16.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8114.16 via Frontend Transport; Sat, 2 Nov 2024 20:39:14 +0000 Received: from se-mail01w.axis.com (10.20.40.7) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sat, 2 Nov 2024 21:39:14 +0100 Received: from se-intmail02x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sat, 2 Nov 2024 21:39:14 +0100 Received: from saur.se.axis.com (saur.se.axis.com [10.92.3.10]) by se-intmail02x.se.axis.com (Postfix) with ESMTP id 755ACFE for ; Sat, 2 Nov 2024 21:39:14 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur.se.axis.com (8.17.1/8.15.2) with ESMTPS id 4A2KdEOP1267172 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sat, 2 Nov 2024 21:39:14 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 4A2KdDID1267169 for openembedded-core@lists.openembedded.org; Sat, 2 Nov 2024 21:39:13 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 1/3] busybox: Backport a patch to build with CONFIG_SHA1_HWACCEL on non-x86 Date: Sat, 2 Nov 2024 21:39:08 +0100 Message-ID: <20241102203910.1267120-1-pkj@axis.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A79B:EE_|PA1PR02MB11103:EE_ X-MS-Office365-Filtering-Correlation-Id: b46d6e74-4d05-4584-9a6a-08dcfb7e6a69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: rhUny8iIw0xj3bWwv6gd9P0+FNMzQ8YaXXB/+JqFR2qBwTReFuJzdBBqC2QBktgOtIMAXeUmBf3T3KWU3x4i3+wlVx6tnuY8ZQnXhUtnHo2rfBPs7g6hlkRK7ir8s2ad8y1LHMb+T3PdAf/26RwNIgNDIALPFEVogJb+uVG1291c8PwNWGQDCFt+uuPiDxwMQWz5Kp99ZTUPy1ZfgU4U4LflyU8lmNHjSgGy5bJ491++owkfMhXcD+fsZEcplFfShCMUsnGegdR/ThZZoWjnqny/UqJdb6rXZTXahpP6OXimU3c/ORthcgjgSP9cCoFVezCNtQRKV0rvdca5+ovHu2a7l/dA8GC9UiQhf8sfmcPHlH8PFlTDx+jnHY3xzN4wlidFFhZ5epqmdOAKKxLkDg8blTkcGJim9CFtyb89BdjdtRjkLTgrcjrOy+h3eR2sR7yxC8iGndY0sLNMilUmyxFUdALIUmFxQxd4+GWjH+5OQLqVgmEFPmRV9XI642woyqKP+/0xPM3yd1XWng8GW82pbA47hRCgr7mZPjCjkOe3RErHu/nb7dj0lFNuAHoZ6JOw6zOjgSfvz009CIf7AVMZuHd0CZYIieeFTOV+rQLUGSOvoM3TCUVGj+zagVUuFlXttM2RaujwHJ4ODtvXw8+N2XQ02vsxOtiBTP+1l9jTjr8KcTrB9aPw3YV6Sst4WkmmToeVSR3zByhxMdybln9oPKJZSQ+Uwic4QF28ZG4QHektGVrW87ujA4dIFcmFb352b3F4mCrya85/UUANMKCnKK1yJnkN1Kz5dkDEBxQmHTQp6wx9aJgOlc+xghnLUmyxO6NGbzF302z9f5h09CVe2PBA4x/fgOpM1diKoLI3KkFMFXJKwcTa3r5I9LdHGrVTtZK1xpxnr2LY0HAXHStGsEoHAodelGDeOwlfnFPSf2lBbS7hLO5lHcPnJCgVjF2TGGwOUV6C6lBOCrx5hEuQUOcMhC6I6nrsr/gdmQOYtSZOSLHk4430NAW5NsX7zs5JcxTkRxoAFQAAilXBJ8PqKuK0ACoC1u+FBA9NH2arH6W2eUbPRSlBqsZ4YPwKjOEbgQl1FZ3B1woMY7cG4Eh1dEIkACKml2yMNvN4v1v8tW8YmemHoSIIAdSIYGRvA2k27oRqObramn0KYH8Zny5ZSqbwmgmfsUGzWvQmxAklH77ICi0qByoULduA9LW4fTL1f6TRjUp0fh7sEA+CZOd8LtoVbEA56F0SgVUsRnGccNqfOYXXJSLeCcAssmokKQOn+OZkivK5pluC8lJvbZQE1SmyXbWwm0I3hr5Ge7ACQAsTmJ3GYfOA6r7fdkJdNiXotq1D98mm2Qg3Re3i/Q== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2024 20:39:14.9055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b46d6e74-4d05-4584-9a6a-08dcfb7e6a69 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A79B.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR02MB11103 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 02 Nov 2024 20:39:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206655 This allows CONFIG_SHA1_HWACCEL to be enabled regardless of the architecture. Signed-off-by: Peter Kjellerstedt --- ...sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch | 33 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.37.0.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch diff --git a/meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch b/meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch new file mode 100644 index 0000000000..2af188938e --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch @@ -0,0 +1,33 @@ +From bf57f732a5b6842f6fa3e0f90385f039e5d6a92c Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 29 Sep 2024 17:57:55 +0000 +Subject: [PATCH] libbb: fix sha1 on !x86 if CONFIG_SHA1_HWACCEL=y + +fixes non i386 and x86 builds + +libbb/hash_md5_sha.c: In function 'sha1_end': +libbb/hash_md5_sha.c:1316:35: error: 'sha1_process_block64_shaNI' undeclared + 1316 | || ctx->process_block == sha1_process_block64_shaNI + +Signed-off-by: Rudi Heitbaum +Signed-off-by: Denys Vlasenko +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=bf57f732a5b6842f6fa3e0f90385f039e5d6a92c] +Signed-off-by: Peter Kjellerstedt +--- + libbb/hash_md5_sha.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c +index 57a801459..75a61c32c 100644 +--- a/libbb/hash_md5_sha.c ++++ b/libbb/hash_md5_sha.c +@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf) + hash_size = 8; + if (ctx->process_block == sha1_process_block64 + #if ENABLE_SHA1_HWACCEL ++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + || ctx->process_block == sha1_process_block64_shaNI ++# endif + #endif + ) { + hash_size = 5; diff --git a/meta/recipes-core/busybox/busybox_1.37.0.bb b/meta/recipes-core/busybox/busybox_1.37.0.bb index c3131eb453..3aae6eff4d 100644 --- a/meta/recipes-core/busybox/busybox_1.37.0.bb +++ b/meta/recipes-core/busybox/busybox_1.37.0.bb @@ -53,6 +53,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-syslogd-fix-wrong-OPT_locallog-flag-detection.patch \ file://0002-start-stop-daemon-fix-tests.patch \ file://0003-start-stop-false.patch \ + file://0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg" SRC_URI:append:x86-64 = " file://sha_accel.cfg" From patchwork Sat Nov 2 20:39:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 51669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A479DE67811 for ; Sat, 2 Nov 2024 20:39:21 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.40]) by mx.groups.io with SMTP id smtpd.web10.24590.1730579960204160571 for ; Sat, 02 Nov 2024 13:39:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=UsWyqjzs; spf=pass (domain: axis.com, ip: 40.107.20.40, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h22zEfvNYSuQ7XSdqE0wGSCbZ8eB1/AyL/SxNeLpgsPRnC9A5LyPh5Ou8xCnHt0KismM395FcAhkKpf3Rq6m1rxesCzqW7KFMS+qu3iKzVCRMPG9o/4UeUelVqCPprzNei/0bDAcE7XUZKFj15dBmJ6NfatTmo1nRPElhbNvi9muxCmtOaxVGv5l+ZP9yr1AuKKMgVQ5cAEE8PcJn+OVHAdmFqQ06uJ1513RloOSPIZ+II8ccKH05WKXzCy4fFGRDxbsRQ7DYFy2D8JekzwUT5TeyHSBE9hXwL7bCJDRmBhfgxpSTm0K5iGUg5hGdsgjHBn9MC+8n6nDAS3ReAX2/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N8gLkFSHE/EEYa962NqnP+9WBKMZ6RoHXD8CZlfnZss=; b=iyhpisHarFyq4AZ86o3iCUwSMupNbylPY7lHG1jdUwMgUgCFi00jqwhS9WtMkBEJHn8nWjSeh/6cB55PJUYteAk5d2AGCSMny7Psvjr1jIxxHz/R70+zlbQDfchTQ/ic06sCuhmgfQ/vCC7zG/i+gW++FPivlMBFsy9u/Usqm629YDahO6KM+2CHnzXcfuAGv5QPlNo68ucdQRy9WZyjaPz/c9dNhQX9LY9MXaohECNpKge/W8YcpIM0zzhOQtcRR0CsWVJUpoltzIAvqP9s5r6o7Ef4K3cbnqUEeHKgEzxXSPVhC/eYnuX6JbMp1ZHZHOv0djPfAs9mdCVToWye9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N8gLkFSHE/EEYa962NqnP+9WBKMZ6RoHXD8CZlfnZss=; b=UsWyqjzsB5hB+ohxXxDWWeBUwZTNmuGVZWlB2YlE8Ms8xJPdrFIs4b5nwX+mln4AGhSr17+nEbxDB4BKW/PxmOf4MNbsU2brjeiKP+CQaMPjLOEo7tX+3va6kXs2g+w22ZuJVR2yozXHipRUJPgQr2CYQdCoCdFo1UAKNc3lH/s= Received: from AM8P251CA0027.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::32) by DB4PR02MB9479.eurprd02.prod.outlook.com (2603:10a6:10:3f5::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.18; Sat, 2 Nov 2024 20:39:15 +0000 Received: from AM3PEPF0000A79B.eurprd04.prod.outlook.com (2603:10a6:20b:21b:cafe::c3) by AM8P251CA0027.outlook.office365.com (2603:10a6:20b:21b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.26 via Frontend Transport; Sat, 2 Nov 2024 20:39:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A79B.mail.protection.outlook.com (10.167.16.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8114.16 via Frontend Transport; Sat, 2 Nov 2024 20:39:15 +0000 Received: from se-mail02w.axis.com (10.20.40.8) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sat, 2 Nov 2024 21:39:14 +0100 Received: from se-intmail02x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sat, 2 Nov 2024 21:39:14 +0100 Received: from saur.se.axis.com (saur.se.axis.com [10.92.3.10]) by se-intmail02x.se.axis.com (Postfix) with ESMTP id 973B52B4 for ; Sat, 2 Nov 2024 21:39:14 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur.se.axis.com (8.17.1/8.15.2) with ESMTPS id 4A2KdEkb1267176 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sat, 2 Nov 2024 21:39:14 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 4A2KdEWO1267175 for openembedded-core@lists.openembedded.org; Sat, 2 Nov 2024 21:39:14 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 2/3] Revert "busybox: Make provisions to disable sha256/sha1 accelaration on x86" Date: Sat, 2 Nov 2024 21:39:09 +0100 Message-ID: <20241102203910.1267120-2-pkj@axis.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241102203910.1267120-1-pkj@axis.com> References: <20241102203910.1267120-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A79B:EE_|DB4PR02MB9479:EE_ X-MS-Office365-Filtering-Correlation-Id: 35656ac1-0037-4f36-94da-08dcfb7e6ae5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: g5megxcWoBRM9jNKjY/kyaLF4wsjcojXtPYIQCTfRNGFIXzFsQbuXojRZUGwPVXpG6aU7GxGytY2d3z+FKid4qaaQO7E8ukO//lK9hxPAE3WcdFRgmPtuepGujpyNNBp52FHc4Jucly16RfqxzeJW0OEshB2CK/K2tEaTIXGCn99DNMluMxu7s43+2xajkSDNpa6j970QMVlu6S0wFrJzQAMq6hItLR/Y3FCD3aaDXoTXaMailytulHubOUaNNubFawhyjs1/e91McUEs05fthjFUCN2aIhHBYhsKBmhPxZZJrttIwqIgvIhqmFUNifCwkxrmYeNLe+co7VuquDOlWMusa6owrHs0RZLYW21lfq2TFBX4+rpdBt2ICgih3RBVQa6soQcJDDtW7PavyXBZBYM4OGteVw6gY+xpp25jAxwzYd+cuExgoqehTZMfhMkSa+zIETqQ6gaMjUUAbEOQpqsmwk6PmrtJAAIO9yRU8t04ytFcH9dQDABdt18pACBlL/w7hd5uIRVP7AEk6Cr1zovbUjh0gTt12g4EdL3xymHeRB4HGqtb7YOJ4VXIQstXZLOo1f3F10p4zyChCCIXO2WwYJeMPd1QYIBWaMPacvnZQRVyX02S/Q1SbQUXK/+WEm4cnJffxQdZn6DWeCg/tGLY2GM01Ld5MRfg6ssMBUJvdK/cLmPJEgtuYINftbX8M5d5yuVN8289SCH2WNZeMGm/1OJ4ip7GFx1hqWmXgAzUHbMQ8KHbb40Y1QP+N5LkyhWNbnLVZYoI8X2UEvlSjxsoOPhVyeSsaL4LerTyTgssXx2CT9ba0bQu3rwCQ/2kCo2dInNJqzaQGU2IAk5FkN7TYleRX575F3P3HRaLv8H/eZeCRvg9aL5EmGAOurBL/Zqq/YqBVHUGVGcRG8WYUHyDik0P2dkDiPjtacW4PgWbp+RRIRZBfghL6t53wIavLd6/sKMbv3E3reI2bDg1ps5IIt6eRmA00foSCyUFxgLSW2pvR6ih+huuOrvsklyqymualovsgLK3/VPYG3CuY/rWfDWWeYRgMpBYKqjdR1YlIoq0r5nQjDG6vtasamlGPKXhNj58ctjLd4jp4MDIFcFmUO1oRILefULBHU9L82O0XMksRYLt4EaBBtV9hd3SHdH2vbX96jy33hFE5CfLaFmN4d3r+uy0SOzttx55NPnNoUXPN40fY667m0CrgPZL0hZ283ai7E6/Z3u/mjb/iLLGortLAPBo8A0aC8nLhQbozhyFLyr77mvvNZ+ghtb5bHcFHA8Aqa4XU9eXN2HNAbzkZnYRGx14Hu5FRhqo8xQCIORdGfpQ1kGuTKTVwq5we6ESmze4tgeBfkzMmcYNOvU3OZTdGOnq+eGC/vlqt5+3FjiCtbmKMbKxRVKehCxcPBIopWDV8IPY2oN5i4W2A== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2024 20:39:15.7180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35656ac1-0037-4f36-94da-08dcfb7e6ae5 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A79B.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR02MB9479 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 02 Nov 2024 20:39:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206653 This reverts commit 22f639d61127f4b82a79008c5305e44e090a3680. The underlying problem has now been corrected so that acceleration can be enabled regardless of the architecture. Signed-off-by: Peter Kjellerstedt --- meta/recipes-core/busybox/busybox/sha1sum.cfg | 2 +- meta/recipes-core/busybox/busybox/sha256sum.cfg | 2 +- meta/recipes-core/busybox/busybox/sha_accel.cfg | 2 -- meta/recipes-core/busybox/busybox_1.37.0.bb | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/sha_accel.cfg diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/meta/recipes-core/busybox/busybox/sha1sum.cfg index 151c447658..01137a2486 100644 --- a/meta/recipes-core/busybox/busybox/sha1sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha1sum.cfg @@ -1,3 +1,3 @@ CONFIG_SHA1SUM=y CONFIG_SHA1_SMALL=3 -# CONFIG_SHA1_HWACCEL is not set +CONFIG_SHA1_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha256sum.cfg b/meta/recipes-core/busybox/busybox/sha256sum.cfg index aa0b0b0b98..a5b0ab22d1 100644 --- a/meta/recipes-core/busybox/busybox/sha256sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha256sum.cfg @@ -1,2 +1,2 @@ CONFIG_SHA256SUM=y -# CONFIG_SHA256_HWACCEL is not set +CONFIG_SHA256_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha_accel.cfg b/meta/recipes-core/busybox/busybox/sha_accel.cfg deleted file mode 100644 index 70038a8509..0000000000 --- a/meta/recipes-core/busybox/busybox/sha_accel.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_SHA1_HWACCEL=y -CONFIG_SHA256_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox_1.37.0.bb b/meta/recipes-core/busybox/busybox_1.37.0.bb index 3aae6eff4d..1051fd1920 100644 --- a/meta/recipes-core/busybox/busybox_1.37.0.bb +++ b/meta/recipes-core/busybox/busybox_1.37.0.bb @@ -56,5 +56,5 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg" -SRC_URI:append:x86-64 = " file://sha_accel.cfg" + SRC_URI[tarball.sha256sum] = "3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4" From patchwork Sat Nov 2 20:39:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 51667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3615E6780C for ; Sat, 2 Nov 2024 20:39:21 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.45]) by mx.groups.io with SMTP id smtpd.web11.24570.1730579960258583975 for ; Sat, 02 Nov 2024 13:39:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=MUhpSEzx; spf=pass (domain: axis.com, ip: 40.107.20.45, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kGDNKEIqYsfluywQsplVc0y0RmsCEEzq5539Ldoc2oMLAeQh1wKCCf0Zy8mm2pShF7Diz9r7snjZJCHdM8ADel5IebmE/KRcTrEvgQtAWdz40hIdWt/xz6qr201M4Sk6LWIlvcGLc5wrcbYdlkQTgorWgGjTqViJxzYGTAwwAfymkzz7ZBJcKnE3b9iuy53wRXzbeNhYOI4NhsaEoW3Ycqep8PtrciD/A1Od/Uxmhoq1E3sEZVuQpTUasd2SSEszh6Ze6lbrLyxWBZjykouOgjng4p01i1zp/2/GWOYWo0BSKyn6LaN3924nQPkoWCHFfkPybXOkuWusiv0hXQsLxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Sh+lxIPtXLY5MFacHHRI/EZjefuYchKv1avF9SOr3+c=; b=TPR4qSJtIaYFYaoICIj3lsvHNeYpCfyZWXQTWrAlHZcc3mMueZr/hJLVlwGwR1BPbj5jbc5SSkCo3ZV/SpE/ZtaTaTrfFRRBm4D7QzzoDaBXfcQiewgzQSKJYdaSf35VFE+1wkXFo6GPgc2lftAJfYtN22aUhQHpiRMjgBIagAR45q6y8mojZm8zj6F4On9mdNSGKzQ5d0FjTPESPP0cmW8dV8S9j80/impq42JwQNk1VzWNWbI/zdCT5pS7Zl4wenJJrm0kcU4q9S2/s6pko/Jenpp4WP/wvtZ9eQtWtpfo3sE6ClQEt/Fl6cILt0f5qKMEtyjMijk17oSiT0AlIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sh+lxIPtXLY5MFacHHRI/EZjefuYchKv1avF9SOr3+c=; b=MUhpSEzxQ/dT3Gdh6pJGYXiVI3S8t+m8u9u2E4iiKGvJ+x7bqhYGVt/JJs6Q6qGGTTnETwCXftblNjOP1rN00+cmTT/SWXe+LL69w60UpFBuLlYSvvILqucWWcYXEm5n31c1+5Kmiwuw9Ik1HNEBKmirKPE96wCmRUqd0WOg2nM= Received: from AM8P251CA0004.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::9) by DBAPR02MB6391.eurprd02.prod.outlook.com (2603:10a6:10:194::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.20; Sat, 2 Nov 2024 20:39:16 +0000 Received: from AM3PEPF0000A79B.eurprd04.prod.outlook.com (2603:10a6:20b:21b:cafe::fe) by AM8P251CA0004.outlook.office365.com (2603:10a6:20b:21b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.28 via Frontend Transport; Sat, 2 Nov 2024 20:39:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by AM3PEPF0000A79B.mail.protection.outlook.com (10.167.16.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8114.16 via Frontend Transport; Sat, 2 Nov 2024 20:39:16 +0000 Received: from se-mail02w.axis.com (10.20.40.8) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sat, 2 Nov 2024 21:39:14 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sat, 2 Nov 2024 21:39:14 +0100 Received: from saur.se.axis.com (saur.se.axis.com [10.92.3.10]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id C278C1EB for ; Sat, 2 Nov 2024 21:39:14 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur.se.axis.com (8.17.1/8.15.2) with ESMTPS id 4A2KdECU1267180 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Sat, 2 Nov 2024 21:39:14 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 4A2KdEN01267179 for openembedded-core@lists.openembedded.org; Sat, 2 Nov 2024 21:39:14 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 3/3] busybox: Remove CONFIG_SHA1_SMALL and CONFIG_SHA*_HWACCEL from sha*sum.cfg Date: Sat, 2 Nov 2024 21:39:10 +0100 Message-ID: <20241102203910.1267120-3-pkj@axis.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241102203910.1267120-1-pkj@axis.com> References: <20241102203910.1267120-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A79B:EE_|DBAPR02MB6391:EE_ X-MS-Office365-Filtering-Correlation-Id: 15efce3d-f543-4f92-e024-08dcfb7e6b31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: qVM7D13f6Z7VN0CxAvkcKMrDWkSBi6ybBHpZ2Iwb9Hy8hHkAJispjgnsvcscEF0jFwMU6ngdymd8XMgoUjaHIAtMWEMxQFp3+Af+IpoqVMEB5EL6cy54nSUllDGovthA6KCqTopL/Yum11Nsrtp1pDPWgUqajTT2V8O9SaD0EjFLfTgMZt5oLWsbgjOj+mdHVobk39IwVXXLG7fWDzNUsAsEkQNw+fwnq60oHcuHEr95pHyPn0fJ8gGYL9TY1IztPXKTXjIA15/u65ZnZzmjpCQCI/PWdI/Kq9kq/cerg13gW7GtIJGSfdiLr28y1ujmoOeQpAOEZOnzPokc3U12h1SbCWnaTVWNpsdTASbQA2Kx/rJp/34X/KlqBzAlpGc7KuqKB4Zz7hfrdpnPlqqlvlZOxJpBK/4x7Mu0cV4R6Eki45e7JiW6SSS7nWr9xU4LmF4QeFHQY/U5VNou2HGyTXrmlmpw0xed4dKIYNLOM5lIyVXIzA17OvsHiOHyglWGCr0l/3OpUutkEotjdpYTjb8Lq1mmCuQ33lLmDVFTaDnhgnIZWkXJpBQCz5cjuJb+KDVbOM0lQiMm6dW8ZfzVSvuqXssIi4NG7Ov2vuoMNpL6UAdAsw5KgMxT5NcV8m6xsiMPSRed1Q92J9ClMNAcdOB++wZpSOmwU3vj3MTUiiNTwhWo3LkpjzUkFdZ2bNK6epzsVwAtAgKxosOSDQgqPWeAYbi733QfK3DtGYzqfWOy3KH9VaOORNOaR8ixbnD4WXNkGjftbFLNkOkQj16be3VO7m0MNLPEUL3UI+gPFlZ8NgxQyydZ+8moM9S9THP/6oNou7zybTW5prsOgj3gfUFWo6S1Dw3sJKQClzqQQJyJ7JJ+/057C9fVMbm67EqCZifgrrNQn/lK83vBpLbLr67fcSnKwQQBucrraqu99J2r9RDmPodtV1Y5wsxtFk+HlXoVFPAFFJIDI9HO/b8fbm8Jl+VcGHMbWLhPgA8q7uyBY+ljsiXAK2fS1ZXPbWqXqz23e+SdCq8hRTwsbB9lpSCBQSCarBj7PXK+AZZoVT0OXriWn2+ykY/YrLasQoPkNFCLY62dOmlZgQXZJkM55rxFunds5TaHOZ/mnlIltRD8cF6RLxZKO/PUwr6Sg7mUe792KzZnB/OIIwOzdQc0CSObqmkuAvv4WEWSVLQr9gFRfmbqJkgiGFyKFoJ3CEWW+z+96RZmATK438FNan6Ix9cl6X5QZW95jCBDYAUdDODXz2pfbtYx9hjfVf23VF+VMZ5Id31XmCY/Ifxn8HkXuyCAugtDwek8sqASInJ4l8EAPJrOkQtsFYuvtTiEnObwkuGW4L2nYbEKDToDwAxnVq+oBgagsFUPw+jHDO1NC68lrUCtk6XxSqJxQyayW8dF/rahH/RRHnMShjKFGRDtXw== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2024 20:39:16.2180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15efce3d-f543-4f92-e024-08dcfb7e6b31 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A79B.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR02MB6391 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 02 Nov 2024 20:39:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206654 The options CONFIG_SHA1_SMALL, CONFIG_SHA1_HWACCEL and CONFIG_SHA256_HWACCEL affect the common implementations of SHA-1 and SHA-256. These are used regardless of if the sha1sum and/or sha256sum applets are enabled. Thus it does not make sense to configure them in the sha*sum.cfg files. Additionally, their values in the .cfg files match the values in the defconfig file. Signed-off-by: Peter Kjellerstedt --- meta/recipes-core/busybox/busybox/sha1sum.cfg | 2 -- meta/recipes-core/busybox/busybox/sha256sum.cfg | 1 - 2 files changed, 3 deletions(-) diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/meta/recipes-core/busybox/busybox/sha1sum.cfg index 01137a2486..20e72d9263 100644 --- a/meta/recipes-core/busybox/busybox/sha1sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha1sum.cfg @@ -1,3 +1 @@ CONFIG_SHA1SUM=y -CONFIG_SHA1_SMALL=3 -CONFIG_SHA1_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha256sum.cfg b/meta/recipes-core/busybox/busybox/sha256sum.cfg index a5b0ab22d1..ce652ae4c6 100644 --- a/meta/recipes-core/busybox/busybox/sha256sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha256sum.cfg @@ -1,2 +1 @@ CONFIG_SHA256SUM=y -CONFIG_SHA256_HWACCEL=y