summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2015-01-12 13:32:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:30 +0000
commitbee37d495d4fca352e832b65fb9d69f17abf944c (patch)
tree3e29f479fd0fce7a47b6754e18e292e2e324742d
parent02ee240db386f27928d2a12ba96bc1756459a096 (diff)
downloadpoky-bee37d495d4fca352e832b65fb9d69f17abf944c.tar.gz
dhcp: upgrade to 4.3.1
Rebase fixsepbuild.patch to 4.3.1 (From OE-Core rev: 580c2398cb6c84d89badc22fd9f5453b74d73a79) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch112
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb (renamed from meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb)4
2 files changed, 67 insertions, 49 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
index e686afd2d2..14e75a37ea 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
@@ -4,47 +4,32 @@ Upstream-Status: Pending
4 4
5RP 2013/03/21 5RP 2013/03/21
6 6
7Index: dhcp-4.2.5/common/Makefile.am 7Rebase to 4.3.1
8=================================================================== 8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000 9---
10+++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000 10 client/Makefile.am | 6 ++++--
11@@ -1,4 +1,4 @@ 11 common/Makefile.am | 2 +-
12-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' 12 dhcpctl/Makefile.am | 2 ++
13+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' 13 dst/Makefile.am | 2 +-
14 AM_CFLAGS = $(LDAP_CFLAGS) 14 omapip/Makefile.am | 2 ++
15 15 relay/Makefile.am | 2 +-
16 noinst_LIBRARIES = libdhcp.a 16 server/Makefile.am | 2 +-
17Index: dhcp-4.2.5/dst/Makefile.am 17 7 files changed, 12 insertions(+), 6 deletions(-)
18=================================================================== 18
19--- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000 19diff --git a/client/Makefile.am b/client/Makefile.am
20+++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000 20index 8411960..1740f72 100644
21@@ -1,4 +1,4 @@ 21--- a/client/Makefile.am
22-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 22+++ b/client/Makefile.am
23+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes 23@@ -4,6 +4,8 @@
24 24 # production code. Sadly, we are not there yet.
25 lib_LIBRARIES = libdst.a 25 SUBDIRS = . tests
26
27Index: dhcp-4.2.5/omapip/Makefile.am
28===================================================================
29--- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000
30+++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000
31@@ -1,3 +1,5 @@
32+AM_CPPFLAGS = -I$(top_srcdir)/includes
33+
34 lib_LIBRARIES = libomapi.a
35 noinst_PROGRAMS = svtest
36 26
37Index: dhcp-4.2.5/client/Makefile.am
38===================================================================
39--- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000
40+++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000
41@@ -1,3 +1,5 @@
42+AM_CPPFLAGS = -I$(top_srcdir)/includes 27+AM_CPPFLAGS = -I$(top_srcdir)/includes
43+ 28+
44 dist_sysconf_DATA = dhclient.conf.example 29 dist_sysconf_DATA = dhclient.conf.example
45 sbin_PROGRAMS = dhclient 30 sbin_PROGRAMS = dhclient
46 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ 31 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
47@@ -11,8 +13,8 @@ 32@@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS)
48 33
49 dhclient.o: dhclient.c 34 dhclient.o: dhclient.c
50 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ 35 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
@@ -55,30 +40,60 @@ Index: dhcp-4.2.5/client/Makefile.am
55 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ 40 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
56- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c 41- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
57+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c 42+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c
58Index: dhcp-4.2.5/dhcpctl/Makefile.am 43diff --git a/common/Makefile.am b/common/Makefile.am
59=================================================================== 44index eddef05..5ce045f 100644
60--- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000 45--- a/common/Makefile.am
61+++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000 46+++ b/common/Makefile.am
47@@ -1,4 +1,4 @@
48-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
49+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
50 AM_CFLAGS = $(LDAP_CFLAGS)
51
52 noinst_LIBRARIES = libdhcp.a
53diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
54index 2987a53..cd72d75 100644
55--- a/dhcpctl/Makefile.am
56+++ b/dhcpctl/Makefile.am
62@@ -1,3 +1,5 @@ 57@@ -1,3 +1,5 @@
63+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) 58+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
64+ 59+
65 bin_PROGRAMS = omshell 60 bin_PROGRAMS = omshell
66 lib_LIBRARIES = libdhcpctl.a 61 lib_LIBRARIES = libdhcpctl.a
67 noinst_PROGRAMS = cltest 62 noinst_PROGRAMS = cltest
68Index: dhcp-4.2.5/relay/Makefile.am 63diff --git a/dst/Makefile.am b/dst/Makefile.am
69=================================================================== 64index 8937fe8..a14798b 100644
70--- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000 65--- a/dst/Makefile.am
71+++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000 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
74index 5074479..9c0fab3 100644
75--- a/omapip/Makefile.am
76+++ b/omapip/Makefile.am
77@@ -1,3 +1,5 @@
78+AM_CPPFLAGS = -I$(top_srcdir)/includes
79+
80 lib_LIBRARIES = libomapi.a
81 noinst_PROGRAMS = svtest
82
83diff --git a/relay/Makefile.am b/relay/Makefile.am
84index ec72a31..f842071 100644
85--- a/relay/Makefile.am
86+++ b/relay/Makefile.am
72@@ -1,4 +1,4 @@ 87@@ -1,4 +1,4 @@
73-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' 88-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
74+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 89+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
75 90
76 sbin_PROGRAMS = dhcrelay 91 sbin_PROGRAMS = dhcrelay
77 dhcrelay_SOURCES = dhcrelay.c 92 dhcrelay_SOURCES = dhcrelay.c
78Index: dhcp-4.2.5/server/Makefile.am 93diff --git a/server/Makefile.am b/server/Makefile.am
79=================================================================== 94index a446f0b..d0b873a 100644
80--- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000 95--- a/server/Makefile.am
81+++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000 96+++ b/server/Makefile.am
82@@ -4,7 +4,7 @@ 97@@ -4,7 +4,7 @@
83 # production code. Sadly, we are not there yet. 98 # production code. Sadly, we are not there yet.
84 SUBDIRS = . tests 99 SUBDIRS = . tests
@@ -88,3 +103,6 @@ Index: dhcp-4.2.5/server/Makefile.am
88 103
89 dist_sysconf_DATA = dhcpd.conf.example 104 dist_sysconf_DATA = dhcpd.conf.example
90 sbin_PROGRAMS = dhcpd 105 sbin_PROGRAMS = dhcpd
106--
1071.9.1
108
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
index 13bcceb5a8..3f82a25fd2 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.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] = "1020d77e1a4c1f01b76279caff9beb80" 11SRC_URI[md5sum] = "b3a42ece3c7f2cd2e74a3e12ca881d20"
12SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a" 12SRC_URI[sha256sum] = "266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-02 00:08:39 +0000