busybox: Backport a patch to build with CONFIG_SHA1_HWACCEL on non-x86
PATCH 1/3 busybox: Backport a patch to build with CONFIG_SHA1_HWACCEL on non-x86
This allows CONFIG_SHA1_HWACCEL to be enabled regardless of the architecture.
--- ...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
meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch new file +33 -0
@@ -0,0 +1,33 @@ +From bf57f732a5b6842f6fa3e0f90385f039e5d6a92c Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +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 <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=bf57f732a5b6842f6fa3e0f90385f039e5d6a92c] +Signed-off-by: Peter Kjellerstedt <[email protected]> +--- + 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;
meta/recipes-core/busybox/busybox_1.37.0.bb +1 -0
@@ -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"
PATCH 2/3 Revert "busybox: Make provisions to disable sha256/sha1 accelaration on x86"
This reverts commit 22f639d61127f4b82a79008c5305e44e090a3680.
The underlying problem has now been corrected so that acceleration can be enabled regardless of the architecture.
--- 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
meta/recipes-core/busybox/busybox/sha1sum.cfg +1 -1
@@ -1,3 +1,3 @@ CONFIG_SHA1SUM=y CONFIG_SHA1_SMALL=3 -# CONFIG_SHA1_HWACCEL is not set +CONFIG_SHA1_HWACCEL=y
meta/recipes-core/busybox/busybox/sha256sum.cfg +1 -1
@@ -1,2 +1,2 @@ CONFIG_SHA256SUM=y -# CONFIG_SHA256_HWACCEL is not set +CONFIG_SHA256_HWACCEL=y
meta/recipes-core/busybox/busybox/sha_accel.cfg deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_SHA1_HWACCEL=y -CONFIG_SHA256_HWACCEL=y
meta/recipes-core/busybox/busybox_1.37.0.bb +1 -1
@@ -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"
PATCH 3/3 busybox: Remove CONFIG_SHA1_SMALL and CONFIG_SHA*_HWACCEL from sha*sum.cfg
In reply to Peter KjellerstedtThe 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.
--- meta/recipes-core/busybox/busybox/sha1sum.cfg | 2 -- meta/recipes-core/busybox/busybox/sha256sum.cfg | 1 - 2 files changed, 3 deletions(-)
meta/recipes-core/busybox/busybox/sha1sum.cfg +0 -2
@@ -1,3 +1 @@ CONFIG_SHA1SUM=y -CONFIG_SHA1_SMALL=3 -CONFIG_SHA1_HWACCEL=y
meta/recipes-core/busybox/busybox/sha256sum.cfg +0 -1
@@ -1,2 +1 @@ CONFIG_SHA256SUM=y -CONFIG_SHA256_HWACCEL=y
Quoted 58 lines · Peter Kjellerstedt via lists.openembedded.org
This allows
CONFIG_SHA1_HWACCELto be enabled regardless of the architecture.Signed-off-by Peter Kjellerstedt <[email protected]>---
...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.patchmeta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch new file +33
-0@@ -0,0 +1,33 @@ +From bf57f732a5b6842f6fa3e0f90385f039e5d6a92c Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +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 <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=bf57f732a5b6842f6fa3e0f90385f039e5d6a92c] +Signed-off-by: Peter Kjellerstedt <[email protected]> +--- + 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;meta/recipes-core/busybox/busybox_1.37.0.bb +1
-0@@ -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 \
Quoted 3 lines
"
SRC_URI:append:libc-musl = " file://musl.cfg"
SRC_URI:append:x86-64 = " file://sha_accel.cfg"
Looks like musl doesn't like this:
https://valkyrie.yoctoproject.org/#/builders/6/builds/368/steps/11/logs/stdio
Cheers,
Richard
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 83 lines · Richard Purdie via lists.openembedded.org
Quoted 70 lines · Peter Kjellerstedt via lists.openembedded.org
This allows
CONFIG_SHA1_HWACCELto be enabled regardless of the architecture.Signed-off-by Peter Kjellerstedt <[email protected]>---
...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
(quoted diff) +0
-0on-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..2af188938emeta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86- new file +0
-0if-CONFIG_SHA1_HWACCEL-y.patch
meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86- new file +1
-0@@ -0,0 +1,33 @@ +From bf57f732a5b6842f6fa3e0f90385f039e5d6a92c Mon Sep 17 00:00:002001
meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86- new file +8
-0+From: Rudi Heitbaum <[email protected]> +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_shaNImeta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86- new file +4
-0+ +Signed-off-by: Rudi Heitbaum <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +Upstream-Status: Backport[https://git.busybox.net/busybox/commit/?id=bf57f732a5b6842f6fa3e0f
90385f039e5d6a92c]meta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86- new file +10
-0+Signed-off-by: Peter Kjellerstedt <[email protected]> +--- + 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
+ #ifENABLE_SHA1_HWACCEL
++# ifdefined(__GNUC__)&& (defined(__i386__)||defined(__x86_64__))
+ ||ctx->process_block==sha1_process_block64_shaNI
++# endif
+ #endif
+ ) {
+hash_size= 5;meta/recipes-core/busybox/busybox_1.37.0.bb +0
-0@@ -53,6 +53,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \Quoted 8 lines
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"Looks like musl doesn't like this:
or qemux86 which is showing relocation in .text errors:
https://valkyrie.yoctoproject.org/#/builders/59/builds/358/steps/11/logs/stdio
https://valkyrie.yoctoproject.org/#/builders/30/builds/357
https://valkyrie.yoctoproject.org/#/builders/19/builds/368/steps/12/logs/stdio
Cheers,
Richard
Hello Peter,
I was also thinking about picking this two patches, but I didn't have a time for verification. Are you sure, that this https://lists.busybox.net/pipermail/busybox/2023-January/090078.html has been fixed, right? Or did you verify it?
Regards,
Andrej
Quoted 70 lines · Peter Kjellerstedt
This allows
CONFIG_SHA1_HWACCELto be enabled regardless of the architecture.Signed-off-by Peter Kjellerstedt <[email protected]>--- ...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.patchmeta/recipes-core/busybox/busybox/0001-libbb-fix-sha1-on-x86-if-CONFIG_SHA1_HWACCEL-y.patch new file +33
-0@@ -0,0 +1,33 @@ +From bf57f732a5b6842f6fa3e0f90385f039e5d6a92c Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +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 <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=bf57f732a5b6842f6fa3e0f90385f039e5d6a92c] +Signed-off-by: Peter Kjellerstedt <[email protected]> +--- + 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;meta/recipes-core/busybox/busybox_1.37.0.bb +1
-1@@ -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" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#206655): https://lists.openembedded.org/g/openembedded-core/message/206655
Mute This Topic: https://lists.openembedded.org/mt/109357849/3619876
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-