summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-09-25 14:29:19 +0000
committerRoss Burton <ross@openedhand.com>2007-09-25 14:29:19 +0000
commit820f7c69528cdd2b34611b45cd93c83a3c6aef5a (patch)
tree3f3eb054677997c2eead7e7db937dd65f5d0cece /meta-extras/packages
parentc99719d7e15bc3aecf99ee5084d99e1299c7a231 (diff)
downloadpoky-820f7c69528cdd2b34611b45cd93c83a3c6aef5a.tar.gz
networkmanager: remove integrated patches, fix startup script to start NetworkManagerDispatcher, add missing depends, don't restart ncsd as we don't use it
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2785 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages')
-rw-r--r--meta-extras/packages/networkmanager/files/25NetworkManager2
-rw-r--r--meta-extras/packages/networkmanager/files/build-fixes.diff78
-rw-r--r--meta-extras/packages/networkmanager/files/install-tools.patch16
-rw-r--r--meta-extras/packages/networkmanager/files/no-restarts.diff21
-rw-r--r--meta-extras/packages/networkmanager/networkmanager_svn.bb8
5 files changed, 27 insertions, 98 deletions
diff --git a/meta-extras/packages/networkmanager/files/25NetworkManager b/meta-extras/packages/networkmanager/files/25NetworkManager
index 0beff63081..8e4dec167f 100644
--- a/meta-extras/packages/networkmanager/files/25NetworkManager
+++ b/meta-extras/packages/networkmanager/files/25NetworkManager
@@ -8,11 +8,13 @@ case $1 in
8 'start') 8 'start')
9 echo -n "Starting NetworkManager daemon: NetworkManager" 9 echo -n "Starting NetworkManager daemon: NetworkManager"
10 /usr/sbin/NetworkManager 10 /usr/sbin/NetworkManager
11 /usr/sbin/NetworkManagerDispatcher
11 echo "." 12 echo "."
12 ;; 13 ;;
13 14
14 'stop') 15 'stop')
15 echo -n "Stopping NetworkManager daemon: NetworkManager" 16 echo -n "Stopping NetworkManager daemon: NetworkManager"
17 kill `ps |grep /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
16 kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2` 18 kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
17 echo "." 19 echo "."
18 ;; 20 ;;
diff --git a/meta-extras/packages/networkmanager/files/build-fixes.diff b/meta-extras/packages/networkmanager/files/build-fixes.diff
deleted file mode 100644
index d771c30563..0000000000
--- a/meta-extras/packages/networkmanager/files/build-fixes.diff
+++ /dev/null
@@ -1,78 +0,0 @@
1Index: test/nm-tool.c
2===================================================================
3--- test/nm-tool.c (revision 2853)
4+++ test/nm-tool.c (working copy)
5@@ -148,7 +148,7 @@
6 GString *str;
7 gboolean active = FALSE;
8 guint32 flags, wpa_flags, rsn_flags;
9- GByteArray * ssid;
10+ const GByteArray * ssid;
11 char *tmp;
12
13 flags = nm_access_point_get_flags (ap);
14@@ -193,7 +193,6 @@
15 ssid = nm_access_point_get_ssid (ap);
16 tmp = g_strdup_printf (" %s%s", active ? "*" : "",
17 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
18- g_byte_array_free (ssid, TRUE);
19
20 print_string (tmp, str->str);
21
22Index: callouts/nm-dhcp-client-action.c
23===================================================================
24--- callouts/nm-dhcp-client-action.c (revision 2853)
25+++ callouts/nm-dhcp-client-action.c (working copy)
26@@ -176,7 +176,7 @@
27 }
28
29
30-const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
31+static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
32
33 dbus_bool_t
34 build_message (DBusMessage * message)
35Index: src/nm-netlink.c
36===================================================================
37--- src/nm-netlink.c (revision 2853)
38+++ src/nm-netlink.c (working copy)
39@@ -19,6 +19,7 @@
40 * (C) Copyright 2007 Red Hat, Inc.
41 */
42
43+#include <asm/types.h>
44 #include "nm-netlink.h"
45 #include "nm-utils.h"
46
47Index: src/vpn-manager/nm-vpn-connection.c
48===================================================================
49--- src/vpn-manager/nm-vpn-connection.c (revision 2853)
50+++ src/vpn-manager/nm-vpn-connection.c (working copy)
51@@ -406,7 +406,7 @@
52 routes = nm_vpn_connection_get_routes (connection);
53 org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy,
54 nm_vpn_connection_get_vpn_data (connection),
55- routes,
56+ (const char**)routes,
57 nm_vpn_connection_connect_cb,
58 connection);
59
60Index: libnm-glib/libnm-glib-test.c
61===================================================================
62--- libnm-glib/libnm-glib-test.c (revision 2853)
63+++ libnm-glib/libnm-glib-test.c (working copy)
64@@ -165,13 +165,12 @@
65 static void
66 dump_access_point (NMAccessPoint *ap)
67 {
68- GByteArray * ssid;
69+ const GByteArray * ssid;
70 char * str;
71
72 ssid = nm_access_point_get_ssid (ap);
73 g_print ("\tSsid: %s\n",
74 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
75- g_byte_array_free (ssid, TRUE);
76
77 str = nm_access_point_get_hw_address (ap);
78 g_print ("\tMAC Address: %s\n", str);
diff --git a/meta-extras/packages/networkmanager/files/install-tools.patch b/meta-extras/packages/networkmanager/files/install-tools.patch
deleted file mode 100644
index 36cb9424f9..0000000000
--- a/meta-extras/packages/networkmanager/files/install-tools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Index: test/Makefile.am
2===================================================================
3--- test/Makefile.am (revision 2853)
4+++ test/Makefile.am (working copy)
5@@ -15,8 +15,9 @@
6 -DNM_RUN_DIR=\"$(rundir)\" \
7 -DDATADIR=\"$(datadir)\"
8
9-noinst_PROGRAMS = nm-tool \
10- nm-online \
11+bin_PROGRAMS = nm-tool \
12+ nm-online
13+noinst_PROGRAMS = \
14 nmtestdevices \
15 libnm_glib_test
16
diff --git a/meta-extras/packages/networkmanager/files/no-restarts.diff b/meta-extras/packages/networkmanager/files/no-restarts.diff
new file mode 100644
index 0000000000..20bdf82aab
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/no-restarts.diff
@@ -0,0 +1,21 @@
1Index: src/backends/NetworkManagerDebian.c
2===================================================================
3--- src/backends/NetworkManagerDebian.c (revision 2881)
4+++ src/backends/NetworkManagerDebian.c (working copy)
5@@ -204,8 +204,6 @@
6 */
7 void nm_system_update_dns (void)
8 {
9- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
10-
11 }
12
13
14@@ -218,7 +216,6 @@
15 */
16 void nm_system_restart_mdns_responder (void)
17 {
18- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
19 }
20
21
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb
index cb3f72e2e6..5f05c1433d 100644
--- a/meta-extras/packages/networkmanager/networkmanager_svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb
@@ -4,20 +4,20 @@ LICENSE = "GPL"
4HOMEPAGE = "http://www.gnome.org" 4HOMEPAGE = "http://www.gnome.org"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" 6DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
7RDEPENDS = "hal wpa-supplicant iproute2" 7RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
8 8
9PV = "0.7+svn${SRCDATE}" 9PV = "0.7+svn${SRCDATE}"
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ 12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
13 file://build-fixes.diff;patch=1;pnum=0 \ 13 file://no-restarts.diff;patch=1;pnum=0 \
14 file://install-tools.patch;patch=1;pnum=0 \
15 file://25NetworkManager \ 14 file://25NetworkManager \
16 file://99_networkmanager" 15 file://99_networkmanager"
17 16
18EXTRA_OECONF = " \ 17EXTRA_OECONF = " \
19 --with-distro=debian \ 18 --with-distro=debian \
20 --with-ip=/sbin/ip" 19 --with-ip=/sbin/ip"
20# TODO: will /bin/ip from busybox do?
21 21
22S = "${WORKDIR}/trunk" 22S = "${WORKDIR}/trunk"
23 23