summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-26 22:57:37 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-26 22:57:37 +0100
commit14f39f31a9d13c2a610a176a05865e57a164401a (patch)
treebb894aab1739d4828db37c52f9e047715893db41 /meta
parentba7f2cc5488520b283c3837b2a5616db21d9b950 (diff)
downloadpoky-14f39f31a9d13c2a610a176a05865e57a164401a.tar.gz
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.bb1
-rw-r--r--meta/packages/connman/files/dhclientreorder.patch40
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 += " \
18SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ 18SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \
19 file://connman-install-tests.patch;patch=1 \ 19 file://connman-install-tests.patch;patch=1 \
20 file://udevfix.patch;patch=1 \ 20 file://udevfix.patch;patch=1 \
21 file://dhclientreorder.patch;patch=1 \
22 file://dbusperms.patch;patch=1 \ 21 file://dbusperms.patch;patch=1 \
23 file://connman " 22 file://connman "
24 23
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 @@
1The -n option must appear after the iface options, else dhclient
2just prints its help text. Crazy.
3
4RP - 25/5/09
5
6Index: git/plugins/dhclient.c
7===================================================================
8--- git.orig/plugins/dhclient.c 2009-05-26 00:01:02.000000000 +0100
9+++ git/plugins/dhclient.c 2009-05-26 00:01:38.000000000 +0100
10@@ -165,18 +165,18 @@
11 argv[0] = DHCLIENT;
12 argv[1] = "-d";
13 argv[2] = "-q";
14- argv[3] = "-n";
15- argv[4] = "-e";
16- argv[5] = address;
17- argv[6] = "-pf";
18- argv[7] = pidfile;
19- argv[8] = "-lf";
20- argv[9] = leases;
21- argv[10] = "-cf";
22- argv[11] = config;
23- argv[12] = "-sf";
24- argv[13] = script;
25- argv[14] = task->ifname;
26+ argv[3] = "-e";
27+ argv[4] = address;
28+ argv[5] = "-pf";
29+ argv[6] = pidfile;
30+ argv[7] = "-lf";
31+ argv[8] = leases;
32+ argv[9] = "-cf";
33+ argv[10] = config;
34+ argv[11] = "-sf";
35+ argv[12] = script;
36+ argv[13] = task->ifname;
37+ argv[14] = "-n";
38 argv[15] = NULL;
39
40 envp[0] = NULL;