From 820f7c69528cdd2b34611b45cd93c83a3c6aef5a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 Sep 2007 14:29:19 +0000 Subject: 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 --- .../packages/networkmanager/files/25NetworkManager | 2 + .../packages/networkmanager/files/build-fixes.diff | 78 ---------------------- .../networkmanager/files/install-tools.patch | 16 ----- .../packages/networkmanager/files/no-restarts.diff | 21 ++++++ .../packages/networkmanager/networkmanager_svn.bb | 8 +-- 5 files changed, 27 insertions(+), 98 deletions(-) delete mode 100644 meta-extras/packages/networkmanager/files/build-fixes.diff delete mode 100644 meta-extras/packages/networkmanager/files/install-tools.patch create mode 100644 meta-extras/packages/networkmanager/files/no-restarts.diff (limited to 'meta-extras/packages') diff --git a/meta-extras/packages/networkmanager/files/25NetworkManager b/meta-extras/packages/networkmanager/files/25NetworkManager index 0beff6308..8e4dec167 100644 --- a/meta-extras/packages/networkmanager/files/25NetworkManager +++ b/meta-extras/packages/networkmanager/files/25NetworkManager @@ -8,11 +8,13 @@ case $1 in 'start') echo -n "Starting NetworkManager daemon: NetworkManager" /usr/sbin/NetworkManager + /usr/sbin/NetworkManagerDispatcher echo "." ;; 'stop') echo -n "Stopping NetworkManager daemon: NetworkManager" + kill `ps |grep /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2` kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2` echo "." ;; 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 d771c3056..000000000 --- a/meta-extras/packages/networkmanager/files/build-fixes.diff +++ /dev/null @@ -1,78 +0,0 @@ -Index: test/nm-tool.c -=================================================================== ---- test/nm-tool.c (revision 2853) -+++ test/nm-tool.c (working copy) -@@ -148,7 +148,7 @@ - GString *str; - gboolean active = FALSE; - guint32 flags, wpa_flags, rsn_flags; -- GByteArray * ssid; -+ const GByteArray * ssid; - char *tmp; - - flags = nm_access_point_get_flags (ap); -@@ -193,7 +193,6 @@ - ssid = nm_access_point_get_ssid (ap); - tmp = g_strdup_printf (" %s%s", active ? "*" : "", - ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); -- g_byte_array_free (ssid, TRUE); - - print_string (tmp, str->str); - -Index: callouts/nm-dhcp-client-action.c -=================================================================== ---- callouts/nm-dhcp-client-action.c (revision 2853) -+++ callouts/nm-dhcp-client-action.c (working copy) -@@ -176,7 +176,7 @@ - } - - --const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; -+static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; - - dbus_bool_t - build_message (DBusMessage * message) -Index: src/nm-netlink.c -=================================================================== ---- src/nm-netlink.c (revision 2853) -+++ src/nm-netlink.c (working copy) -@@ -19,6 +19,7 @@ - * (C) Copyright 2007 Red Hat, Inc. - */ - -+#include - #include "nm-netlink.h" - #include "nm-utils.h" - -Index: src/vpn-manager/nm-vpn-connection.c -=================================================================== ---- src/vpn-manager/nm-vpn-connection.c (revision 2853) -+++ src/vpn-manager/nm-vpn-connection.c (working copy) -@@ -406,7 +406,7 @@ - routes = nm_vpn_connection_get_routes (connection); - org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy, - nm_vpn_connection_get_vpn_data (connection), -- routes, -+ (const char**)routes, - nm_vpn_connection_connect_cb, - connection); - -Index: libnm-glib/libnm-glib-test.c -=================================================================== ---- libnm-glib/libnm-glib-test.c (revision 2853) -+++ libnm-glib/libnm-glib-test.c (working copy) -@@ -165,13 +165,12 @@ - static void - dump_access_point (NMAccessPoint *ap) - { -- GByteArray * ssid; -+ const GByteArray * ssid; - char * str; - - ssid = nm_access_point_get_ssid (ap); - g_print ("\tSsid: %s\n", - ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); -- g_byte_array_free (ssid, TRUE); - - str = nm_access_point_get_hw_address (ap); - 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 36cb9424f..000000000 --- a/meta-extras/packages/networkmanager/files/install-tools.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: test/Makefile.am -=================================================================== ---- test/Makefile.am (revision 2853) -+++ test/Makefile.am (working copy) -@@ -15,8 +15,9 @@ - -DNM_RUN_DIR=\"$(rundir)\" \ - -DDATADIR=\"$(datadir)\" - --noinst_PROGRAMS = nm-tool \ -- nm-online \ -+bin_PROGRAMS = nm-tool \ -+ nm-online -+noinst_PROGRAMS = \ - nmtestdevices \ - libnm_glib_test - 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 000000000..20bdf82aa --- /dev/null +++ b/meta-extras/packages/networkmanager/files/no-restarts.diff @@ -0,0 +1,21 @@ +Index: src/backends/NetworkManagerDebian.c +=================================================================== +--- src/backends/NetworkManagerDebian.c (revision 2881) ++++ src/backends/NetworkManagerDebian.c (working copy) +@@ -204,8 +204,6 @@ + */ + void nm_system_update_dns (void) + { +- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); +- + } + + +@@ -218,7 +216,6 @@ + */ + void nm_system_restart_mdns_responder (void) + { +- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); + } + + diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb index cb3f72e2e..5f05c1433 100644 --- a/meta-extras/packages/networkmanager/networkmanager_svn.bb +++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb @@ -4,20 +4,20 @@ LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" -RDEPENDS = "hal wpa-supplicant iproute2" +RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svn${SRCDATE}" -PR = "r1" +PR = "r2" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ - file://build-fixes.diff;patch=1;pnum=0 \ - file://install-tools.patch;patch=1;pnum=0 \ + file://no-restarts.diff;patch=1;pnum=0 \ file://25NetworkManager \ file://99_networkmanager" EXTRA_OECONF = " \ --with-distro=debian \ --with-ip=/sbin/ip" +# TODO: will /bin/ip from busybox do? S = "${WORKDIR}/trunk" -- cgit v1.2.3