mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-11 15:33:03 +00:00
b6cbbbb6ef
Update busybox to version 1.34.0 * Remove upstreamed patches (205, 530, 540) * Remove one old patch that does not apply any more. (203) That was originally introduced in 2008 with563d23459, but does not apply after busybox restructuring with https://git.busybox.net/busybox/commit/networking/udhcp/dhcpc.c?h=1_34_stable&id=e6007c4911c3ea26925f9473b9f156a692585f30 and https://git.busybox.net/busybox/commit/networking/udhcp/dhcpc.c?h=1_34_stable&id=1c7253726fcbab09917f143f0b703efbd2df55c3 * Refresh config and patches. * Backport upstream fixes for - MIPS compilation breakage and - process substitution regression Config refresh: Refresh commands, run after busybox is first built once: cd utils/busybox/ cd config/ ../convert_menuconfig.pl ../../../../build_dir/target-aarch64_cortex-a53_musl/busybox-default/busybox-1.34.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-aarch64_cortex-a53_musl/busybox-default/busybox-1.34.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit547f1ec) * Config-defaults.in: OpenWrt logic applied to BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD (commitdc92917) BUSYBOX_DEFAULT_UDHCPC_DEFAULT_INTERFACE (just "") * 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 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 Config.in files by adding quotes to sourced items in config/Config.in, config/networking/Config.in and config/util-linux/Config.in (commit1da014f) Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 00adcdb64a5487f0ea6b400d912dcf7c58637696 Mon Sep 17 00:00:00 2001
|
|
From: Denys Vlasenko <vda.linux@googlemail.com>
|
|
Date: Fri, 20 Aug 2021 13:33:50 +0200
|
|
Subject: udhcp: fix build breakage on MIPS
|
|
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
|
---
|
|
networking/udhcp/common.h | 12 ------------
|
|
1 file changed, 12 deletions(-)
|
|
|
|
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
|
|
index 8c678dd32..ca778dab8 100644
|
|
--- a/networking/udhcp/common.h
|
|
+++ b/networking/udhcp/common.h
|
|
@@ -304,18 +304,6 @@ void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
|
|
# define log3s(msg) ((void)0)
|
|
#endif
|
|
|
|
-#if defined(__mips__)
|
|
-/*
|
|
- * The 'simple' message functions have a negative impact on the size of the
|
|
- * DHCP code when compiled for MIPS, so don't use them in this case.
|
|
- */
|
|
-#define bb_simple_info_msg bb_info_msg
|
|
-#define bb_simple_error_msg bb_error_msg
|
|
-#define bb_simple_perror_msg_and_die bb_perror_msg_and_die
|
|
-#undef log1s
|
|
-#define log1s log1
|
|
-#endif
|
|
-
|
|
/*** Other shared functions ***/
|
|
|
|
/* 2nd param is "uint32_t*" */
|
|
--
|
|
cgit v1.2.3
|
|
|
|
|