Revert "busybox: Make provisions to disable sha256/sha1 accelaration on x86"
PATCH 1/2 Revert "busybox: Make provisions to disable sha256/sha1 accelaration on x86"
This reverts commit 22f639d61127f4b82a79008c5305e44e090a3680.
The underlying problem has been corrected in 1.38.0 [1] so that acceleration can be enabled regardless of the architecture.
[1] https://github.com/vda-linux/busybox_mirror/commit/bf57f732a5b6842f6fa3e0f90385f039e5d6a92c
--- 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.38.0.bb | 1 - 4 files changed, 2 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.38.0.bb +0 -1
@@ -62,6 +62,5 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2026-38754.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg" -SRC_URI:append:x86-64 = " file://sha_accel.cfg" SRC_URI[tarball.sha256sum] = "34f9ea6ff8636f2c9241153b9114eefa9e65674a45318ae1ef95bb5f31c53bb2"
PATCH 2/2 busybox: Remove CONFIG_SHA1_SMALL and CONFIG_SHA*_HWACCEL from sha*sum.cfg
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.
--- 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
Re: [OE-core] [PATCH 2/2] busybox: Remove CONFIG_SHA1_SMALL and CONFIG_SHA*_HWACCEL from sha*sum.cfg
Quoted 6 lines · Peter Kjellerstedt via lists.openembedded.org
The options
CONFIG_SHA1_SMALL,CONFIG_SHA1_HWACCELandCONFIG_SHA256_HWACCELaffect 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.
Something in this series seems to be causing:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/19/builds/4483
stdio: ERROR: busybox-1.38.0-r0 do_package_qa: QA Issue: busybox: ELF binary /bin/busybox.nosuid has relocations in .text [textrel]
stdio: ERROR: busybox-1.38.0-r0 do_package_qa: Fatal QA errors were found, failing task.
:(
Cheers,
Richard