diff options
Diffstat (limited to 'packages/networkmanager/networkmanager.inc')
| -rw-r--r-- | packages/networkmanager/networkmanager.inc | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc index 2a0f28753f..ead854ca58 100644 --- a/packages/networkmanager/networkmanager.inc +++ b/packages/networkmanager/networkmanager.inc @@ -3,19 +3,18 @@ SECTION = "net/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools" -RDEPENDS = "wpa-supplicant iproute2 dhcdbd" -PR = "r1" +DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" +RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client dhcdbd" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ - file://NetworkManager \ + file://25NetworkManager \ file://99_networkmanager" S = "${WORKDIR}/NetworkManager-${PV}/" EXTRA_OECONF = " \ - --with-gnome \ + --without-gnome \ --with-distro=debian \ --without-gcrypt \ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ @@ -28,26 +27,30 @@ do_stage () { autotools_stage_all } -do_install () { - oe_libinstall -C libnm-util libnm-util ${D}/usr/lib - oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib - - oe_runmake -C src DESTDIR="${D}" install - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles - install -d ${D}/etc/init.d/ - install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ - install -d ${D}/${datadir}/ +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 + # Test binaries + install -d ${D}/usr/bin + install -m 0755 ${S}/test/.libs/nm-tool ${D}/usr/bin + install -m 0755 ${S}/test/.libs/libnm_glib_test ${D}/usr/bin + install -m 0755 ${S}/test/.libs/nminfotest ${D}/usr/bin + install -m 0755 ${S}/test/.libs/nm-online ${D}/usr/bin + install -m 0755 ${S}/test/.libs/nm-supplicant-test ${D}/usr/bin + install -m 0755 ${S}/test/.libs/nmtestdevices ${D}/usr/bin } pkg_postinst_${PN} () { -if [ "x$D" != "x" ]; then - exit 1 -fi -/etc/init.d/populate-volatile.sh update + if [ "x$D" != "x" ]; then + exit 1 + fi + /etc/init.d/populate-volatile.sh update } -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" FILES_libnmutil += "${libdir}/libnm-util.so.*" FILES_libnmglib += "${libdir}/libnm_glib.so.*" @@ -62,3 +65,9 @@ FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \ FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd " +FILES_${PN}-tests = "${bindir}/nm-tool \ + ${bindir}/libnm_glib_test \ + ${bindir}/nminfotest \ + ${bindir}/nm-online \ + ${bindir}/nm-supplicant \ + ${bindir}/nm-testdevices" |