Patchwork [1/2] dhcp: drop fixincludes.patch

login
register
mail settings
Submitter Kevin Strasser
Date June 12, 2013, 5:40 p.m.
Message ID <413012075baacdde3ac92f419557da5433cd703a.1371058261.git.kevin.strasser@linux.intel.com>
Download mbox | patch
Permalink /patch/51619/
State Accepted
Commit cb16810c714d5de6b1964e0ded7168e9f2e7c00a
Headers show

Comments

Kevin Strasser - June 12, 2013, 5:40 p.m.
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>
---
 .../dhcp/dhcp/fixincludes.patch                    |   12 ------------
 meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb    |    3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch

Patch

diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch
deleted file mode 100644
index e33c9dd..0000000
--- 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 a5eed34..08db41b 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 \