diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-26 22:57:37 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-26 22:57:37 +0100 |
| commit | 14f39f31a9d13c2a610a176a05865e57a164401a (patch) | |
| tree | bb894aab1739d4828db37c52f9e047715893db41 /meta | |
| parent | ba7f2cc5488520b283c3837b2a5616db21d9b950 (diff) | |
| download | openembedded-core-14f39f31a9d13c2a610a176a05865e57a164401a.tar.gz openembedded-core-14f39f31a9d13c2a610a176a05865e57a164401a.tar.bz2 openembedded-core-14f39f31a9d13c2a610a176a05865e57a164401a.zip | |
connmand: Drop patch merged upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/connman/connman_git.bb | 1 | ||||
| -rw-r--r-- | meta/packages/connman/files/dhclientreorder.patch | 40 |
2 files changed, 0 insertions, 41 deletions
diff --git a/meta/packages/connman/connman_git.bb b/meta/packages/connman/connman_git.bb index b86c39a779..7518fac34c 100644 --- a/meta/packages/connman/connman_git.bb +++ b/meta/packages/connman/connman_git.bb @@ -18,7 +18,6 @@ EXTRA_OECONF += " \ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ file://connman-install-tests.patch;patch=1 \ file://udevfix.patch;patch=1 \ - file://dhclientreorder.patch;patch=1 \ file://dbusperms.patch;patch=1 \ file://connman " diff --git a/meta/packages/connman/files/dhclientreorder.patch b/meta/packages/connman/files/dhclientreorder.patch deleted file mode 100644 index 04da0252df..0000000000 --- a/meta/packages/connman/files/dhclientreorder.patch +++ /dev/null @@ -1,40 +0,0 @@ -The -n option must appear after the iface options, else dhclient -just prints its help text. Crazy. - -RP - 25/5/09 - -Index: git/plugins/dhclient.c -=================================================================== ---- git.orig/plugins/dhclient.c 2009-05-26 00:01:02.000000000 +0100 -+++ git/plugins/dhclient.c 2009-05-26 00:01:38.000000000 +0100 -@@ -165,18 +165,18 @@ - argv[0] = DHCLIENT; - argv[1] = "-d"; - argv[2] = "-q"; -- argv[3] = "-n"; -- argv[4] = "-e"; -- argv[5] = address; -- argv[6] = "-pf"; -- argv[7] = pidfile; -- argv[8] = "-lf"; -- argv[9] = leases; -- argv[10] = "-cf"; -- argv[11] = config; -- argv[12] = "-sf"; -- argv[13] = script; -- argv[14] = task->ifname; -+ argv[3] = "-e"; -+ argv[4] = address; -+ argv[5] = "-pf"; -+ argv[6] = pidfile; -+ argv[7] = "-lf"; -+ argv[8] = leases; -+ argv[9] = "-cf"; -+ argv[10] = config; -+ argv[11] = "-sf"; -+ argv[12] = script; -+ argv[13] = task->ifname; -+ argv[14] = "-n"; - argv[15] = NULL; - - envp[0] = NULL; |