diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp')
10 files changed, 0 insertions, 563 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted file mode 100644 index d1b57f0bb4..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 16:14:22 +0800 | ||
4 | Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Rebase to 4.3.6 | ||
9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
10 | --- | ||
11 | includes/site.h | 3 ++- | ||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
13 | |||
14 | Index: dhcp-4.4.1/includes/site.h | ||
15 | =================================================================== | ||
16 | --- dhcp-4.4.1.orig/includes/site.h | ||
17 | +++ dhcp-4.4.1/includes/site.h | ||
18 | @@ -148,7 +148,8 @@ | ||
19 | /* Define this if you want the dhcpd.conf file to go somewhere other than | ||
20 | the default location. By default, it goes in /etc/dhcpd.conf. */ | ||
21 | |||
22 | -/* #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" */ | ||
23 | +#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" | ||
24 | +#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" | ||
25 | |||
26 | /* Network API definitions. You do not need to choose one of these - if | ||
27 | you don't choose, one will be chosen for you in your system's config | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted file mode 100644 index 2359381b93..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From eec0503cfc36f63d777f5cb3f2719cecedcb8468 Mon Sep 17 00:00:00 2001 | ||
2 | From: Haris Okanovic <haris.okanovic@ni.com> | ||
3 | Date: Mon, 7 Jan 2019 13:22:09 -0600 | ||
4 | Subject: [PATCH] Workaround busybox limitation in Linux dhclient-script | ||
5 | |||
6 | Busybox is a lightweight implementation of coreutils commonly used on | ||
7 | space-constrained embedded Linux distributions. It's implementation of | ||
8 | chown and chmod doesn't provide a "--reference" option added to | ||
9 | client/scripts/linux as of commit 9261cb14. This change works around | ||
10 | that limitation by using stat to read ownership and permissions flags | ||
11 | and simple chown/chmod calls supported in both coreutils and busybox. | ||
12 | |||
13 | modified: client/scripts/linux | ||
14 | |||
15 | Signed-off-by: Haris Okanovic <haris.okanovic@ni.com> | ||
16 | Upstream-Status: Pending [ISC-Bugs #48771] | ||
17 | --- | ||
18 | client/scripts/linux | 17 +++++++++++++---- | ||
19 | 1 file changed, 13 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
22 | index 0c429697..2435a44b 100755 | ||
23 | --- a/client/scripts/linux | ||
24 | +++ b/client/scripts/linux | ||
25 | @@ -32,6 +32,17 @@ | ||
26 | # if your system holds ip tool in a non-standard location. | ||
27 | ip=/sbin/ip | ||
28 | |||
29 | +chown_chmod_by_reference() { | ||
30 | + local reference_file="$1" | ||
31 | + local target_file="$2" | ||
32 | + | ||
33 | + local owner=$(stat -c "%u:%g" "$reference_file") | ||
34 | + local perm=$(stat -c "%a" "$reference_file") | ||
35 | + | ||
36 | + chown "$owner" "$target_file" | ||
37 | + chmod "$perm" "$target_file" | ||
38 | +} | ||
39 | + | ||
40 | # update /etc/resolv.conf based on received values | ||
41 | # This updated version mostly follows Debian script by Andrew Pollock et al. | ||
42 | make_resolv_conf() { | ||
43 | @@ -74,8 +85,7 @@ make_resolv_conf() { | ||
44 | fi | ||
45 | |||
46 | if [ -f /etc/resolv.conf ]; then | ||
47 | - chown --reference=/etc/resolv.conf $new_resolv_conf | ||
48 | - chmod --reference=/etc/resolv.conf $new_resolv_conf | ||
49 | + chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf | ||
50 | fi | ||
51 | mv -f $new_resolv_conf /etc/resolv.conf | ||
52 | # DHCPv6 | ||
53 | @@ -101,8 +111,7 @@ make_resolv_conf() { | ||
54 | fi | ||
55 | |||
56 | if [ -f /etc/resolv.conf ]; then | ||
57 | - chown --reference=/etc/resolv.conf $new_resolv_conf | ||
58 | - chmod --reference=/etc/resolv.conf $new_resolv_conf | ||
59 | + chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf | ||
60 | fi | ||
61 | mv -f $new_resolv_conf /etc/resolv.conf | ||
62 | fi | ||
63 | -- | ||
64 | 2.20.0 | ||
65 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted file mode 100644 index 101c33f677..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch +++ /dev/null | |||
@@ -1,117 +0,0 @@ | |||
1 | From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 14:56:56 +0800 | ||
4 | Subject: [PATCH 02/11] dhclient dbus | ||
5 | |||
6 | Upstream-Status: Inappropriate [distribution] | ||
7 | |||
8 | Rebase to 4.3.6 | ||
9 | Signed-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 | |||
19 | diff --git a/client/scripts/bsdos b/client/scripts/bsdos | ||
20 | index 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 | |||
35 | diff --git a/client/scripts/freebsd b/client/scripts/freebsd | ||
36 | index 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 | |||
51 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
52 | index 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 | |||
67 | diff --git a/client/scripts/netbsd b/client/scripts/netbsd | ||
68 | index 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 | |||
83 | diff --git a/client/scripts/openbsd b/client/scripts/openbsd | ||
84 | index 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 | |||
99 | diff --git a/client/scripts/solaris b/client/scripts/solaris | ||
100 | index 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 | -- | ||
116 | 1.8.3.1 | ||
117 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted file mode 100644 index 5b35933a54..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei@gherzan.ro> | ||
3 | Date: Tue, 15 Aug 2017 15:05:47 +0800 | ||
4 | Subject: [PATCH 03/11] link with lcrypto | ||
5 | |||
6 | From 4.2.0 final release, -lcrypto check was removed and we compile | ||
7 | static libraries | ||
8 | from bind that are linked to libcrypto. This is why i added a patch in | ||
9 | order to add | ||
10 | -lcrypto to LIBS. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
14 | |||
15 | Rebase to 4.3.6 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | --- | ||
18 | configure.ac | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | Index: dhcp-4.4.1/configure.ac | ||
22 | =================================================================== | ||
23 | --- dhcp-4.4.1.orig/configure.ac | ||
24 | +++ dhcp-4.4.1/configure.ac | ||
25 | @@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], | ||
26 | # Look for optional headers. | ||
27 | AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) | ||
28 | |||
29 | +# find an MD5 library | ||
30 | +AC_SEARCH_LIBS(MD5_Init, [crypto]) | ||
31 | +AC_SEARCH_LIBS(MD5Init, [crypto]) | ||
32 | + | ||
33 | # Solaris needs some libraries for functions | ||
34 | AC_SEARCH_LIBS(socket, [socket]) | ||
35 | AC_SEARCH_LIBS(inet_ntoa, [nsl]) | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted file mode 100644 index 7b57730ffb..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 15:08:22 +0800 | ||
4 | Subject: [PATCH 04/11] Fix out of tree builds | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | RP 2013/03/21 | ||
9 | |||
10 | Rebase to 4.3.6 | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | client/Makefile.am | 4 ++-- | ||
15 | common/Makefile.am | 3 ++- | ||
16 | dhcpctl/Makefile.am | 2 ++ | ||
17 | omapip/Makefile.am | 1 + | ||
18 | relay/Makefile.am | 2 +- | ||
19 | server/Makefile.am | 2 +- | ||
20 | 6 files changed, 9 insertions(+), 5 deletions(-) | ||
21 | |||
22 | Index: dhcp-4.4.1/common/Makefile.am | ||
23 | =================================================================== | ||
24 | --- dhcp-4.4.1.orig/common/Makefile.am | ||
25 | +++ dhcp-4.4.1/common/Makefile.am | ||
26 | @@ -1,4 +1,5 @@ | ||
27 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | ||
28 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | ||
29 | + | ||
30 | AM_CFLAGS = $(LDAP_CFLAGS) | ||
31 | |||
32 | lib_LIBRARIES = libdhcp.a | ||
33 | Index: dhcp-4.4.1/dhcpctl/Makefile.am | ||
34 | =================================================================== | ||
35 | --- dhcp-4.4.1.orig/dhcpctl/Makefile.am | ||
36 | +++ dhcp-4.4.1/dhcpctl/Makefile.am | ||
37 | @@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@ | ||
38 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ | ||
39 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
40 | |||
41 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) | ||
42 | + | ||
43 | bin_PROGRAMS = omshell | ||
44 | lib_LIBRARIES = libdhcpctl.a | ||
45 | noinst_PROGRAMS = cltest | ||
46 | Index: dhcp-4.4.1/server/Makefile.am | ||
47 | =================================================================== | ||
48 | --- dhcp-4.4.1.orig/server/Makefile.am | ||
49 | +++ dhcp-4.4.1/server/Makefile.am | ||
50 | @@ -4,7 +4,7 @@ | ||
51 | # production code. Sadly, we are not there yet. | ||
52 | SUBDIRS = . tests | ||
53 | |||
54 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
55 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
56 | |||
57 | dist_sysconf_DATA = dhcpd.conf.example | ||
58 | sbin_PROGRAMS = dhcpd | ||
59 | Index: dhcp-4.4.1/client/Makefile.am | ||
60 | =================================================================== | ||
61 | --- dhcp-4.4.1.orig/client/Makefile.am | ||
62 | +++ dhcp-4.4.1/client/Makefile.am | ||
63 | @@ -5,7 +5,7 @@ | ||
64 | SUBDIRS = . tests | ||
65 | |||
66 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' | ||
67 | -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' | ||
68 | +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes | ||
69 | |||
70 | dist_sysconf_DATA = dhclient.conf.example | ||
71 | sbin_PROGRAMS = dhclient | ||
72 | Index: dhcp-4.4.1/omapip/Makefile.am | ||
73 | =================================================================== | ||
74 | --- dhcp-4.4.1.orig/omapip/Makefile.am | ||
75 | +++ dhcp-4.4.1/omapip/Makefile.am | ||
76 | @@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@ | ||
77 | BINDLIBDNSDIR=@BINDLIBDNSDIR@ | ||
78 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ | ||
79 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
80 | +AM_CPPFLAGS = -I$(top_srcdir)/includes | ||
81 | |||
82 | lib_LIBRARIES = libomapi.a | ||
83 | noinst_PROGRAMS = svtest | ||
84 | Index: dhcp-4.4.1/relay/Makefile.am | ||
85 | =================================================================== | ||
86 | --- dhcp-4.4.1.orig/relay/Makefile.am | ||
87 | +++ dhcp-4.4.1/relay/Makefile.am | ||
88 | @@ -1,6 +1,6 @@ | ||
89 | SUBDIRS = . tests | ||
90 | |||
91 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' | ||
92 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
93 | |||
94 | sbin_PROGRAMS = dhcrelay | ||
95 | dhcrelay_SOURCES = dhcrelay.c | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted file mode 100644 index dd56381b1d..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 15:24:14 +0800 | ||
4 | Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on | ||
5 | Read-only file system | ||
6 | |||
7 | In read-only file system, '/etc' is on the readonly partition, | ||
8 | and '/etc/resolv.conf' is symlinked to a separate writable | ||
9 | partition. | ||
10 | |||
11 | In this situation, we create temp files 'resolv.conf.dhclient-new' | ||
12 | in /tmp dir. | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | --- | ||
18 | client/scripts/linux | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
22 | index 3d447b6..3122a75 100755 | ||
23 | --- a/client/scripts/linux | ||
24 | +++ b/client/scripts/linux | ||
25 | @@ -40,7 +40,7 @@ make_resolv_conf() { | ||
26 | # DHCPv4 | ||
27 | if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] || | ||
28 | [ -n "$new_domain_name_servers" ]; then | ||
29 | - new_resolv_conf=/etc/resolv.conf.dhclient-new | ||
30 | + new_resolv_conf=/tmp/resolv.conf.dhclient-new | ||
31 | rm -f $new_resolv_conf | ||
32 | |||
33 | if [ -n "$new_domain_name" ]; then | ||
34 | -- | ||
35 | 1.8.3.1 | ||
36 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted file mode 100644 index feb0754fff..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Tue, 15 Aug 2017 16:17:49 +0800 | ||
4 | Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency | ||
5 | explicit and determinisitic. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
10 | |||
11 | Rebase to 4.3.6 | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | configure.ac | 11 +++++++++++ | ||
16 | 1 file changed, 11 insertions(+) | ||
17 | |||
18 | Index: dhcp-4.4.1/configure.ac | ||
19 | =================================================================== | ||
20 | --- dhcp-4.4.1.orig/configure.ac | ||
21 | +++ dhcp-4.4.1/configure.ac | ||
22 | @@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then | ||
23 | LIBS="-lrt $LIBS" | ||
24 | fi | ||
25 | |||
26 | +AC_ARG_WITH(libxml2, | ||
27 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), | ||
28 | + with_libxml2="$withval", with_libxml2="no") | ||
29 | + | ||
30 | +if test x$with_libxml2 != xno; then | ||
31 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2], | ||
32 | + [if test x$with_libxml2 != xauto; then | ||
33 | + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
34 | + fi]) | ||
35 | +fi | ||
36 | + | ||
37 | # check for /dev/random (declares HAVE_DEV_RANDOM) | ||
38 | AC_MSG_CHECKING(for random device) | ||
39 | AC_ARG_WITH(randomdev, | ||
40 | Index: dhcp-4.4.1/configure.ac+lt | ||
41 | =================================================================== | ||
42 | --- dhcp-4.4.1.orig/configure.ac+lt | ||
43 | +++ dhcp-4.4.1/configure.ac+lt | ||
44 | @@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u | ||
45 | fi | ||
46 | AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes") | ||
47 | |||
48 | +AC_ARG_WITH(libxml2, | ||
49 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), | ||
50 | + with_libxml2="$withval", with_libxml2="no") | ||
51 | + | ||
52 | +if test x$with_libxml2 != xno; then | ||
53 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],, | ||
54 | + [if test x$with_libxml2 != xauto; then | ||
55 | + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
56 | + fi]) | ||
57 | +fi | ||
58 | + | ||
59 | + | ||
60 | # OpenLDAP support. | ||
61 | AC_ARG_WITH(ldap, | ||
62 | AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]), | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted file mode 100644 index 912b6d6312..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Tue, 15 Aug 2017 15:49:31 +0800 | ||
4 | Subject: [PATCH 09/11] remove dhclient-script bash dependency | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
9 | |||
10 | Rebase to 4.3.6 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | --- | ||
13 | client/scripts/linux | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
17 | index 3122a75..1712d7d 100755 | ||
18 | --- a/client/scripts/linux | ||
19 | +++ b/client/scripts/linux | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/bin/bash | ||
22 | +#!/bin/sh | ||
23 | # dhclient-script for Linux. Dan Halbert, March, 1997. | ||
24 | # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. | ||
25 | # No guarantees about this. I'm a novice at the details of Linux | ||
26 | -- | ||
27 | 1.8.3.1 | ||
28 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch b/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted file mode 100644 index 39ba65fbc4..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Awais Belal <awais_belal@mentor.com> | ||
3 | Date: Wed, 25 Oct 2017 21:00:05 +0500 | ||
4 | Subject: [PATCH] dhcp: correct the intention for xml2 lib search | ||
5 | |||
6 | A missing case breaks the build when libxml2 is | ||
7 | required and found appropriately. The third argument | ||
8 | to the function AC_SEARCH_LIB is action-if-found which | ||
9 | was mistakenly been used for the case where the library | ||
10 | is not found and hence breaks the configure phase | ||
11 | where it shoud actually pass. | ||
12 | We now pass on silently when action-if-found is | ||
13 | executed. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Awais Belal <awais_belal@mentor.com> | ||
18 | --- | ||
19 | configure.ac | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | Index: dhcp-4.4.1/configure.ac | ||
23 | =================================================================== | ||
24 | --- dhcp-4.4.1.orig/configure.ac | ||
25 | +++ dhcp-4.4.1/configure.ac | ||
26 | @@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2, | ||
27 | with_libxml2="$withval", with_libxml2="no") | ||
28 | |||
29 | if test x$with_libxml2 != xno; then | ||
30 | - AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2], | ||
31 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],, | ||
32 | [if test x$with_libxml2 != xauto; then | ||
33 | AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
34 | fi]) | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch b/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted file mode 100644 index fcec010bd0..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | lib and include path is hardcoded for use_libbind | ||
2 | |||
3 | use libdir and includedir vars | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
7 | |||
8 | Index: dhcp-4.4.1/configure.ac+lt | ||
9 | =================================================================== | ||
10 | --- dhcp-4.4.1.orig/configure.ac+lt | ||
11 | +++ dhcp-4.4.1/configure.ac+lt | ||
12 | @@ -801,22 +801,22 @@ no) | ||
13 | if test ! -d "$use_libbind"; then | ||
14 | AC_MSG_ERROR([Cannot find bind directory at $use_libbind]) | ||
15 | fi | ||
16 | - if test ! -d "$use_libbind/include" -o \ | ||
17 | - ! -f "$use_libbind/include/isc/buffer.h" | ||
18 | + if test ! -d "$use_libbind/$includedir" -o \ | ||
19 | + ! -f "$use_libbind/$includedir/isc/buffer.h" | ||
20 | then | ||
21 | - AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include]) | ||
22 | + AC_MSG_ERROR([Cannot find bind includes at $use_libbind/$includedir]) | ||
23 | fi | ||
24 | - if test ! -d "$use_libbind/lib" -o \ | ||
25 | - \( ! -f "$use_libbind/lib/libisc.a" -a \ | ||
26 | - ! -f "$use_libbind/lib/libisc.la" \) | ||
27 | + if test ! -d "$use_libbind/$libdir" -o \ | ||
28 | + \( ! -f "$use_libbind/$libdir/libisc.a" -a \ | ||
29 | + ! -f "$use_libbind/$libdir/libisc.la" \) | ||
30 | then | ||
31 | - AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib]) | ||
32 | + AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir]) | ||
33 | fi | ||
34 | BINDDIR="$use_libbind" | ||
35 | - BINDLIBIRSDIR="$BINDDIR/lib" | ||
36 | - BINDLIBDNSDIR="$BINDDIR/lib" | ||
37 | - BINDLIBISCCFGDIR="$BINDDIR/lib" | ||
38 | - BINDLIBISCDIR="$BINDDIR/lib" | ||
39 | + BINDLIBIRSDIR="$BINDDIR/$libdir" | ||
40 | + BINDLIBDNSDIR="$BINDDIR/$libdir" | ||
41 | + BINDLIBISCCFGDIR="$BINDDIR/$libdir" | ||
42 | + BINDLIBISCDIR="$BINDDIR/$libdir" | ||
43 | DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind" | ||
44 | ;; | ||
45 | esac | ||
46 | @@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool, | ||
47 | |||
48 | if test "$use_libbind" != "no"; then | ||
49 | if test "$want_libtool" = "yes" -a \ | ||
50 | - ! -f "$use_libbind/lib/libisc.la" | ||
51 | + ! -f "$use_libbind/$libdir/libisc.la" | ||
52 | then | ||
53 | - AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib]) | ||
54 | + AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/$libdir]) | ||
55 | fi | ||
56 | if test "$want_libtool" = "no" -a \ | ||
57 | - ! -f "$use_libbind/lib/libisc.a" | ||
58 | + ! -f "$use_libbind/$libdir/libisc.a" | ||
59 | then | ||
60 | - AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib]) | ||
61 | + AC_MSG_ERROR([Cannot find static libraries at $use_libbind/$libdir]) | ||
62 | fi | ||
63 | fi | ||
64 | |||