diff options
| -rw-r--r-- | packages/networkmanager/networkmanager_svn.bb | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb index 610bd01e7e..e6bd318063 100644 --- a/packages/networkmanager/networkmanager_svn.bb +++ b/packages/networkmanager/networkmanager_svn.bb @@ -7,31 +7,31 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svnr${SRCREV}" -PR = "r2" +PR = "r5" 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" +S = "${WORKDIR}/trunk" + EXTRA_OECONF = " \ --with-distro=debian \ - --with-ip=/sbin/ip" -# TODO: will /bin/ip from busybox do? - -S = "${WORKDIR}/trunk" + --with-ip=/sbin/ip.iproute2" inherit autotools pkgconfig +do_stage () { + autotools_stage_all +} + 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 + sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager } pkg_postinst () { @@ -41,15 +41,17 @@ pkg_postinst () { /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} += " \ + ${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 " -FILES_${PN}-dev = "${includedir}/* \ - ${libdir}/*.so \ - ${libdir}/*.a \ - ${libdir}/pkgconfig/*.pc \ - ${datadir}/NetworkManager/gdb-cmd \ - " |