From f03f8eac4c72be0f16468ebd0ee4dd1f07b0563b Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Wed, 14 Mar 2012 17:01:00 +0800 Subject: busybox: upgrade to 1.19.4 Removing the patch busybox-1.19.3-getty.patch is because it is already in the upstream. Signed-off-by: Shane Wang --- .../busybox-udhcpc-no_deconfig.patch | 133 --------------------- 1 file changed, 133 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch (limited to 'meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch') diff --git a/meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch deleted file mode 100644 index 481d8b363..000000000 --- a/meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 16c5fa61059f9862b2534c75dad75f7ece338208 Mon Sep 17 00:00:00 2001 -From: Anders Darander -Date: Thu, 3 Nov 2011 08:51:31 +0100 -Subject: [PATCH] busybox-udhcpc-no_deconfig.patch - -Upstream-Status: Pending - -Add a new option -D to the udhcpc client that allows for -dhcp renewal to occur without having to down the interface -in the process. - -Signed-off-by: Greg Moffatt - -Updated to latest Busybox 1.17.3 - -Signed-off-by: Mark Hatle - -Updated to Busybox 1.18.4 -option spec is changed - -Signed-off-by: Qing He - -Updated to Busybox 1.19.3 - -Signed-off-by: Anders Darander ---- - networking/udhcp/dhcpc.c | 27 ++++++++++++++++++++------- - 1 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 4d755e6..eb80484 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -29,6 +29,9 @@ - #include - #include - -+/* option whether to down the interface when reconfiguring */ -+static int allow_deconfig = 1; -+ - /* struct client_config_t client_config is in bb_common_bufsiz1 */ - - -@@ -82,6 +85,7 @@ enum { - OPT_x = 1 << 18, - OPT_f = 1 << 19, - OPT_B = 1 << 20, -+ OPT_D = 1 << 21, - /* The rest has variable bit positions, need to be clever */ - OPTBIT_B = 20, - USE_FOR_MMU( OPTBIT_b,) -@@ -899,7 +903,8 @@ static void perform_renew(void) - state = RENEW_REQUESTED; - break; - case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - case REQUESTING: - case RELEASED: - change_listen_mode(LISTEN_RAW); -@@ -923,7 +928,8 @@ static void perform_release(uint32_t requested_ip, uint32_t server_addr) - bb_info_msg("Unicasting a release of %s to %s", - inet_ntoa(temp_addr), buffer); - send_release(server_addr, requested_ip); /* unicast */ -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - } - bb_info_msg("Entering released state"); - -@@ -1083,7 +1089,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - #endif - ; - IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) -- opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" -+ opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fBD" - USE_FOR_MMU("b") - IF_FEATURE_UDHCPC_ARPING("a") - IF_FEATURE_UDHCP_PORT("P:") -@@ -1175,6 +1181,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - logmode |= LOGMODE_SYSLOG; - } - -+ if (opt & OPT_D) -+ allow_deconfig = 0; -+ - /* Make sure fd 0,1,2 are open */ - bb_sanitize_stdio(); - /* Equivalent of doing a fflush after every \n */ -@@ -1189,7 +1198,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - srand(monotonic_us()); - - state = INIT_SELECTING; -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - change_listen_mode(LISTEN_RAW); - packet_num = 0; - timeout = 0; -@@ -1341,7 +1351,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - } - /* Timed out, enter init state */ - bb_info_msg("Lease lost, entering init state"); -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - state = INIT_SELECTING; - client_config.first_secs = 0; /* make secs field count from 0 */ - /*timeout = 0; - already is */ -@@ -1489,7 +1500,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - send_decline(xid, server_addr, packet.yiaddr); - - if (state != REQUESTING) -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - change_listen_mode(LISTEN_RAW); - state = INIT_SELECTING; - client_config.first_secs = 0; /* make secs field count from 0 */ -@@ -1536,7 +1548,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - bb_info_msg("Received DHCP NAK"); - udhcp_run_script(&packet, "nak"); - if (state != REQUESTING) -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - change_listen_mode(LISTEN_RAW); - sleep(3); /* avoid excessive network traffic */ - state = INIT_SELECTING; --- -1.7.7.1 - -- cgit v1.2.3