summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-05-09 14:57:09 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-05-09 14:57:09 +0000
commita07209a0443185175fca20b4b2933d5c4c1f7854 (patch)
tree1f03e7ded1829ef7ebdb023509c6d27f7a0cdf54
parent15cc143c95208760d39489cc32f4a67e90eb7f80 (diff)
networkmanager_0.6.5.bb, networkmanager.inc : an update from OM mtn
-rw-r--r--packages/networkmanager/networkmanager.inc16
-rw-r--r--packages/networkmanager/networkmanager_0.6.5.bb2
2 files changed, 11 insertions, 7 deletions
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
index ce819d64ac..2a0f28753f 100644
--- a/packages/networkmanager/networkmanager.inc
+++ b/packages/networkmanager/networkmanager.inc
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.gnome.org"
PRIORITY = "optional"
DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
-
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
file://NetworkManager \
@@ -21,7 +20,7 @@ EXTRA_OECONF = " \
--without-gcrypt \
--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
--with-dhcdbd=/sbin/dhcdbd \
- --with-ip=/sbin/ip"
+ --with-ip=/sbin/ip.iproute2"
inherit autotools pkgconfig
@@ -48,13 +47,18 @@ fi
/etc/init.d/populate-volatile.sh update
}
-PACKAGES =+ "libnmutil libnmglib"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn"
FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
-FILES_${PN} += "${datadir} \
- ${libexecdir}"
+FILES_${PN} += " \
+ ${libexecdir} \
+ ${libdir}/pppd/*/nm-pppd-plugin.so \
+ ${libdir}/NetworkManager/*.so"
+FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
+ ${libdir}/pppd/*/.debug/ "
FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb
index e6d21de286..2817124887 100644
--- a/packages/networkmanager/networkmanager_0.6.5.bb
+++ b/packages/networkmanager/networkmanager_0.6.5.bb
@@ -1,6 +1,6 @@
require networkmanager.inc
-PR = "r0"
+PR = "r2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
file://NetworkManager \