summaryrefslogtreecommitdiff
path: root/recipes/networkmanager
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-10-02 12:07:25 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-02 12:07:25 +0200
commit0d79048113d39aee8150d8570ca74ad9cab7b38e (patch)
tree11f75ac02912392172868667ce638896ed8a2829 /recipes/networkmanager
parent8fec15f70dcd0a8543b0af3ec256bf9cd108281e (diff)
network manager: massive update
Diffstat (limited to 'recipes/networkmanager')
-rw-r--r--recipes/networkmanager/netm-cli_git.bb7
-rw-r--r--recipes/networkmanager/network-manager-applet_0.7.1.bb11
-rwxr-xr-xrecipes/networkmanager/networkmanager-0.7.1/NetworkManager69
-rw-r--r--recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch20
-rw-r--r--recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch22
-rw-r--r--recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf6
-rw-r--r--recipes/networkmanager/networkmanager-0.7.inc13
-rw-r--r--recipes/networkmanager/networkmanager-applet_svn.bb2
-rw-r--r--recipes/networkmanager/networkmanager_0.7.1.bb19
-rw-r--r--recipes/networkmanager/networkmanager_svn.bb2
10 files changed, 166 insertions, 5 deletions
diff --git a/recipes/networkmanager/netm-cli_git.bb b/recipes/networkmanager/netm-cli_git.bb
index c85dc2e784..9317001a5a 100644
--- a/recipes/networkmanager/netm-cli_git.bb
+++ b/recipes/networkmanager/netm-cli_git.bb
@@ -3,8 +3,11 @@ HOMEPAGE = "http://dev.openbossa.org/mamona/gitweb?p=users/salveti/netm-cli.git;
LICENSE = "GPLv2"
SECTION = "console/network"
RDEPENDS = "python-dbus python-pygobject python-textutils networkmanager (>= 0.7)"
-PR = "r3"
-PV = "0.3+git"
+
+SRCREV = "2c71e6b537c7fceb4bfe6e"
+
+PV = "0.4+git"
+PR_append = ".gitr${SRCREV}"
inherit setuptools
diff --git a/recipes/networkmanager/network-manager-applet_0.7.1.bb b/recipes/networkmanager/network-manager-applet_0.7.1.bb
new file mode 100644
index 0000000000..8d5a364181
--- /dev/null
+++ b/recipes/networkmanager/network-manager-applet_0.7.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "GTK+ applet for NetworkManager"
+LICENSE = "GPL"
+DEPENDS = "libnotify networkmanager dbus-glib libglade gconf gnome-keyring"
+RDEPENDS = "networkmanager"
+
+inherit gnome
+
+FILES_${PN} += "${datadir}/nm-applet/ \
+ ${datadir}/gnome-vpn-properties/ \
+ ${datadir}/gnome/autostart/ \
+ "
diff --git a/recipes/networkmanager/networkmanager-0.7.1/NetworkManager b/recipes/networkmanager/networkmanager-0.7.1/NetworkManager
new file mode 100755
index 0000000000..4cde8cc003
--- /dev/null
+++ b/recipes/networkmanager/networkmanager-0.7.1/NetworkManager
@@ -0,0 +1,69 @@
+#! /bin/sh
+#
+# NetworkManager NetworkManager daemon
+# Daemon for automatically switching network
+# connections to the best available connection.
+# This file should be placed in /etc/init.d.
+#
+# Authors: <j@bootlab.org>
+# Mark Roach <mrroach@okmaybe.com>
+# Thom May <thom@debian.org>
+#
+# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Network connection manager daemon"
+NAME="NetworkManager"
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=root
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+#
+# Function that starts the daemon/service.
+#
+d_start() {
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $USER --exec $DAEMON -- $DAEMON_OPTS
+}
+
+#
+# Function that stops the daemon/service.
+#
+d_stop() {
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --oknodo --user $USER --exec $DAEMON
+}
+
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME"
+ d_start
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME"
+ d_stop
+ echo "."
+ ;;
+ restart|force-reload)
+ echo -n "Restarting $DESC: $NAME"
+ d_stop
+ sleep 1
+ d_start
+ echo "."
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch b/recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch
new file mode 100644
index 0000000000..db420ce2ba
--- /dev/null
+++ b/recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch
@@ -0,0 +1,20 @@
+Index: NetworkManager-0.7.0/src/nm-device-wifi.c
+===================================================================
+--- NetworkManager-0.7.0.orig/src/nm-device-wifi.c
++++ NetworkManager-0.7.0/src/nm-device-wifi.c
+@@ -364,6 +364,15 @@ real_get_generic_capabilities (NMDevice
+ const char *iface = nm_device_get_iface (dev);
+ gboolean success;
+
++ /* The cx3110 driver has to be UP in order to get its capabilities. */
++ gboolean no_firmware = FALSE;
++ const char *driver = nm_device_get_driver (dev);
++ if (driver && !strcmp ("wlan-omap", driver) && !nm_system_device_is_up (dev)) {
++ if (!nm_device_hw_bring_up (dev, TRUE, &no_firmware))
++ nm_warning ("(%s): couldn't bring up interface to get capabilities.",
++ iface);
++ }
++
+ memset (&range, 0, sizeof (struct iw_range));
+ success = wireless_get_range (NM_DEVICE_WIFI (dev), &range, &response_len);
+ if (!success)
diff --git a/recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch b/recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch
new file mode 100644
index 0000000000..d194d96ea5
--- /dev/null
+++ b/recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch
@@ -0,0 +1,22 @@
+Index: NetworkManager-0.7.0/src/nm-manager.c
+===================================================================
+--- NetworkManager-0.7.0.orig/src/nm-manager.c 2009-01-15 17:23:09.000000000 -0300
++++ NetworkManager-0.7.0/src/nm-manager.c 2009-01-15 17:32:36.000000000 -0300
+@@ -286,7 +286,7 @@
+ DBusGConnection *g_connection;
+ guint id;
+
+- priv->wireless_enabled = TRUE;
++ priv->wireless_enabled = FALSE;
+ priv->wireless_hw_enabled = TRUE;
+ priv->sleeping = FALSE;
+ priv->state = NM_STATE_DISCONNECTED;
+@@ -613,7 +613,7 @@
+ g_param_spec_boolean (NM_MANAGER_WIRELESS_ENABLED,
+ "WirelessEnabled",
+ "Is wireless enabled",
+- TRUE,
++ FALSE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property
diff --git a/recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf b/recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf
new file mode 100644
index 0000000000..fb9ef1ff97
--- /dev/null
+++ b/recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf
@@ -0,0 +1,6 @@
+[main]
+plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=true
+
diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc
index f3927e8a1b..a19cd9ff5c 100644
--- a/recipes/networkmanager/networkmanager-0.7.inc
+++ b/recipes/networkmanager/networkmanager-0.7.inc
@@ -7,13 +7,17 @@ RDEPENDS = "wpa-supplicant dhcp-client \
${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
"
+RCONFLICTS_${PN} = "connman"
+
+inherit gnome update-rc.d
+
+SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.bz2"
+
EXTRA_OECONF = " \
--with-distro=debian \
--with-crypto=gnutls \
--disable-more-warnings"
-inherit autotools pkgconfig update-rc.d
-
INITSCRIPT_NAME = "NetworkManager"
INITSCRIPT_PARAMS = "defaults 28"
@@ -44,12 +48,15 @@ FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
+
FILES_${PN} += " \
${libexecdir} \
${libdir}/pppd/*/nm-pppd-plugin.so \
${libdir}/NetworkManager/*.so \
${datadir}/PolicyKit \
- ${datadir}/dbus-1"
+ ${datadir}/dbus-1 \
+ ${base_libdir}/udev/* \
+"
FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
${libdir}/pppd/*/.debug/ "
diff --git a/recipes/networkmanager/networkmanager-applet_svn.bb b/recipes/networkmanager/networkmanager-applet_svn.bb
index d61e134e96..13234af8ed 100644
--- a/recipes/networkmanager/networkmanager-applet_svn.bb
+++ b/recipes/networkmanager/networkmanager-applet_svn.bb
@@ -9,6 +9,8 @@ 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"
+SRCREV = "200"
+
PV = "0.0+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
diff --git a/recipes/networkmanager/networkmanager_0.7.1.bb b/recipes/networkmanager/networkmanager_0.7.1.bb
new file mode 100644
index 0000000000..fc97a8a29c
--- /dev/null
+++ b/recipes/networkmanager/networkmanager_0.7.1.bb
@@ -0,0 +1,19 @@
+require networkmanager-0.7.inc
+
+SRC_URI += " \
+ file://remove-gtk-doc-make.patch;patch=1 \
+ file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;patch=1 \
+ file://02-dbus_access_network_manager.patch;patch=1 \
+ file://cx3110_bring_up.patch;patch=1 \
+ file://nm-system-settings.conf \
+ file://NetworkManager \
+"
+
+S = "${WORKDIR}/NetworkManager-${PV}"
+
+do_install_append () {
+ install -d ${D}/etc/NetworkManager/
+ install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/
+ install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d
+}
+
diff --git a/recipes/networkmanager/networkmanager_svn.bb b/recipes/networkmanager/networkmanager_svn.bb
index 4045b817de..e1936fd221 100644
--- a/recipes/networkmanager/networkmanager_svn.bb
+++ b/recipes/networkmanager/networkmanager_svn.bb
@@ -1,5 +1,7 @@
require networkmanager-pre0.7.inc
+SRCREV = "3202"
+
PV = "0.7+svnr${SRCREV}"
PR = "r1"