mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

networkmanager: Move from meta-extras to meta

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3709 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-02-07 20:00:09 +00:00
parent fc20c6cbee
commit e600587fdc
7 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-extras/packages/networkmanager/files/25NetworkManager
-30
View File
@@ -1,30 +0,0 @@
#!/bin/sh
#
# NetworkManager startup script
. /etc/profile
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 "."
;;
'restart')
$0 stop
$0 start
;;
*)
echo "Usage: $0 { start | stop | restart }"
;;
esac
meta-extras/packages/networkmanager/files/99_networkmanager
-1
View File
@@ -1 +0,0 @@
d root root 0700 /var/run/NetworkManager none
meta-extras/packages/networkmanager/files/applet-no-animation.patch
-234
View File
@@ -1,234 +0,0 @@
Index: trunk/src/applet.c
===================================================================
--- trunk.orig/src/applet.c 2008-02-06 20:30:04.000000000 +0000
+++ trunk/src/applet.c 2008-02-06 20:46:59.000000000 +0000
@@ -111,8 +111,6 @@
static void nma_init (NMApplet *applet)
{
- applet->animation_id = 0;
- applet->animation_step = 0;
applet->passphrase_dialog = NULL;
applet->icon_theme = NULL;
#ifdef ENABLE_NOTIFY
@@ -1006,20 +1004,6 @@
}
}
-static gboolean
-vpn_animation_timeout (gpointer data)
-{
- NMApplet *applet = NM_APPLET (data);
-
- foo_set_icon (applet, applet->vpn_connecting_icons[applet->animation_step], ICON_LAYER_VPN);
-
- applet->animation_step++;
- if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
- applet->animation_step = 0;
-
- return TRUE;
-}
-
static void
vpn_connection_state_changed (NMVPNConnection *connection,
NMVPNConnectionState state,
@@ -1030,10 +1014,6 @@
switch (state) {
case NM_VPN_CONNECTION_STATE_ACTIVATED:
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
foo_set_icon (applet, applet->vpn_lock_icon, ICON_LAYER_VPN);
// vpn_connection_info_set_last_attempt_success (info, TRUE);
break;
@@ -1041,10 +1021,7 @@
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
- if (applet->animation_id == 0) {
- applet->animation_step = 0;
- applet->animation_id = g_timeout_add (100, vpn_animation_timeout, applet);
- }
+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_VPN);
break;
case NM_VPN_CONNECTION_STATE_FAILED:
// vpn_connection_info_set_last_attempt_success (info, FALSE);
@@ -1053,10 +1030,6 @@
g_hash_table_remove (applet->vpn_connections, nm_vpn_connection_get_name (connection));
/* Fall through */
default:
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
foo_set_icon (applet, NULL, ICON_LAYER_VPN);
break;
}
@@ -2295,45 +2268,6 @@
} FooAnimationTimeoutInfo;
static void
-foo_animation_timeout_info_destroy (gpointer data)
-{
- g_slice_free (FooAnimationTimeoutInfo, data);
-}
-
-static gboolean
-foo_animation_timeout (gpointer data)
-{
- FooAnimationTimeoutInfo *info = (FooAnimationTimeoutInfo *) data;
- NMApplet *applet = info->applet;
- int stage = -1;
-
- switch (info->state) {
- case NM_DEVICE_STATE_PREPARE:
- stage = 0;
- break;
- case NM_DEVICE_STATE_CONFIG:
- stage = 1;
- break;
- case NM_DEVICE_STATE_IP_CONFIG:
- stage = 2;
- break;
- default:
- break;
- }
-
- if (stage >= 0)
- foo_set_icon (applet,
- applet->network_connecting_icons[stage][applet->animation_step],
- ICON_LAYER_LINK);
-
- applet->animation_step++;
- if (applet->animation_step >= NUM_CONNECTING_FRAMES)
- applet->animation_step = 0;
-
- return TRUE;
-}
-
-static void
foo_common_state_change (NMDevice *device, NMDeviceState state, NMApplet *applet)
{
FooAnimationTimeoutInfo *info;
@@ -2345,11 +2279,7 @@
info = g_slice_new (FooAnimationTimeoutInfo);
info->applet = applet;
info->state = state;
- applet->animation_step = 0;
- applet->animation_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
- 100, foo_animation_timeout,
- info,
- foo_animation_timeout_info_destroy);
+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_LINK);
break;
case NM_DEVICE_STATE_ACTIVATED:
break;
@@ -2602,12 +2532,6 @@
NMApplet *applet = NM_APPLET (user_data);
gboolean handled = FALSE;
- applet->animation_step = 0;
- if (applet->animation_id) {
- g_source_remove (applet->animation_id);
- applet->animation_id = 0;
- }
-
clear_active_connections (applet);
applet->active_connections = nm_client_get_active_connections (applet->nm_client);
@@ -3166,17 +3090,8 @@
if (applet->wireless_100_icon)
g_object_unref (applet->wireless_100_icon);
- for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- if (applet->network_connecting_icons[i][j])
- g_object_unref (applet->network_connecting_icons[i][j]);
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- if (applet->vpn_connecting_icons[i])
- g_object_unref (applet->vpn_connecting_icons[i]);
+ if (applet->network_connecting_icon)
+ g_object_unref (applet->network_connecting_icon);
nma_icons_zero (applet);
}
@@ -3196,16 +3111,7 @@
applet->wireless_75_icon = NULL;
applet->wireless_100_icon = NULL;
- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
- {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- applet->network_connecting_icons[i][j] = NULL;
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- applet->vpn_connecting_icons[i] = NULL;
+ applet->network_connecting_icon = NULL;
applet->icons_loaded = FALSE;
}
@@ -3257,28 +3163,7 @@
ICON_LOAD(applet->wireless_75_icon, "nm-signal-75");
ICON_LOAD(applet->wireless_100_icon, "nm-signal-100");
- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
- {
- int j;
-
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- {
- char *name;
-
- name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
- ICON_LOAD(applet->network_connecting_icons[i][j], name);
- g_free (name);
- }
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- {
- char *name;
-
- name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
- ICON_LOAD(applet->vpn_connecting_icons[i], name);
- g_free (name);
- }
+ ICON_LOAD(applet->network_connecting_icon, "nm-connecting");
success = TRUE;
Index: trunk/src/applet.h
===================================================================
--- trunk.orig/src/applet.h 2008-02-06 20:30:06.000000000 +0000
+++ trunk/src/applet.h 2008-02-06 20:46:05.000000000 +0000
@@ -111,20 +111,12 @@
GdkPixbuf * wireless_50_icon;
GdkPixbuf * wireless_75_icon;
GdkPixbuf * wireless_100_icon;
-#define NUM_CONNECTING_STAGES 3
-#define NUM_CONNECTING_FRAMES 11
- GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES];
-#define NUM_VPN_CONNECTING_FRAMES 14
- GdkPixbuf * vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES];
+ GdkPixbuf * network_connecting_icon;
GdkPixbuf * vpn_lock_icon;
/* Active status icon pixbufs */
GdkPixbuf * icon_layers[ICON_LAYER_MAX + 1];
- /* Animation stuff */
- int animation_step;
- guint animation_id;
-
/* Direct UI elements */
#ifdef HAVE_STATUS_ICON
GtkStatusIcon * status_icon;
meta-extras/packages/networkmanager/files/applet-no-gnome.diff
-59
View File
@@ -1,59 +0,0 @@
---
configure.ac | 3 +--
src/main.c | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
Index: src/main.c
===================================================================
--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100
+++ src/main.c 2007-09-26 10:39:37.000000000 +0100
@@ -27,7 +27,9 @@
#include <string.h>
#include <gtk/gtk.h>
+#if 0
#include <libgnomeui/libgnomeui.h>
+#endif
#include <glib/gi18n-lib.h>
#include "applet.h"
@@ -36,11 +38,15 @@
int main (int argc, char *argv[])
{
NMApplet * applet;
+#if 0
GnomeProgram * program;
program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+#else
+ gtk_init (&argc, &argv);
+#endif
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
gtk_main ();
g_object_unref (applet);
+#if 0
g_object_unref (program);
+#endif
exit (0);
}
Index: configure.ac
===================================================================
--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100
+++ configure.ac 2007-09-26 10:39:37.000000000 +0100
@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
gtk+-2.0 >= 2.6
libglade-2.0
gconf-2.0
- gnome-keyring-1
- libgnomeui-2.0])
+ gnome-keyring-1])
##### Find out the version of DBUS we're using
dbus_version=`pkg-config --modversion dbus-1`
meta-extras/packages/networkmanager/files/no-restarts.diff
-21
View File
@@ -1,21 +0,0 @@
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");
}
meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
-21
View File
@@ -1,21 +0,0 @@
DESCRIPTION = "GTK+ applet for NetworkManager"
LICENSE = "GPL"
DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
#TODO DEPENDS libnotify
RDEPENDS = "networkmanager"
PR = "r1"
inherit gnome gtk-icon-cache
SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
file://applet-no-gnome.diff;patch=1;pnum=0 \
file://applet-no-animation.patch;patch=1"
PV = "0.0+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
FILES_${PN} += "${datadir}/nm-applet/ \
${datadir}/gnome-vpn-properties/ \
${datadir}/gnome/autostart/ \
"
meta-extras/packages/networkmanager/networkmanager_svn.bb
-55
View File
@@ -1,55 +0,0 @@
DESCRIPTION = "NetworkManager"
SECTION = "net/misc"
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 dhcp-client"
PV = "0.7+svnr${SRCREV}"
PR = "r3"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
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"
inherit autotools pkgconfig
do_install_append () {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
}
do_stage () {
autotools_stage_all
}
pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
exit 1
fi
/etc/init.d/populate-volatile.sh update
}
PACKAGES =+ "libnmutil libnmglib"
FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
FILES_${PN}-dev = "${includedir}/* \
${libdir}/*.so \
${libdir}/*.a \
${libdir}/pkgconfig/*.pc \
${datadir}/NetworkManager/gdb-cmd \
"