summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-16 04:31:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commita02826add027f71d1fca56547b2b72db28b1005f (patch)
treef42f5c26ea1ee6f5c67a79e08184df197bb4db71 /meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
parent5552c856a7dc05cb9ef5da8c0cdac63bbef4e8de (diff)
downloadpoky-a02826add027f71d1fca56547b2b72db28b1005f.tar.gz
dhcp: 4.3.5 -> 4.3.6
1. Rebase patches to 4.3.6 - define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch -> 0001 - dhcp-3.0.3-dhclient-dbus.patch -> 0002 - link-with-lcrypto.patch -> 0003 - fixsepbuild.patch -> 0004 - dhclient-script-drop-resolv.conf.dhclient.patch -> 0005 - 0001-site.h-enable-gentle-shutdown.patch -> 0006 - libxml2-configure-argument.patch -> 0007 - tweak-to-support-external-bind.patch -> 0008 - remove-dhclient-script-bash-dependency.patch -> 0009 - build-shared-libs.patch -> 0010 - Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch -> 0011 2. Drop search-for-libxml2.patch It is overrided by libxml2-configure-argument.patch 3. Rework dhclient-script-drop-resolv.conf.dhclient.patch and Drop replace-ifconfig-route.patch. vim client/scripts/linux ... Script refresh in 2017. The aliasing code was too convoluted and needs to go away. Migrated DHCPv4 script to ip command from iproute2 suite. This is based on Debian script with some tweaks. ifconfig is no longer used. Everything is done using ip tool from ip-route2. ... (From OE-Core rev: 77878d2e6e8f36afa9a0fde8a6f0f955c84a5e5c) 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/0004-Fix-out-of-tree-builds.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch100
1 files changed, 100 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
new file mode 100644
index 0000000000..7d1d867986
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
@@ -0,0 +1,100 @@
1From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 15:08:22 +0800
4Subject: [PATCH 04/11] Fix out of tree builds
5
6Upstream-Status: Pending
7
8RP 2013/03/21
9
10Rebase to 4.3.6
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 client/Makefile.am | 4 ++--
15 common/Makefile.am | 3 ++-
16 dhcpctl/Makefile.am | 2 ++
17 omapip/Makefile.am | 1 +
18 relay/Makefile.am | 2 +-
19 server/Makefile.am | 2 +-
20 6 files changed, 9 insertions(+), 5 deletions(-)
21
22diff --git a/client/Makefile.am b/client/Makefile.am
23index 2cb83d8..4730bb3 100644
24--- a/client/Makefile.am
25+++ b/client/Makefile.am
26@@ -7,11 +7,11 @@ SUBDIRS = . tests
27 BINDLIBDIR = @BINDDIR@/lib
28
29 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
30- -DLOCALSTATEDIR='"$(localstatedir)"'
31+ -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
32
33 dist_sysconf_DATA = dhclient.conf.example
34 sbin_PROGRAMS = dhclient
35-dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
36+dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \
37 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
38 scripts/netbsd scripts/nextstep scripts/openbsd \
39 scripts/solaris scripts/openwrt
40diff --git a/common/Makefile.am b/common/Makefile.am
41index 113aee8..0f24fbb 100644
42--- a/common/Makefile.am
43+++ b/common/Makefile.am
44@@ -1,4 +1,5 @@
45-AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
46+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
47+
48 AM_CFLAGS = $(LDAP_CFLAGS)
49
50 noinst_LIBRARIES = libdhcp.a
51diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
52index ceb0de1..ba8dd8b 100644
53--- a/dhcpctl/Makefile.am
54+++ b/dhcpctl/Makefile.am
55@@ -1,5 +1,7 @@
56 BINDLIBDIR = @BINDDIR@/lib
57
58+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
59+
60 bin_PROGRAMS = omshell
61 lib_LIBRARIES = libdhcpctl.a
62 noinst_PROGRAMS = cltest
63diff --git a/omapip/Makefile.am b/omapip/Makefile.am
64index 446a594..dd1afa0 100644
65--- a/omapip/Makefile.am
66+++ b/omapip/Makefile.am
67@@ -1,4 +1,5 @@
68 BINDLIBDIR = @BINDDIR@/lib
69+AM_CPPFLAGS = -I$(top_srcdir)/includes
70
71 lib_LIBRARIES = libomapi.a
72 noinst_PROGRAMS = svtest
73diff --git a/relay/Makefile.am b/relay/Makefile.am
74index 3060eca..6d652f6 100644
75--- a/relay/Makefile.am
76+++ b/relay/Makefile.am
77@@ -1,6 +1,6 @@
78 BINDLIBDIR = @BINDDIR@/lib
79
80-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
81+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
82
83 sbin_PROGRAMS = dhcrelay
84 dhcrelay_SOURCES = dhcrelay.c
85diff --git a/server/Makefile.am b/server/Makefile.am
86index 54feedf..3990b9c 100644
87--- a/server/Makefile.am
88+++ b/server/Makefile.am
89@@ -6,7 +6,7 @@ SUBDIRS = . tests
90
91 BINDLIBDIR = @BINDDIR@/lib
92
93-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
94+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
95
96 dist_sysconf_DATA = dhcpd.conf.example
97 sbin_PROGRAMS = dhcpd
98--
991.8.3.1
100