aboutsummaryrefslogtreecommitdiffstats
path: root/meta
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:44:35 +0100
commit9b8f5818ada97f0803eae7687263246761e9d543 (patch)
tree973f737f6d4f58c49c7cb0c515ca792afee05016 /meta
parent3eb9bbea6f08171d0598c48ca65256c2afc92676 (diff)
downloadopenembedded-core-contrib-9b8f5818ada97f0803eae7687263246761e9d543.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. Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-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 @@
-Upstream-Status: Pending
-
---- dhcp-3.0.2/common/tr.c~compile 2005-10-13 14:23:37.000000000 +0200
-+++ dhcp-3.0.2/common/tr.c 2005-10-13 14:23:45.000000000 +0200
-@@ -39,6 +39,7 @@
- #include "includes/netinet/udp.h"
- #include "includes/netinet/if_ether.h"
- #include "netinet/if_tr.h"
-+#include <asm/types.h>
- #include <sys/time.h>
-
- /*
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
PR = "r1"
-SRC_URI += "file://fixincludes.patch \
- file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
+SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://fix-external-bind.patch \
file://link-with-lcrypto.patch \
file://fixsepbuild.patch \