summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc3
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch69
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch83
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb17
4 files changed, 89 insertions, 83 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index e94370786a..44e946cb21 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.isc.org/"
10LICENSE = "ISC" 10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753" 11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
12 12
13DEPENDS = "openssl bind" 13DEPENDS = "openssl"
14 14
15SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ 15SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
16 file://init-relay file://default-relay \ 16 file://init-relay file://default-relay \
@@ -48,7 +48,6 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
48 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \ 48 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
49 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ 49 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
50 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \ 50 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
51 --with-libbind=${STAGING_LIBDIR}/ \
52 --enable-paranoia --disable-static \ 51 --enable-paranoia --disable-static \
53 --with-randomdev=/dev/random \ 52 --with-randomdev=/dev/random \
54 " 53 "
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
index 006d18ae7f..a20b5f96f6 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20 server/tests/Makefile.am | 2 +- 20 server/tests/Makefile.am | 2 +-
21 8 files changed, 8 insertions(+), 8 deletions(-) 21 8 files changed, 8 insertions(+), 8 deletions(-)
22 22
23diff --git a/client/Makefile.am b/client/Makefile.am 23Index: dhcp-4.3.6/client/Makefile.am
24index 4730bb3..84d8131 100644 24===================================================================
25--- a/client/Makefile.am 25--- dhcp-4.3.6.orig/client/Makefile.am
26+++ b/client/Makefile.am 26+++ dhcp-4.3.6/client/Makefile.am
27@@ -4,7 +4,7 @@ 27@@ -4,7 +4,7 @@
28 # production code. Sadly, we are not there yet. 28 # production code. Sadly, we are not there yet.
29 SUBDIRS = . tests 29 SUBDIRS = . tests
@@ -33,10 +33,10 @@ index 4730bb3..84d8131 100644
33 33
34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ 34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes 35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
36diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am 36Index: dhcp-4.3.6/client/tests/Makefile.am
37index 5031d0c..a8dfd26 100644 37===================================================================
38--- a/client/tests/Makefile.am 38--- dhcp-4.3.6.orig/client/tests/Makefile.am
39+++ b/client/tests/Makefile.am 39+++ dhcp-4.3.6/client/tests/Makefile.am
40@@ -1,6 +1,6 @@ 40@@ -1,6 +1,6 @@
41 SUBDIRS = . 41 SUBDIRS = .
42 42
@@ -45,10 +45,10 @@ index 5031d0c..a8dfd26 100644
45 45
46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes 46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) 47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
48diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am 48Index: dhcp-4.3.6/common/tests/Makefile.am
49index f6a43e4..2f98d22 100644 49===================================================================
50--- a/common/tests/Makefile.am 50--- dhcp-4.3.6.orig/common/tests/Makefile.am
51+++ b/common/tests/Makefile.am 51+++ dhcp-4.3.6/common/tests/Makefile.am
52@@ -1,6 +1,6 @@ 52@@ -1,6 +1,6 @@
53 SUBDIRS = . 53 SUBDIRS = .
54 54
@@ -57,40 +57,40 @@ index f6a43e4..2f98d22 100644
57 57
58 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes 58 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
59 59
60diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am 60Index: dhcp-4.3.6/dhcpctl/Makefile.am
61index ba8dd8b..9b2486e 100644 61===================================================================
62--- a/dhcpctl/Makefile.am 62--- dhcp-4.3.6.orig/dhcpctl/Makefile.am
63+++ b/dhcpctl/Makefile.am 63+++ dhcp-4.3.6/dhcpctl/Makefile.am
64@@ -1,4 +1,4 @@ 64@@ -1,4 +1,4 @@
65-BINDLIBDIR = @BINDDIR@/lib 65-BINDLIBDIR = @BINDDIR@/lib
66+BINDLIBDIR = @BINDDIR@ 66+BINDLIBDIR = @BINDDIR@
67 67
68 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) 68 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
69 69
70diff --git a/omapip/Makefile.am b/omapip/Makefile.am 70Index: dhcp-4.3.6/omapip/Makefile.am
71index dd1afa0..e4a8599 100644 71===================================================================
72--- a/omapip/Makefile.am 72--- dhcp-4.3.6.orig/omapip/Makefile.am
73+++ b/omapip/Makefile.am 73+++ dhcp-4.3.6/omapip/Makefile.am
74@@ -1,4 +1,4 @@ 74@@ -1,4 +1,4 @@
75-BINDLIBDIR = @BINDDIR@/lib 75-BINDLIBDIR = @BINDDIR@/lib
76+BINDLIBDIR = @BINDDIR@ 76+BINDLIBDIR = @BINDDIR@
77 AM_CPPFLAGS = -I$(top_srcdir)/includes 77 AM_CPPFLAGS = -I$(top_srcdir)/includes
78 78
79 lib_LIBRARIES = libomapi.a 79 lib_LTLIBRARIES = libomapi.la
80diff --git a/relay/Makefile.am b/relay/Makefile.am 80Index: dhcp-4.3.6/relay/Makefile.am
81index 6d652f6..b3bf578 100644 81===================================================================
82--- a/relay/Makefile.am 82--- dhcp-4.3.6.orig/relay/Makefile.am
83+++ b/relay/Makefile.am 83+++ dhcp-4.3.6/relay/Makefile.am
84@@ -1,4 +1,4 @@ 84@@ -1,4 +1,4 @@
85-BINDLIBDIR = @BINDDIR@/lib 85-BINDLIBDIR = @BINDDIR@/lib
86+BINDLIBDIR = @BINDDIR@ 86+BINDLIBDIR = @BINDDIR@
87 87
88 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 88 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
89 89
90diff --git a/server/Makefile.am b/server/Makefile.am 90Index: dhcp-4.3.6/server/Makefile.am
91index 3990b9c..b5d8c2d 100644 91===================================================================
92--- a/server/Makefile.am 92--- dhcp-4.3.6.orig/server/Makefile.am
93+++ b/server/Makefile.am 93+++ dhcp-4.3.6/server/Makefile.am
94@@ -4,7 +4,7 @@ 94@@ -4,7 +4,7 @@
95 # production code. Sadly, we are not there yet. 95 # production code. Sadly, we are not there yet.
96 SUBDIRS = . tests 96 SUBDIRS = . tests
@@ -100,10 +100,10 @@ index 3990b9c..b5d8c2d 100644
100 100
101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
102 102
103diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am 103Index: dhcp-4.3.6/server/tests/Makefile.am
104index a87c5e7..9821081 100644 104===================================================================
105--- a/server/tests/Makefile.am 105--- dhcp-4.3.6.orig/server/tests/Makefile.am
106+++ b/server/tests/Makefile.am 106+++ dhcp-4.3.6/server/tests/Makefile.am
107@@ -1,6 +1,6 @@ 107@@ -1,6 +1,6 @@
108 SUBDIRS = . 108 SUBDIRS = .
109 109
@@ -112,6 +112,3 @@ index a87c5e7..9821081 100644
112 112
113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes 113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) 114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
115--
1161.8.3.1
117
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
index f128731c64..898b1fc7ec 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
@@ -23,11 +23,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
23 server/tests/Makefile.am | 7 +++---- 23 server/tests/Makefile.am | 7 +++----
24 8 files changed, 26 insertions(+), 43 deletions(-) 24 8 files changed, 26 insertions(+), 43 deletions(-)
25 25
26diff --git a/client/Makefile.am b/client/Makefile.am 26Index: dhcp-4.3.6/client/Makefile.am
27index 84d8131..e776bf0 100644 27===================================================================
28--- a/client/Makefile.am 28--- dhcp-4.3.6.orig/client/Makefile.am
29+++ b/client/Makefile.am 29+++ dhcp-4.3.6/client/Makefile.am
30@@ -15,7 +15,7 @@ dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \ 30@@ -15,7 +15,7 @@ dhclient_SOURCES = $(srcdir)/clparse.c $
31 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ 31 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
32 scripts/netbsd scripts/nextstep scripts/openbsd \ 32 scripts/netbsd scripts/nextstep scripts/openbsd \
33 scripts/solaris scripts/openwrt 33 scripts/solaris scripts/openwrt
@@ -37,11 +37,11 @@ index 84d8131..e776bf0 100644
37+ -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc 37+ -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc
38 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 38 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
39 EXTRA_DIST = $(man_MANS) 39 EXTRA_DIST = $(man_MANS)
40diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am 40Index: dhcp-4.3.6/common/tests/Makefile.am
41index 2f98d22..8745e88 100644 41===================================================================
42--- a/common/tests/Makefile.am 42--- dhcp-4.3.6.orig/common/tests/Makefile.am
43+++ b/common/tests/Makefile.am 43+++ dhcp-4.3.6/common/tests/Makefile.am
44@@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest 44@@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest
45 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c 45 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
46 alloc_unittest_LDADD = $(ATF_LDFLAGS) 46 alloc_unittest_LDADD = $(ATF_LDFLAGS)
47 alloc_unittest_LDADD += ../libdhcp.a \ 47 alloc_unittest_LDADD += ../libdhcp.a \
@@ -73,11 +73,11 @@ index 2f98d22..8745e88 100644
73 73
74 check: $(ATF_TESTS) 74 check: $(ATF_TESTS)
75 @if test $(top_srcdir) != ${top_builddir}; then \ 75 @if test $(top_srcdir) != ${top_builddir}; then \
76diff --git a/configure.ac b/configure.ac 76Index: dhcp-4.3.6/configure.ac
77index 8e9f509..bfe988a 100644 77===================================================================
78--- a/configure.ac 78--- dhcp-4.3.6.orig/configure.ac
79+++ b/configure.ac 79+++ dhcp-4.3.6/configure.ac
80@@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") 80@@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c
81 # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. 81 # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
82 AC_USE_SYSTEM_EXTENSIONS 82 AC_USE_SYSTEM_EXTENSIONS
83 83
@@ -96,11 +96,11 @@ index 8e9f509..bfe988a 100644
96 96
97 AC_CONFIG_HEADERS([includes/config.h]) 97 AC_CONFIG_HEADERS([includes/config.h])
98 98
99diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am 99Index: dhcp-4.3.6/dhcpctl/Makefile.am
100index 9b2486e..784cdf7 100644 100===================================================================
101--- a/dhcpctl/Makefile.am 101--- dhcp-4.3.6.orig/dhcpctl/Makefile.am
102+++ b/dhcpctl/Makefile.am 102+++ dhcp-4.3.6/dhcpctl/Makefile.am
103@@ -3,19 +3,17 @@ BINDLIBDIR = @BINDDIR@ 103@@ -3,19 +3,17 @@ BINDLIBDIR = @BINDDIR@/lib
104 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) 104 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
105 105
106 bin_PROGRAMS = omshell 106 bin_PROGRAMS = omshell
@@ -126,12 +126,12 @@ index 9b2486e..784cdf7 100644
126- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a 126- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
127+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ 127+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
128+ -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc 128+ -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc
129diff --git a/omapip/Makefile.am b/omapip/Makefile.am 129Index: dhcp-4.3.6/omapip/Makefile.am
130index e4a8599..c0c7a1e 100644 130===================================================================
131--- a/omapip/Makefile.am 131--- dhcp-4.3.6.orig/omapip/Makefile.am
132+++ b/omapip/Makefile.am 132+++ dhcp-4.3.6/omapip/Makefile.am
133@@ -1,10 +1,10 @@ 133@@ -1,10 +1,10 @@
134 BINDLIBDIR = @BINDDIR@ 134 BINDLIBDIR = @BINDDIR@/lib
135 AM_CPPFLAGS = -I$(top_srcdir)/includes 135 AM_CPPFLAGS = -I$(top_srcdir)/includes
136 136
137-lib_LIBRARIES = libomapi.a 137-lib_LIBRARIES = libomapi.a
@@ -151,11 +151,11 @@ index e4a8599..c0c7a1e 100644
151- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a 151- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
152+svtest_LDADD = libomapi.la -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc 152+svtest_LDADD = libomapi.la -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc
153 153
154diff --git a/relay/Makefile.am b/relay/Makefile.am 154Index: dhcp-4.3.6/relay/Makefile.am
155index b3bf578..f47009f 100644 155===================================================================
156--- a/relay/Makefile.am 156--- dhcp-4.3.6.orig/relay/Makefile.am
157+++ b/relay/Makefile.am 157+++ dhcp-4.3.6/relay/Makefile.am
158@@ -4,9 +4,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 158@@ -4,9 +4,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
159 159
160 sbin_PROGRAMS = dhcrelay 160 sbin_PROGRAMS = dhcrelay
161 dhcrelay_SOURCES = dhcrelay.c 161 dhcrelay_SOURCES = dhcrelay.c
@@ -167,11 +167,11 @@ index b3bf578..f47009f 100644
167 man_MANS = dhcrelay.8 167 man_MANS = dhcrelay.8
168 EXTRA_DIST = $(man_MANS) 168 EXTRA_DIST = $(man_MANS)
169 169
170diff --git a/server/Makefile.am b/server/Makefile.am 170Index: dhcp-4.3.6/server/Makefile.am
171index b5d8c2d..d7f876d 100644 171===================================================================
172--- a/server/Makefile.am 172--- dhcp-4.3.6.orig/server/Makefile.am
173+++ b/server/Makefile.am 173+++ dhcp-4.3.6/server/Makefile.am
174@@ -15,10 +15,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ 174@@ -15,10 +15,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
175 dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c 175 dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
176 176
177 dhcpd_CFLAGS = $(LDAP_CFLAGS) 177 dhcpd_CFLAGS = $(LDAP_CFLAGS)
@@ -185,11 +185,11 @@ index b5d8c2d..d7f876d 100644
185 185
186 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 186 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
187 EXTRA_DIST = $(man_MANS) 187 EXTRA_DIST = $(man_MANS)
188diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am 188Index: dhcp-4.3.6/server/tests/Makefile.am
189index 9821081..de95872 100644 189===================================================================
190--- a/server/tests/Makefile.am 190--- dhcp-4.3.6.orig/server/tests/Makefile.am
191+++ b/server/tests/Makefile.am 191+++ dhcp-4.3.6/server/tests/Makefile.am
192@@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ 192@@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
193 ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ 193 ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \
194 ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c 194 ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
195 195
@@ -203,6 +203,3 @@ index 9821081..de95872 100644
203 203
204 ATF_TESTS = 204 ATF_TESTS =
205 if HAVE_ATF 205 if HAVE_ATF
206--
2071.8.3.1
208
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
index cc135493e5..8b30579e2e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
@@ -7,7 +7,6 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
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 \ 8 file://0006-site.h-enable-gentle-shutdown.patch \
9 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \ 9 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
10 file://0008-tweak-to-support-external-bind.patch \
11 file://0009-remove-dhclient-script-bash-dependency.patch \ 10 file://0009-remove-dhclient-script-bash-dependency.patch \
12 file://0010-build-shared-libs.patch \ 11 file://0010-build-shared-libs.patch \
13 file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \ 12 file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
@@ -15,8 +14,22 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
15 file://CVE-2017-3144.patch \ 14 file://CVE-2017-3144.patch \
16 " 15 "
17 16
17# use internal libisc libraries which are based on bind 9.9.11 - there
18# is a bug in bind 9.10.x (normally supplied by OE) that prevents
19# dhcpd/dhclient from shutting down cleanly on sigterm and from running
20# in the background
21#
22# [https://bugzilla.yoctoproject.org/show_bug.cgi?id=12744]
23#
24# remove "ext-bind" and
25# also set PARALLEL_MAKE = ""
26# [ Yocto 12744 ]
27#
28SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ext-bind', 'file://0008-tweak-to-support-external-bind.patch', '', d)}"
29
18SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc" 30SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc"
19SRC_URI[sha256sum] = "a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b" 31SRC_URI[sha256sum] = "a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b"
20 32
21PACKAGECONFIG ?= "" 33PACKAGECONFIG ?= "ext-bind"
22PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2" 34PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
35PACKAGECONFIG[ext-bind] = "--with-libbind=${STAGING_LIBDIR}, --without-libbind, bind"