summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-26 13:46:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-31 17:11:06 +0000
commitd119ac532f47a4da628b818bd1f8657383bc9b22 (patch)
tree147a84e8d0fb90afe05221a7f053cb7f1aa033dc /meta/recipes-core/busybox
parent86598c849cb5ea6a6132ef4885584f48094b809f (diff)
downloadpoky-d119ac532f47a4da628b818bd1f8657383bc9b22.tar.gz
busybox: Make provisions to disable sha256/sha1 accelaration on x86
busybox 1.36 has an ongoing regression on musl/i386 [1] we see same on glibc systems too. therefore avoid the affected code by disabling sha256/sha1 sum accelaration meanwhile CONFIG_SHA256_HWACCEL and CONFIG_SHA1_HWACCEL are enabled by default [1] http://lists.busybox.net/pipermail/busybox/2023-January/090078.html (From OE-Core rev: 22f639d61127f4b82a79008c5305e44e090a3680) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox/sha1sum.cfg1
-rw-r--r--meta/recipes-core/busybox/busybox/sha256sum.cfg1
-rw-r--r--meta/recipes-core/busybox/busybox/sha_accel.cfg2
-rw-r--r--meta/recipes-core/busybox/busybox_1.36.0.bb3
4 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/meta/recipes-core/busybox/busybox/sha1sum.cfg
index 01137a2486..afd4da4ea1 100644
--- a/meta/recipes-core/busybox/busybox/sha1sum.cfg
+++ b/meta/recipes-core/busybox/busybox/sha1sum.cfg
@@ -1,3 +1,2 @@
1CONFIG_SHA1SUM=y 1CONFIG_SHA1SUM=y
2CONFIG_SHA1_SMALL=3 2CONFIG_SHA1_SMALL=3
3CONFIG_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 @@
1CONFIG_SHA256SUM=y CONFIG_SHA256SUM=y
2CONFIG_SHA256_HWACCEL=y
diff --git a/meta/recipes-core/busybox/busybox/sha_accel.cfg b/meta/recipes-core/busybox/busybox/sha_accel.cfg
new file mode 100644
index 0000000000..8900305a11
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/sha_accel.cfg
@@ -0,0 +1,2 @@
1# CONFIG_SHA256_HWACCEL is not set
2# CONFIG_SHA1_HWACCEL is not set
diff --git a/meta/recipes-core/busybox/busybox_1.36.0.bb b/meta/recipes-core/busybox/busybox_1.36.0.bb
index e46d43e681..8014a5c7bf 100644
--- a/meta/recipes-core/busybox/busybox_1.36.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.36.0.bb
@@ -51,5 +51,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
51 file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ 51 file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \
52 " 52 "
53SRC_URI:append:libc-musl = " file://musl.cfg " 53SRC_URI:append:libc-musl = " file://musl.cfg "
54 54# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
55SRC_URI:append:x86 = " file://sha_accel.cfg"
55SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5" 56SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"