summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch69
1 files changed, 33 insertions, 36 deletions
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