summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiping Ma <jiping.ma2@windriver.com>2019-05-23 15:03:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-11 13:26:55 +0100
commitfd1cfea5be9b643c8a58fc975c97c5b9f7e5263b (patch)
treef2b92e7f7ee345902c47f07594f3c5b29c4f804f
parentc07435a83a45332cfe2639f5f09bf21e5ead19b5 (diff)
downloadpoky-fd1cfea5be9b643c8a58fc975c97c5b9f7e5263b.tar.gz
dhcp:"dhclient -x eth0" action is not correct.
The action of "dhclient -x eth0" and "dhclient -r eth0" is same when enable ENABLE_GENTLE_SHUTDOWN. Disable ENABLE_GENTLE_SHUTDOWN that will use the default signal hander. (From OE-Core rev: 8e5c85332f222efd5ffddaa9da9272c6e42881f5) Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch27
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb1
2 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch b/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
deleted file mode 100644
index 6ef70ccacd..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 01641d146e4e6bea954e4a4ee1f6230b822665b4 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 15 Aug 2017 15:37:49 +0800
4Subject: [PATCH 06/11] site.h: enable gentle shutdown
5
6Upstream-Status: Inappropriate [configuration]
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8
9Rebase to 4.3.6
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 includes/site.h | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15Index: dhcp-4.4.1/includes/site.h
16===================================================================
17--- dhcp-4.4.1.orig/includes/site.h
18+++ dhcp-4.4.1/includes/site.h
19@@ -295,7 +295,7 @@
20 situations. We plan to revisit this feature and may
21 make non-backwards compatible changes including the
22 removal of this define. Use at your own risk. */
23-/* #define ENABLE_GENTLE_SHUTDOWN */
24+#define ENABLE_GENTLE_SHUTDOWN
25
26 /* Include old error codes. This is provided in case you
27 are building an external program similar to omshell for
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
index 19524cb3c9..275961a603 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
@@ -5,7 +5,6 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
5 file://0003-link-with-lcrypto.patch \ 5 file://0003-link-with-lcrypto.patch \
6 file://0004-Fix-out-of-tree-builds.patch \ 6 file://0004-Fix-out-of-tree-builds.patch \
7 file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \ 7 file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
8 file://0006-site.h-enable-gentle-shutdown.patch \
9 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \ 8 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
10 file://0009-remove-dhclient-script-bash-dependency.patch \ 9 file://0009-remove-dhclient-script-bash-dependency.patch \
11 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ 10 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \