[PATCH 0/2] Drop unnecessary dhcp patches

[PATCH 0/2] Drop unnecessary dhcp patches

[Kevin Strasser]

The following changes since commit fe744381e8844ad17dcc6e036650a442dbc9575d:

  buildtools-tarball: add difflib and pprint python modules (2013-06-11 21:53:47 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib strassek/patch-cleanup
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/patch-cleanup

Kevin Strasser (2):
  dhcp: drop fixincludes.patch
  dhcp: drop noattrmode.patch

 .../dhcp/dhcp/fixincludes.patch                    |   12 -----------
 .../dhcp/dhcp/noattrmode.patch                     |   21 --------------------
 meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb    |    3 +--
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch

-- 
1.7.9.5

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

[Kevin Strasser]

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

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 \
-- 
1.7.9.5

[PATCH 2/2] dhcp: drop noattrmode.patch

[Kevin Strasser]

This change no longer needs to be backported now that a newer version
of dhcp is being used. The patch isn't causing errors because it is not
included in the dhcp recipe's SRC_URI.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 .../dhcp/dhcp/noattrmode.patch                     |   21 --------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch

diff --git a/meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch
deleted file mode 100644
index 5c635e8..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Backport
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- dhcp-3.0.1/includes/dhcpd.h~compile
-+++ dhcp-3.0.1/includes/dhcpd.h
-@@ -306,9 +306,9 @@
- #	define EPHEMERAL_FLAGS		(MS_NULL_TERMINATION | \
- 					 UNICAST_BROADCAST_HACK)
- 
--	binding_state_t __attribute__ ((mode (__byte__))) binding_state;
--	binding_state_t __attribute__ ((mode (__byte__))) next_binding_state;
--	binding_state_t __attribute__ ((mode (__byte__))) desired_binding_state;
-+	binding_state_t binding_state;
-+	binding_state_t next_binding_state;
-+	binding_state_t desired_binding_state;
- 	
- 	struct lease_state *state;
- 
-- 
1.7.9.5