From: Peter Kjellerstedt <pkj@axis.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 2/3] Revert "busybox: Make provisions to disable sha256/sha1 accelaration on x86"
Date: Sat, 2 Nov 2024 21:39:09 +0100 [thread overview]
Message-ID: <20241102203910.1267120-2-pkj@axis.com> (raw)
In-Reply-To: <20241102203910.1267120-1-pkj@axis.com>
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 <peter.kjellerstedt@axis.com>
---
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"
next prev parent reply other threads:[~2024-11-02 20:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-02 20:39 [PATCH 1/3] busybox: Backport a patch to build with CONFIG_SHA1_HWACCEL on non-x86 Peter Kjellerstedt
2024-11-02 20:39 ` Peter Kjellerstedt [this message]
2024-11-02 20:39 ` [PATCH 3/3] busybox: Remove CONFIG_SHA1_SMALL and CONFIG_SHA*_HWACCEL from sha*sum.cfg Peter Kjellerstedt
2024-11-02 22:55 ` [OE-core] [PATCH 1/3] busybox: Backport a patch to build with CONFIG_SHA1_HWACCEL on non-x86 Richard Purdie
[not found] ` <180448BAD9977D8B.18610@lists.openembedded.org>
2024-11-02 22:57 ` Richard Purdie
2024-11-04 6:53 ` Andrej Valek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241102203910.1267120-2-pkj@axis.com \
--to=pkj@axis.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox