summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-16 04:31:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commita02826add027f71d1fca56547b2b72db28b1005f (patch)
treef42f5c26ea1ee6f5c67a79e08184df197bb4db71 /meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
parent5552c856a7dc05cb9ef5da8c0cdac63bbef4e8de (diff)
downloadpoky-a02826add027f71d1fca56547b2b72db28b1005f.tar.gz
dhcp: 4.3.5 -> 4.3.6
1. Rebase patches to 4.3.6 - define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch -> 0001 - dhcp-3.0.3-dhclient-dbus.patch -> 0002 - link-with-lcrypto.patch -> 0003 - fixsepbuild.patch -> 0004 - dhclient-script-drop-resolv.conf.dhclient.patch -> 0005 - 0001-site.h-enable-gentle-shutdown.patch -> 0006 - libxml2-configure-argument.patch -> 0007 - tweak-to-support-external-bind.patch -> 0008 - remove-dhclient-script-bash-dependency.patch -> 0009 - build-shared-libs.patch -> 0010 - Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch -> 0011 2. Drop search-for-libxml2.patch It is overrided by libxml2-configure-argument.patch 3. Rework dhclient-script-drop-resolv.conf.dhclient.patch and Drop replace-ifconfig-route.patch. vim client/scripts/linux ... Script refresh in 2017. The aliasing code was too convoluted and needs to go away. Migrated DHCPv4 script to ip command from iproute2 suite. This is based on Debian script with some tweaks. ifconfig is no longer used. Everything is done using ip tool from ip-route2. ... (From OE-Core rev: 77878d2e6e8f36afa9a0fde8a6f0f955c84a5e5c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch117
1 files changed, 117 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
new file mode 100644
index 0000000000..6459dc0090
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
@@ -0,0 +1,117 @@
1From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 14:56:56 +0800
4Subject: [PATCH 02/11] dhclient dbus
5
6upstream-Status: Inappropriate [distribution]
7
8Rebase to 4.3.6
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 client/scripts/bsdos | 5 +++++
12 client/scripts/freebsd | 5 +++++
13 client/scripts/linux | 5 +++++
14 client/scripts/netbsd | 5 +++++
15 client/scripts/openbsd | 5 +++++
16 client/scripts/solaris | 5 +++++
17 6 files changed, 30 insertions(+)
18
19diff --git a/client/scripts/bsdos b/client/scripts/bsdos
20index d69d0d8..095b143 100755
21--- a/client/scripts/bsdos
22+++ b/client/scripts/bsdos
23@@ -45,6 +45,11 @@ exit_with_hooks() {
24 . /etc/dhclient-exit-hooks
25 fi
26 # probably should do something with exit status of the local script
27+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
28+ dbus-send --system --dest=com.redhat.dhcp \
29+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
30+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
31+ fi
32 exit $exit_status
33 }
34
35diff --git a/client/scripts/freebsd b/client/scripts/freebsd
36index 8f3e2a2..ad7fb44 100755
37--- a/client/scripts/freebsd
38+++ b/client/scripts/freebsd
39@@ -89,6 +89,11 @@ exit_with_hooks() {
40 . /etc/dhclient-exit-hooks
41 fi
42 # probably should do something with exit status of the local script
43+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
44+ dbus-send --system --dest=com.redhat.dhcp \
45+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
46+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
47+ fi
48 exit $exit_status
49 }
50
51diff --git a/client/scripts/linux b/client/scripts/linux
52index 5fb1612..3d447b6 100755
53--- a/client/scripts/linux
54+++ b/client/scripts/linux
55@@ -174,6 +174,11 @@ exit_with_hooks() {
56 exit_status=$?
57 fi
58
59+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
60+ dbus-send --system --dest=com.redhat.dhcp \
61+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
62+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
63+ fi
64 exit $exit_status
65 }
66
67diff --git a/client/scripts/netbsd b/client/scripts/netbsd
68index 07383b7..aaba8e8 100755
69--- a/client/scripts/netbsd
70+++ b/client/scripts/netbsd
71@@ -45,6 +45,11 @@ exit_with_hooks() {
72 . /etc/dhclient-exit-hooks
73 fi
74 # probably should do something with exit status of the local script
75+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
76+ dbus-send --system --dest=com.redhat.dhcp \
77+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
78+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
79+ fi
80 exit $exit_status
81 }
82
83diff --git a/client/scripts/openbsd b/client/scripts/openbsd
84index e7f4746..56b980c 100644
85--- a/client/scripts/openbsd
86+++ b/client/scripts/openbsd
87@@ -45,6 +45,11 @@ exit_with_hooks() {
88 . /etc/dhclient-exit-hooks
89 fi
90 # probably should do something with exit status of the local script
91+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
92+ dbus-send --system --dest=com.redhat.dhcp \
93+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
94+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
95+ fi
96 exit $exit_status
97 }
98
99diff --git a/client/scripts/solaris b/client/scripts/solaris
100index af553b9..4a2aa69 100755
101--- a/client/scripts/solaris
102+++ b/client/scripts/solaris
103@@ -26,6 +26,11 @@ exit_with_hooks() {
104 . /etc/dhclient-exit-hooks
105 fi
106 # probably should do something with exit status of the local script
107+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
108+ dbus-send --system --dest=com.redhat.dhcp \
109+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
110+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
111+ fi
112 exit $exit_status
113 }
114
115--
1161.8.3.1
117