[oe-commits] org.oe.dev networkmanager_svn.bb : an update from Om mtn

[xora commit]

networkmanager_svn.bb : an update from Om mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 3f43406ba42c23ecf2e0fd2ae063db2b7bc66fc4
ViewMTN: http://monotone.openembedded.org/revision/info/3f43406ba42c23ecf2e0fd2ae063db2b7bc66fc4
Files:
1
packages/networkmanager/networkmanager_svn.bb
Diffs:

#
# mt diff -rcb4ea4ed80b8937f0fef91bb68c1852ecca888f2 -r3f43406ba42c23ecf2e0fd2ae063db2b7bc66fc4
#
#
#
# patch "packages/networkmanager/networkmanager_svn.bb"
#  from [9b937ee39ef7fa695a9532effa744c53c1caec94]
#    to [013d4c276b3821e39ccb1d30cd038c332870a552]
#
============================================================
--- packages/networkmanager/networkmanager_svn.bb	9b937ee39ef7fa695a9532effa744c53c1caec94
+++ packages/networkmanager/networkmanager_svn.bb	013d4c276b3821e39ccb1d30cd038c332870a552
@@ -7,33 +7,33 @@ PV = "0.7+svnr${SRCREV}"
 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?
+		--with-ip=/sbin/ip.iproute2"
 
-S = "${WORKDIR}/trunk"
+inherit autotools pkgconfig
 
-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
+	sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 pkg_postinst () {
         if [ "x$D" != "x" ]; then
                 exit 1
@@ -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 \
-        "