summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-01-11 08:30:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:54:48 +0000
commit38901a79ac0540b3177b6f9304c37a5e75fea7e7 (patch)
treec1d07d25f8a3d162a01364306619dbded924da90 /meta/recipes-connectivity
parentea05e05826b025755855f0ccd792313431324d70 (diff)
downloadpoky-38901a79ac0540b3177b6f9304c37a5e75fea7e7.tar.gz
dhcp: 4.3.2 -> 4.3.3
- Rebase: fix-external-bind.patch and fixsepbuild.patch for 4.3.3 (From OE-Core rev: 5e6c27c1860a0610b6d11468ffc7283ee0fc869c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch79
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch19
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb (renamed from meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb)4
3 files changed, 43 insertions, 59 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
index a291fdaf52..956c5d8b58 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
@@ -6,24 +6,25 @@ 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
9Index: dhcp-4.3.0/Makefile.am 9Rebase the patch to 4.3.3
10=================================================================== 10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11--- dhcp-4.3.0.orig/Makefile.am 11---
12+++ dhcp-4.3.0/Makefile.am 12diff --git a/Makefile.am b/Makefile.am
13--- a/Makefile.am
14+++ b/Makefile.am
13@@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \ 15@@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \
14 bind/Makefile bind/bind.tar.gz bind/version.tmp \ 16 bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
15 common/tests/Atffile server/tests/Atffile 17 common/tests/Atffile server/tests/Atffile
16 18
17-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server 19-SUBDIRS = bind includes tests common omapip client dhcpctl relay server
18+SUBDIRS = includes tests common dst omapip client dhcpctl relay server 20+SUBDIRS = includes tests common omapip client dhcpctl relay server
19 21
20 nobase_include_HEADERS = dhcpctl/dhcpctl.h 22 nobase_include_HEADERS = dhcpctl/dhcpctl.h
21 23
22Index: dhcp-4.3.0/client/Makefile.am 24diff --git a/client/Makefile.am b/client/Makefile.am
23=================================================================== 25--- a/client/Makefile.am
24--- dhcp-4.3.0.orig/client/Makefile.am 26+++ b/client/Makefile.am
25+++ dhcp-4.3.0/client/Makefile.am 27@@ -10,8 +10,8 @@ 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 \ 28 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
28 scripts/netbsd scripts/nextstep scripts/openbsd \ 29 scripts/netbsd scripts/nextstep scripts/openbsd \
29 scripts/solaris scripts/openwrt 30 scripts/solaris scripts/openwrt
@@ -34,22 +35,20 @@ Index: dhcp-4.3.0/client/Makefile.am
34 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 35 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
35 EXTRA_DIST = $(man_MANS) 36 EXTRA_DIST = $(man_MANS)
36 37
37Index: dhcp-4.3.0/configure.ac 38diff --git a/configure.ac b/configure.ac
38=================================================================== 39--- a/configure.ac
39--- dhcp-4.3.0.orig/configure.ac 40+++ b/configure.ac
40+++ dhcp-4.3.0/configure.ac 41@@ -623,6 +623,7 @@ no)
41@@ -566,6 +566,7 @@ no) 42 fi
42 libbind="$use_libbind"
43 ;; 43 ;;
44 esac 44 esac
45+AC_SUBST([libbind]) 45+AC_SUBST([libbind])
46 46
47 # OpenLDAP support. 47 # OpenLDAP support.
48 AC_ARG_WITH(ldap, 48 AC_ARG_WITH(ldap,
49Index: dhcp-4.3.0/dhcpctl/Makefile.am 49diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
50=================================================================== 50--- a/dhcpctl/Makefile.am
51--- dhcp-4.3.0.orig/dhcpctl/Makefile.am 51+++ b/dhcpctl/Makefile.am
52+++ dhcp-4.3.0/dhcpctl/Makefile.am
53@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS) 52@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS)
54 53
55 omshell_SOURCES = omshell.c 54 omshell_SOURCES = omshell.c
@@ -67,10 +66,9 @@ Index: dhcp-4.3.0/dhcpctl/Makefile.am
67- ../bind/lib/libisccfg.a ../bind/lib/libisc.a 66- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
68+ $(libbind)/libirs.a $(libbind)/libdns.a \ 67+ $(libbind)/libirs.a $(libbind)/libdns.a \
69+ $(libbind)/libisccfg.a $(libbind)/libisc.a 68+ $(libbind)/libisccfg.a $(libbind)/libisc.a
70Index: dhcp-4.3.0/omapip/Makefile.am 69diff --git a/omapip/Makefile.am b/omapip/Makefile.am
71=================================================================== 70--- a/omapip/Makefile.am
72--- dhcp-4.3.0.orig/omapip/Makefile.am 71+++ b/omapip/Makefile.am
73+++ dhcp-4.3.0/omapip/Makefile.am
74@@ -10,6 +10,6 @@ man_MANS = omapi.3 72@@ -10,6 +10,6 @@ man_MANS = omapi.3
75 EXTRA_DIST = $(man_MANS) 73 EXTRA_DIST = $(man_MANS)
76 74
@@ -80,11 +78,10 @@ Index: dhcp-4.3.0/omapip/Makefile.am
80+svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \ 78+svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \
81+ $(libbind)/libisccfg.a $(libbind)/libisc.a 79+ $(libbind)/libisccfg.a $(libbind)/libisc.a
82 80
83Index: dhcp-4.3.0/relay/Makefile.am 81diff --git a/relay/Makefile.am b/relay/Makefile.am
84=================================================================== 82--- a/relay/Makefile.am
85--- dhcp-4.3.0.orig/relay/Makefile.am 83+++ b/relay/Makefile.am
86+++ dhcp-4.3.0/relay/Makefile.am 84@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
87@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
88 sbin_PROGRAMS = dhcrelay 85 sbin_PROGRAMS = dhcrelay
89 dhcrelay_SOURCES = dhcrelay.c 86 dhcrelay_SOURCES = dhcrelay.c
90 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ 87 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
@@ -95,18 +92,24 @@ Index: dhcp-4.3.0/relay/Makefile.am
95 man_MANS = dhcrelay.8 92 man_MANS = dhcrelay.8
96 EXTRA_DIST = $(man_MANS) 93 EXTRA_DIST = $(man_MANS)
97 94
98Index: dhcp-4.3.0/server/Makefile.am 95diff --git a/server/Makefile.am b/server/Makefile.am
99=================================================================== 96--- a/server/Makefile.am
100--- dhcp-4.3.0.orig/server/Makefile.am 97+++ b/server/Makefile.am
101+++ dhcp-4.3.0/server/Makefile.am 98@@ -14,10 +14,12 @@ 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
103 99
104 dhcpd_CFLAGS = $(LDAP_CFLAGS) 100 dhcpd_CFLAGS = $(LDAP_CFLAGS)
105 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ 101 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
106- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \ 102- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
107- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a 103- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a \
108+ ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \ 104+ ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \
109+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a 105+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a \
106 $(LDAP_LIBS)
110 107
108+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
109+
111 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 110 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
112 EXTRA_DIST = $(man_MANS) 111 EXTRA_DIST = $(man_MANS)
112
113--
1141.9.1
115
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
index 14e75a37ea..b3f8fdb0a1 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
@@ -7,15 +7,6 @@ RP 2013/03/21
7Rebase to 4.3.1 7Rebase to 4.3.1
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- 9---
10 client/Makefile.am | 6 ++++--
11 common/Makefile.am | 2 +-
12 dhcpctl/Makefile.am | 2 ++
13 dst/Makefile.am | 2 +-
14 omapip/Makefile.am | 2 ++
15 relay/Makefile.am | 2 +-
16 server/Makefile.am | 2 +-
17 7 files changed, 12 insertions(+), 6 deletions(-)
18
19diff --git a/client/Makefile.am b/client/Makefile.am 10diff --git a/client/Makefile.am b/client/Makefile.am
20index 8411960..1740f72 100644 11index 8411960..1740f72 100644
21--- a/client/Makefile.am 12--- a/client/Makefile.am
@@ -60,16 +51,6 @@ index 2987a53..cd72d75 100644
60 bin_PROGRAMS = omshell 51 bin_PROGRAMS = omshell
61 lib_LIBRARIES = libdhcpctl.a 52 lib_LIBRARIES = libdhcpctl.a
62 noinst_PROGRAMS = cltest 53 noinst_PROGRAMS = cltest
63diff --git a/dst/Makefile.am b/dst/Makefile.am
64index 8937fe8..a14798b 100644
65--- a/dst/Makefile.am
66+++ b/dst/Makefile.am
67@@ -1,4 +1,4 @@
68-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
69+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
70
71 lib_LIBRARIES = libdst.a
72
73diff --git a/omapip/Makefile.am b/omapip/Makefile.am 54diff --git a/omapip/Makefile.am b/omapip/Makefile.am
74index 5074479..9c0fab3 100644 55index 5074479..9c0fab3 100644
75--- a/omapip/Makefile.am 56--- a/omapip/Makefile.am
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
index b4a05fcd9d..6fcdddcf89 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
@@ -8,5 +8,5 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
8 file://replace-ifconfig-route.patch \ 8 file://replace-ifconfig-route.patch \
9 " 9 "
10 10
11SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67" 11SRC_URI[md5sum] = "c5577b09c9017cdd319a11ff6364268e"
12SRC_URI[sha256sum] = "6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165" 12SRC_URI[sha256sum] = "553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede"