summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc2
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch115
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb (renamed from meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb)6
3 files changed, 65 insertions, 58 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index ad82b57669..512127cd4c 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -8,7 +8,7 @@ easier to administer devices."
8HOMEPAGE = "http://www.isc.org/" 8HOMEPAGE = "http://www.isc.org/"
9 9
10LICENSE = "ISC" 10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74" 11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
12 12
13DEPENDS = "openssl bind" 13DEPENDS = "openssl bind"
14 14
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
index 4f11655812..a291fdaf52 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
@@ -6,37 +6,39 @@ this patch is to allow building with external bind
6 6
7Signed-off-by: Qing He <qing.he@intel.com> 7Signed-off-by: Qing He <qing.he@intel.com>
8 8
9diff --git a/Makefile.am b/Makefile.am 9Index: dhcp-4.3.0/Makefile.am
10index 928d926..cd17af8 100644 10===================================================================
11--- a/Makefile.am 11--- dhcp-4.3.0.orig/Makefile.am
12+++ b/Makefile.am 12+++ dhcp-4.3.0/Makefile.am
13@@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \ 13@@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \
14 util/bindvar.sh \ 14 bind/Makefile bind/bind.tar.gz bind/version.tmp \
15 bind/Makefile bind/bind.tar.gz bind/version.tmp 15 common/tests/Atffile server/tests/Atffile
16 16
17-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server 17-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
18+SUBDIRS = includes tests common dst omapip client dhcpctl relay server 18+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
19 19
20 nobase_include_HEADERS = dhcpctl/dhcpctl.h 20 nobase_include_HEADERS = dhcpctl/dhcpctl.h
21 21
22diff --git a/client/Makefile.am b/client/Makefile.am 22Index: dhcp-4.3.0/client/Makefile.am
23index 77ed055..5a77f2d 100644 23===================================================================
24--- a/client/Makefile.am 24--- dhcp-4.3.0.orig/client/Makefile.am
25+++ b/client/Makefile.am 25+++ dhcp-4.3.0/client/Makefile.am
26@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ 26@@ -4,8 +4,8 @@ dhclient_SOURCES = clparse.c dhclient.c
27 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
27 scripts/netbsd scripts/nextstep scripts/openbsd \ 28 scripts/netbsd scripts/nextstep scripts/openbsd \
28 scripts/solaris scripts/openwrt 29 scripts/solaris scripts/openwrt
29 dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ 30-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
30- ../bind/lib/libdns.a ../bind/lib/libisc.a 31- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
31+ $(libbind)/libdns.a $(libbind)/libisc.a 32+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \
33+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
32 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 34 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
33 EXTRA_DIST = $(man_MANS) 35 EXTRA_DIST = $(man_MANS)
34 36
35diff --git a/configure.ac b/configure.ac 37Index: dhcp-4.3.0/configure.ac
36index ff832aa..60d342c 100644 38===================================================================
37--- a/configure.ac 39--- dhcp-4.3.0.orig/configure.ac
38+++ b/configure.ac 40+++ dhcp-4.3.0/configure.ac
39@@ -500,6 +500,7 @@ no) 41@@ -566,6 +566,7 @@ no)
40 libbind="$use_libbind" 42 libbind="$use_libbind"
41 ;; 43 ;;
42 esac 44 esac
@@ -44,60 +46,67 @@ index ff832aa..60d342c 100644
44 46
45 # OpenLDAP support. 47 # OpenLDAP support.
46 AC_ARG_WITH(ldap, 48 AC_ARG_WITH(ldap,
47diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am 49Index: dhcp-4.3.0/dhcpctl/Makefile.am
48index 61049be..85aefa3 100644 50===================================================================
49--- a/dhcpctl/Makefile.am 51--- dhcp-4.3.0.orig/dhcpctl/Makefile.am
50+++ b/dhcpctl/Makefile.am 52+++ dhcp-4.3.0/dhcpctl/Makefile.am
51@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS) 53@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS)
52 54
53 omshell_SOURCES = omshell.c 55 omshell_SOURCES = omshell.c
54 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ 56 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
55- ../bind/lib/libdns.a ../bind/lib/libisc.a 57- ../bind/lib/libirs.a ../bind/lib/libdns.a \
56+ $(libbind)/libdns.a $(libbind)/libisc.a 58- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
59+ $(libbind)/libirs.a $(libbind)/libdns.a \
60+ $(libbind)/libisccfg.a $(libbind)/libisc.a
57 61
58 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c 62 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
59 63
60 cltest_SOURCES = cltest.c 64 cltest_SOURCES = cltest.c
61 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ 65 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
62- ../bind/lib/libdns.a ../bind/lib/libisc.a 66- ../bind/lib/libirs.a ../bind/lib/libdns.a \
63\ No newline at end of file 67- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
64+ $(libbind)/libdns.a $(libbind)/libisc.a 68+ $(libbind)/libirs.a $(libbind)/libdns.a \
65diff --git a/omapip/Makefile.am b/omapip/Makefile.am 69+ $(libbind)/libisccfg.a $(libbind)/libisc.a
66index 595950a..17f2233 100644 70Index: dhcp-4.3.0/omapip/Makefile.am
67--- a/omapip/Makefile.am 71===================================================================
68+++ b/omapip/Makefile.am 72--- dhcp-4.3.0.orig/omapip/Makefile.am
69@@ -10,5 +10,5 @@ man_MANS = omapi.3 73+++ dhcp-4.3.0/omapip/Makefile.am
74@@ -10,6 +10,6 @@ man_MANS = omapi.3
70 EXTRA_DIST = $(man_MANS) 75 EXTRA_DIST = $(man_MANS)
71 76
72 svtest_SOURCES = test.c 77 svtest_SOURCES = test.c
73-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a 78-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
74+svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a 79- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
80+svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \
81+ $(libbind)/libisccfg.a $(libbind)/libisc.a
75 82
76diff --git a/relay/Makefile.am b/relay/Makefile.am 83Index: dhcp-4.3.0/relay/Makefile.am
77index d8757ca..a7885da 100644 84===================================================================
78--- a/relay/Makefile.am 85--- dhcp-4.3.0.orig/relay/Makefile.am
79+++ b/relay/Makefile.am 86+++ dhcp-4.3.0/relay/Makefile.am
80@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' 87@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
81 sbin_PROGRAMS = dhcrelay 88 sbin_PROGRAMS = dhcrelay
82 dhcrelay_SOURCES = dhcrelay.c 89 dhcrelay_SOURCES = dhcrelay.c
83 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ 90 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
84- ../bind/lib/libdns.a ../bind/lib/libisc.a 91- ../bind/lib/libirs.a ../bind/lib/libdns.a \
85+ $(libbind)/libdns.a $(libbind)/libisc.a 92- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
93+ $(libbind)/libirs.a $(libbind)/libdns.a \
94+ $(libbind)/libisccfg.a $(libbind)/libisc.a
86 man_MANS = dhcrelay.8 95 man_MANS = dhcrelay.8
87 EXTRA_DIST = $(man_MANS) 96 EXTRA_DIST = $(man_MANS)
88 97
89diff --git a/server/Makefile.am b/server/Makefile.am 98Index: dhcp-4.3.0/server/Makefile.am
90index cdfaf47..d2c254b 100644 99===================================================================
91--- a/server/Makefile.am 100--- dhcp-4.3.0.orig/server/Makefile.am
92+++ b/server/Makefile.am 101+++ dhcp-4.3.0/server/Makefile.am
93@@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ 102@@ -14,8 +14,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
94 103
95 dhcpd_CFLAGS = $(LDAP_CFLAGS) 104 dhcpd_CFLAGS = $(LDAP_CFLAGS)
96 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ 105 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
97- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ 106- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
98- ../bind/lib/libisc.a 107- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
99+ ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \ 108+ ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \
100+ $(libbind)/libisc.a 109+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
101 110
102 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 111 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
103 EXTRA_DIST = $(man_MANS) 112 EXTRA_DIST = $(man_MANS)
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
index 77cdb4e813..6da28faf50 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
@@ -1,7 +1,5 @@
1require dhcp.inc 1require dhcp.inc
2 2
3PR = "r4"
4
5SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 3SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
6 file://fix-external-bind.patch \ 4 file://fix-external-bind.patch \
7 file://link-with-lcrypto.patch \ 5 file://link-with-lcrypto.patch \
@@ -9,5 +7,5 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
9 file://dhclient-script-drop-resolv.conf.dhclient.patch \ 7 file://dhclient-script-drop-resolv.conf.dhclient.patch \
10 " 8 "
11 9
12SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93" 10SRC_URI[md5sum] = "1020d77e1a4c1f01b76279caff9beb80"
13SRC_URI[sha256sum] = "59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250" 11SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a"