diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2016-01-11 08:30:31 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:54:48 +0000 |
commit | 38901a79ac0540b3177b6f9304c37a5e75fea7e7 (patch) | |
tree | c1d07d25f8a3d162a01364306619dbded924da90 /meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch | |
parent | ea05e05826b025755855f0ccd792313431324d70 (diff) | |
download | poky-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/dhcp/dhcp/fixsepbuild.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch | 19 |
1 files changed, 0 insertions, 19 deletions
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 | |||
7 | Rebase to 4.3.1 | 7 | Rebase to 4.3.1 |
8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 8 | Signed-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 | |||
19 | diff --git a/client/Makefile.am b/client/Makefile.am | 10 | diff --git a/client/Makefile.am b/client/Makefile.am |
20 | index 8411960..1740f72 100644 | 11 | index 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 |
63 | diff --git a/dst/Makefile.am b/dst/Makefile.am | ||
64 | index 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 | |||
73 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am | 54 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
74 | index 5074479..9c0fab3 100644 | 55 | index 5074479..9c0fab3 100644 |
75 | --- a/omapip/Makefile.am | 56 | --- a/omapip/Makefile.am |