diff options
author | akuster <akuster808@gmail.com> | 2020-09-01 08:22:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:46 +0100 |
commit | 8d7db36ecb19cb775ecc8d0522ded3e55b53c820 (patch) | |
tree | 24f55c645f353175b09f298933ce3d72b85a7fc1 /meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | |
parent | 6d60518854c5aab7f58bd9f010d8868d5820bb25 (diff) | |
download | poky-8d7db36ecb19cb775ecc8d0522ded3e55b53c820.tar.gz |
dhcp: remove from core
update maintainers.inc too
(From OE-Core rev: 7e3357892f204788162747e907d68f857118cf42)
Signed-off-by: Armin Kuster <akuster808@gmail.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.patch | 95 |
1 files changed, 0 insertions, 95 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 deleted file mode 100644 index 7b57730ffb..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 15:08:22 +0800 | ||
4 | Subject: [PATCH 04/11] Fix out of tree builds | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | RP 2013/03/21 | ||
9 | |||
10 | Rebase to 4.3.6 | ||
11 | |||
12 | Signed-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 | |||
22 | Index: dhcp-4.4.1/common/Makefile.am | ||
23 | =================================================================== | ||
24 | --- dhcp-4.4.1.orig/common/Makefile.am | ||
25 | +++ dhcp-4.4.1/common/Makefile.am | ||
26 | @@ -1,4 +1,5 @@ | ||
27 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | ||
28 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | ||
29 | + | ||
30 | AM_CFLAGS = $(LDAP_CFLAGS) | ||
31 | |||
32 | lib_LIBRARIES = libdhcp.a | ||
33 | Index: dhcp-4.4.1/dhcpctl/Makefile.am | ||
34 | =================================================================== | ||
35 | --- dhcp-4.4.1.orig/dhcpctl/Makefile.am | ||
36 | +++ dhcp-4.4.1/dhcpctl/Makefile.am | ||
37 | @@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@ | ||
38 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ | ||
39 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
40 | |||
41 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) | ||
42 | + | ||
43 | bin_PROGRAMS = omshell | ||
44 | lib_LIBRARIES = libdhcpctl.a | ||
45 | noinst_PROGRAMS = cltest | ||
46 | Index: dhcp-4.4.1/server/Makefile.am | ||
47 | =================================================================== | ||
48 | --- dhcp-4.4.1.orig/server/Makefile.am | ||
49 | +++ dhcp-4.4.1/server/Makefile.am | ||
50 | @@ -4,7 +4,7 @@ | ||
51 | # production code. Sadly, we are not there yet. | ||
52 | SUBDIRS = . tests | ||
53 | |||
54 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
55 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
56 | |||
57 | dist_sysconf_DATA = dhcpd.conf.example | ||
58 | sbin_PROGRAMS = dhcpd | ||
59 | Index: dhcp-4.4.1/client/Makefile.am | ||
60 | =================================================================== | ||
61 | --- dhcp-4.4.1.orig/client/Makefile.am | ||
62 | +++ dhcp-4.4.1/client/Makefile.am | ||
63 | @@ -5,7 +5,7 @@ | ||
64 | SUBDIRS = . tests | ||
65 | |||
66 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' | ||
67 | -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' | ||
68 | +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes | ||
69 | |||
70 | dist_sysconf_DATA = dhclient.conf.example | ||
71 | sbin_PROGRAMS = dhclient | ||
72 | Index: dhcp-4.4.1/omapip/Makefile.am | ||
73 | =================================================================== | ||
74 | --- dhcp-4.4.1.orig/omapip/Makefile.am | ||
75 | +++ dhcp-4.4.1/omapip/Makefile.am | ||
76 | @@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@ | ||
77 | BINDLIBDNSDIR=@BINDLIBDNSDIR@ | ||
78 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ | ||
79 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
80 | +AM_CPPFLAGS = -I$(top_srcdir)/includes | ||
81 | |||
82 | lib_LIBRARIES = libomapi.a | ||
83 | noinst_PROGRAMS = svtest | ||
84 | Index: dhcp-4.4.1/relay/Makefile.am | ||
85 | =================================================================== | ||
86 | --- dhcp-4.4.1.orig/relay/Makefile.am | ||
87 | +++ dhcp-4.4.1/relay/Makefile.am | ||
88 | @@ -1,6 +1,6 @@ | ||
89 | SUBDIRS = . tests | ||
90 | |||
91 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' | ||
92 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
93 | |||
94 | sbin_PROGRAMS = dhcrelay | ||
95 | dhcrelay_SOURCES = dhcrelay.c | ||