summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorKevin Strasser <kevin.strasser@linux.intel.com>2013-06-12 10:40:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-17 16:45:35 +0100
commitcb16810c714d5de6b1964e0ded7168e9f2e7c00a (patch)
treeacf4a3ad9d7075887d095034fc6f55aedd03aa94 /meta/recipes-connectivity/dhcp
parent64ae5444e5db776f28e06c458e7d6db7c3529e94 (diff)
downloadpoky-cb16810c714d5de6b1964e0ded7168e9f2e7c00a.tar.gz
dhcp: drop fixincludes.patch
Recent versions of dhcp have swapped out use of __u16 for u_int16_t and therefor asm/types.h no longer needs to be included. Drop fixincludes.patch from dhcp recipe. (From OE-Core rev: 9b8f5818ada97f0803eae7687263246761e9d543) Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch12
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb3
2 files changed, 1 insertions, 14 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch
deleted file mode 100644
index e33c9dd73f..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Pending
2
3--- dhcp-3.0.2/common/tr.c~compile 2005-10-13 14:23:37.000000000 +0200
4+++ dhcp-3.0.2/common/tr.c 2005-10-13 14:23:45.000000000 +0200
5@@ -39,6 +39,7 @@
6 #include "includes/netinet/udp.h"
7 #include "includes/netinet/if_ether.h"
8 #include "netinet/if_tr.h"
9+#include <asm/types.h>
10 #include <sys/time.h>
11
12 /*
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
index a5eed34c33..08db41be25 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
@@ -2,8 +2,7 @@ require dhcp.inc
2 2
3PR = "r1" 3PR = "r1"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
7 file://fix-external-bind.patch \ 6 file://fix-external-bind.patch \
8 file://link-with-lcrypto.patch \ 7 file://link-with-lcrypto.patch \
9 file://fixsepbuild.patch \ 8 file://fixsepbuild.patch \