mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 19:46:51 +00:00
89bb4050f7
Add a patch to fix non-x86 builds, refresh patches and update/fix the configuration as described in98b09ba250(cited here for future reference). Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-default/busybox-1.37.0 cd .. ./convert_defaults.pl ../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-default/busybox-1.37.0/.config > Config-defaults.in Manual edits needed after config refresh: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt config TARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit547f1ec) * Config-defaults.in: OpenWrt logic applied to BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD (commitdc92917) * Config-defaults.in: correct the default ports that get reset BUSYBOX_DEFAULT_FEATURE_HTTPD_PORT_DEFAULT 80 BUSYBOX_DEFAULT_FEATURE_TELNETD_PORT_DEFAULT 23 * config/editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commitf141090) * config/shell/Config.in: change at "Options common to all shells" the conditional symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit a few Config.in files by adding quotes to sourced items in config/Config.in, config/networking/Config.in and config/util-linux/Config.in (commit1da014fcca) Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [rebased with the change download line commit] [corrected version in the refresh example in commit message] Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> Link: https://github.com/openwrt/openwrt/pull/17107 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
15 lines
516 B
Diff
15 lines
516 B
Diff
Index: busybox-1.37.0/libbb/hash_md5_sha.c
|
|
===================================================================
|
|
--- busybox-1.37.0.orig/libbb/hash_md5_sha.c
|
|
+++ busybox-1.37.0/libbb/hash_md5_sha.c
|
|
@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *
|
|
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;
|