diff options
Diffstat (limited to 'meta/recipes-connectivity')
38 files changed, 161 insertions, 87 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index b266ea414..9f83d8dad 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -16,7 +16,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" -RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ @@ -37,11 +37,14 @@ EXTRA_OECONF = "--with-distro=debian \ --disable-python \ --disable-doxygen-doc" -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-utils libavahi-ui avahi-ui-utils" +PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" +FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \ + ${includedir}/avahi-ui/* \ + ${libdir}/pkgconfig/avahi-ui.pc" FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \ @@ -59,9 +62,13 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \ + ${bindir}/avahi-discover-standalone \ ${datadir}/applications \ ${datadir}/avahi/interfaces" +RRECOMMENDS_avahi-dev = "gettext-dev expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" +RRECOMMENDS_avahi-dev[nodeprrecs] = 1 + CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb index b2e9efb7f..6e034b050 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r0" +PR = "r2" EXTRA_OECONF += "--disable-gtk3" diff --git a/meta/recipes-connectivity/bind/bind-9.7.2-P2/conf.patch b/meta/recipes-connectivity/bind/bind-9.7.2-P3/conf.patch index deeb43729..deeb43729 100644 --- a/meta/recipes-connectivity/bind/bind-9.7.2-P2/conf.patch +++ b/meta/recipes-connectivity/bind/bind-9.7.2-P3/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.7.2-P2/cross-build-fix.patch b/meta/recipes-connectivity/bind/bind-9.7.2-P3/cross-build-fix.patch index 4978379bf..4978379bf 100644 --- a/meta/recipes-connectivity/bind/bind-9.7.2-P2/cross-build-fix.patch +++ b/meta/recipes-connectivity/bind/bind-9.7.2-P3/cross-build-fix.patch diff --git a/meta/recipes-connectivity/bind/bind_9.7.2-P2.bb b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb index 6aaa6ffdc..675ab1798 100644 --- a/meta/recipes-connectivity/bind/bind_9.7.2-P2.bb +++ b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb @@ -13,6 +13,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${PN}-${PV}.tar.gz \ file://cross-build-fix.patch \ " +SRC_URI[md5sum] = "b4537cbae38b2daef36775bf49f33db9" +SRC_URI[sha256sum] = "cd945f4766be664f4528ec065df626ad3624481695316ec8e13ad272f4abfb7e" + # --enable-exportlib is necessary for building dhcp EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \ --disable-devpoll --disable-epoll \ @@ -50,5 +53,3 @@ CONFFILES_${PN} = " \ ${sysconfdir}/bind/db.root \ " -SRC_URI[md5sum] = "e74de6ec9c2cd27576794c873bd85f4a" -SRC_URI[sha256sum] = "e6d5938184066fc793c28ff975e09e9721116aede2a2d6d93b1be5e8654a5c8a" diff --git a/meta/recipes-connectivity/bluez/bluez4-4.79/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf index ca5e9e4f2..ca5e9e4f2 100644 --- a/meta/recipes-connectivity/bluez/bluez4-4.79/bluetooth.conf +++ b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf diff --git a/meta/recipes-connectivity/bluez/bluez4-4.79/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch index 91c802bc4..91c802bc4 100644 --- a/meta/recipes-connectivity/bluez/bluez4-4.79/fix-dfutool-usb-declaration-mismatch.patch +++ b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch diff --git a/meta/recipes-connectivity/bluez/bluez4-4.79/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch index ed15fd5a1..ed15fd5a1 100644 --- a/meta/recipes-connectivity/bluez/bluez4-4.79/hid2hci_usb_init.patch +++ b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch diff --git a/meta/recipes-connectivity/bluez/bluez4-4.79/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch index 474423670..474423670 100644 --- a/meta/recipes-connectivity/bluez/bluez4-4.79/sbc-thumb.patch +++ b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch diff --git a/meta/recipes-connectivity/bluez/bluez4_4.79.bb b/meta/recipes-connectivity/bluez/bluez4_4.82.bb index 54b9fc18a..9189a585f 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.79.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.82.bb @@ -25,8 +25,8 @@ SRC_URI = "\ file://bluetooth.conf \ " -SRC_URI[md5sum] = "b3afea97981c1c6be04438930c57d891" -SRC_URI[sha256sum] = "1b486824e486e7a7a17ebcbce99a417e724f42ebb17f9fe574bc4737fda6b7db" +SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f" +SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d" S = "${WORKDIR}/bluez-${PV}" inherit autotools diff --git a/meta/recipes-connectivity/connman/connman-0.63/connman b/meta/recipes-connectivity/connman/connman-0.65/connman index f01bf371c..f01bf371c 100644 --- a/meta/recipes-connectivity/connman/connman-0.63/connman +++ b/meta/recipes-connectivity/connman/connman-0.65/connman diff --git a/meta/recipes-connectivity/connman/connman-0.63/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch index 100af0367..100af0367 100644 --- a/meta/recipes-connectivity/connman/connman-0.63/dbusperms.patch +++ b/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch diff --git a/meta/recipes-connectivity/connman/connman-0.63/fix-shutdown-ap-disconnect.patch b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch index a0ad0991d..a0ad0991d 100644 --- a/meta/recipes-connectivity/connman/connman-0.63/fix-shutdown-ap-disconnect.patch +++ b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop b/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop deleted file mode 100644 index 83d96ee67..000000000 --- a/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Connection Manager -Comment=Connection Manager applet -Icon=stock_internet -Exec=connman-applet -Terminal=false -Type=Application -Categories=Network;GTK; - diff --git a/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch new file mode 100644 index 000000000..2a8cff359 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch @@ -0,0 +1,42 @@ +diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in +--- connman-gnome-0.5-orig/po/POTFILES.in 2010-12-16 16:03:29.000000000 +0800 ++++ connman-gnome-0.5/po/POTFILES.in 2010-12-17 10:27:17.000000000 +0800 +@@ -4,4 +4,3 @@ + properties/advanced.c + properties/ethernet.c + properties/wifi.c +-properties/connman-properties.desktop.in +diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am +--- connman-gnome-0.5-orig/properties/Makefile.am 2010-12-16 16:03:29.000000000 +0800 ++++ connman-gnome-0.5/properties/Makefile.am 2010-12-17 10:27:09.000000000 +0800 +@@ -17,16 +17,6 @@ + + INCLUDES = -I$(top_srcdir)/common + +-desktopdir = $(datadir)/applications +- +-desktop_in_files = connman-properties.desktop.in +- +-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +- + @INTLTOOL_DESKTOP_RULE@ + +-CLEANFILES = $(desktop_DATA) +- +-EXTRA_DIST = $(desktop_in_files) +- + MAINTAINERCLEANFILES = Makefile.in +diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in +--- connman-gnome-0.5-orig/properties/connman-properties.desktop.in 2010-12-16 16:03:29.000000000 +0800 ++++ connman-gnome-0.5/properties/connman-properties.desktop.in 1970-01-01 08:00:00.000000000 +0800 +@@ -1,10 +0,0 @@ +-[Desktop Entry] +-Encoding=UTF-8 +-_Name=Connection Management +-_Comment=Configure connection management +-Icon=stock_internet +-Exec=connman-properties +-Terminal=false +-Type=Application +-Categories=Settings; +-OnlyShowIn=GNOME; diff --git a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch new file mode 100644 index 000000000..942cfc883 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch @@ -0,0 +1,36 @@ +diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h +--- connman-gnome-0.5-orig/common/connman-dbus.h 2010-12-30 09:45:03.312043457 +0800 ++++ connman-gnome-0.5/common/connman-dbus.h 2010-12-30 09:45:33.978499439 +0800 +@@ -22,7 +22,7 @@ + #include <dbus/dbus-glib.h> + #include <gtk/gtk.h> + +-#define CONNMAN_SERVICE "org.moblin.connman" ++#define CONNMAN_SERVICE "net.connman" + + #define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error" + #define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent" +diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c +--- connman-gnome-0.5-orig/common/instance.c 2010-12-30 09:45:03.316085542 +0800 ++++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800 +@@ -29,7 +29,7 @@ + + #include "instance.h" + +-#define CONNMAN_SERVICE "org.moblin.connman" ++#define CONNMAN_SERVICE "net.connman" + #define CONNMAN_INSTANCE CONNMAN_SERVICE ".Instance" + + static DBusGConnection *connection; +diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml +--- connman-gnome-0.5-orig/common/instance.xml 2010-12-30 09:45:03.312043457 +0800 ++++ connman-gnome-0.5/common/instance.xml 2010-12-30 09:45:49.868372780 +0800 +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="UTF-8" ?> + + <node name="/"> +- <interface name="org.moblin.connman.Instance"> ++ <interface name="net.connman.Instance"> + <method name="Present"> + </method> + </interface> diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb index 4729c5dfd..3b7d1b8f5 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb @@ -6,20 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \ file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a" DEPENDS = "gtk+ dbus" -PR = "r1" +PR = "r3" RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy" SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \ file://connman-gnome.patch \ - file://connman-applet.desktop" + file://remove-connman-property-desktop-file.patch \ + file://service_name_update.patch" SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716" SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c" inherit autotools gtk-icon-cache - -do_install_append() { - install -d ${D}${datadir}/applications/ - install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/ -} diff --git a/meta/recipes-connectivity/connman/connman_0.63.bb b/meta/recipes-connectivity/connman/connman_0.65.bb index e99f7840a..0b077e1d9 100644 --- a/meta/recipes-connectivity/connman/connman_0.63.bb +++ b/meta/recipes-connectivity/connman/connman_0.65.bb @@ -24,5 +24,5 @@ SRC_URI = "\ file://connman \ " -SRC_URI[md5sum] = "11616a4fa1d03f96f0739730645f7c53" -SRC_URI[sha256sum] = "e2a57376cdcd42b3876262da6959aa58428941e0eb2df9a4724cd3f1af934492" +SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a" +SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3" diff --git a/meta/recipes-connectivity/gsm/gsmd.inc b/meta/recipes-connectivity/gsm/gsmd.inc index 981818863..b2aebb15f 100644 --- a/meta/recipes-connectivity/gsm/gsmd.inc +++ b/meta/recipes-connectivity/gsm/gsmd.inc @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" -PV = "0.1+svnr${SRCREV}" -PR = "r0" +PV = "0.1+svnr${SRCPV}" +PR = "r2" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://fix_machine_init.patch;patch=1 \ @@ -19,10 +19,8 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d -# handle update-rc.d RDEPENDS manually, we don't need it on -# anything but gsmd -RDEPENDS_append = "" +UPDATERCPN = "gsmd" INITSCRIPT_NAME = "gsmd" INITSCRIPT_PARAMS = "defaults 35" diff --git a/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb index 9beb46ed1..9f2d717c7 100644 --- a/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb +++ b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb @@ -23,7 +23,7 @@ FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" gupnp_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ - install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } diff --git a/meta/recipes-connectivity/gypsy/gypsy_svn.bb b/meta/recipes-connectivity/gypsy/gypsy_svn.bb index ac1b6bc12..2e9840afd 100644 --- a/meta/recipes-connectivity/gypsy/gypsy_svn.bb +++ b/meta/recipes-connectivity/gypsy/gypsy_svn.bb @@ -2,7 +2,7 @@ require gypsy.inc DEFAULT_PREFERENCE = "-1" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" S = "${WORKDIR}/${PN}" SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb index 0cdb05752..4c94d2aea 100644 --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb @@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "avahi" -RDEPENDS = "avahi-daemon" -PR = "r1" +RDEPENDS_${PN} = "avahi-daemon" +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" diff --git a/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch b/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch new file mode 100644 index 000000000..21315206f --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch @@ -0,0 +1,13 @@ +diff --git a/configure.in b/configure.in +index f5d54fb..c105988 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_PREREQ([2.66]) ++AC_PREREQ([2.65]) + AC_INIT([libnfsidmap],[0.24],[linux-nfs@vger.kernel.org]) + AC_CONFIG_SRCDIR([nfsidmap.h]) + AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.24.bb index 3077ea2ee..101ecab1c 100644 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.24.bb @@ -6,10 +6,12 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=d9c6a2a0ca6017fda7cd905ed2739b37" PR = "r0" -SRC_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${PV}.tar.gz" +SRC_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${PV}.tar.gz \ + file://fix-ac-prereq.patch \ + " -SRC_URI[md5sum] = "28f3ece648c1dc5d25e8d623d55f8bd6" -SRC_URI[sha256sum] = "69d20cfc6be6bf7ede2a55da687dc6853f2db6c8ef826a0b5e3235e7d46f4051" +SRC_URI[md5sum] = "d71a1ee9881d5b5814ff3ec41256937d" +SRC_URI[sha256sum] = "59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47" inherit autotools diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb index d86bd0f73..b456474f9 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" -RDEPENDS = "portmap" -RRECOMMENDS = "kernel-module-nfsd" +RDEPENDS_${PN} = "portmap" +RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r0" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \ diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 5abc92ef5..908967000 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ inherit autotools pkgconfig update-rc.d -DEPENDS = "dbus glib-2.0" +DEPENDS = "dbus glib-2.0 udev" INITSCRIPT_NAME = "ofono" INITSCRIPT_PARAMS = "defaults 22" diff --git a/meta/recipes-connectivity/ofono/ofono_0.33.bb b/meta/recipes-connectivity/ofono/ofono_0.33.bb deleted file mode 100644 index 1d9a8afb7..000000000 --- a/meta/recipes-connectivity/ofono/ofono_0.33.bb +++ /dev/null @@ -1,9 +0,0 @@ -require ofono.inc - -PR = "r0" - -SRC_URI = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \ - file://ofono" - -SRC_URI[md5sum] = "001160996d0c00e7b8da575e1fff1bd1" -SRC_URI[sha256sum] = "1b7ce568e32518f404231389150cea5d4abfb19e09eaa6e7a280be2e5186c82f" diff --git a/meta/recipes-connectivity/ofono/ofono_0.37.bb b/meta/recipes-connectivity/ofono/ofono_0.37.bb new file mode 100644 index 000000000..1c1c50111 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono_0.37.bb @@ -0,0 +1,9 @@ +require ofono.inc + +PR = "r0" + +SRC_URI = "http://www.kernel.org/pub/linux/network/ofono/${P}.tar.bz2 \ + file://ofono" + +SRC_URI[md5sum] = "fa9a6f91506db2ac5bf313ff0bde65f3" +SRC_URI[sha256sum] = "0ac71d8a846d564ef6940c47bcc410b76df750aadf7903cb56876d991275f6db" diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/valgrind.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/valgrind.patch deleted file mode 100644 index e9f86eabb..000000000 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/valgrind.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: openssl-0.9.8k/crypto/rand/md_rand.c -=================================================================== ---- openssl-0.9.8k.orig/crypto/rand/md_rand.c 2008-09-16 13:50:05.000000000 +0200 -+++ openssl-0.9.8k/crypto/rand/md_rand.c 2009-07-19 11:36:05.000000000 +0200 -@@ -477,8 +477,10 @@ - MD_Update(&m,local_md,MD_DIGEST_LENGTH); - MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); - #ifndef PURIFY -+#if 0 /* Don't add uninitialised data. */ - MD_Update(&m,buf,j); /* purify complains */ - #endif -+#endif - k=(st_idx+MD_DIGEST_LENGTH/2)-st_num; - if (k > 0) - { diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb index 3ae6bf456..283b82add 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb @@ -13,7 +13,6 @@ SRC_URI += "file://debian/ca.patch \ file://debian/no-symbolic.patch \ file://debian/pic.patch \ file://debian/pkg-config.patch \ - file://debian/valgrind.patch \ file://debian/rc4-amd64.patch \ file://debian/rehash-crt.patch \ file://debian/rehash_pod.patch \ diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index 79805614d..aa3684a44 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb @@ -1,8 +1,8 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp" -RDEPENDS = "ppp" -PR = "r5" +RDEPENDS_${PN} = "ppp" +PR = "r6" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb index 16d88dc86..cb8aaaf53 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb @@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash" -RDEPENDS = "bash" -PR = "r1" +RDEPENDS_${PN} = "bash" +PR = "r0" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" -SRC_URI[md5sum] = "15faef2aba7b99782f3b0b8b5d30f80a" -SRC_URI[sha256sum] = "17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae" +SRC_URI[md5sum] = "b226e02704a545238eac5ef70f6d3c4c" +SRC_URI[sha256sum] = "4b07832680b82d401a76132cd6bbe13961231235287f2662a6604edbcac82bb1" + do_compile () { : diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.5.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb index 17b6f86ad..63ada04db 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.5.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb @@ -7,8 +7,8 @@ PR = "r0" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz" -SRC_URI[md5sum] = "178de3965614a3a59123e33ec1b1e8a6" -SRC_URI[sha256sum] = "ad6e12a062c8ebe1f1fd20065acc214b9395b3d766bf2a122b12c5f811007735" +SRC_URI[md5sum] = "db997b1575e9186887caf211c0b94dd9" +SRC_URI[sha256sum] = "76a38a64d1b7fbaa6e1aaf6a9f8b898840c551aea5d9121bdcb35fdbb66c5877" LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.6.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb index f5222525d..cbc7234ab 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.6.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb @@ -9,8 +9,8 @@ PR = "r0" SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" -SRC_URI[md5sum] = "0efe17425cdc3490714947ff68003bf6" -SRC_URI[sha256sum] = "fc05a1780499eab3b168b1826e2fe18dbe4bea3576ea0ff2b548b063336c61f5" +SRC_URI[md5sum] = "5ee3aa5c6e1112922b11711e6a209331" +SRC_URI[sha256sum] = "b65df4f8ebdf1039e1f1e406f53cc7b6106fab6c4d8e784e360709f8d85df0c3" inherit autotools pkgconfig diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.7.0.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.7.1.bb index de28a0837..f5c27454f 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.7.0.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.7.1.bb @@ -40,5 +40,5 @@ FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" -SRC_URI[md5sum] = "cf6a3f48bb493312b537c9b6b33c0a72" -SRC_URI[sha256sum] = "ffe0da124418fa4f8c3a9049f7e13febb1ca5e9be92229cd5ab12238f4fda824" +SRC_URI[md5sum] = "9688a3f75c080eaa2dbf6b4d75876dc9" +SRC_URI[sha256sum] = "c58f07ee801b023bc5d5a8ec0fce49058a0372b6727e6516fb56d100dacd07fe" diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.18.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb index 8d7c766b9..aefde8c89 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.18.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb @@ -8,12 +8,12 @@ RDEPENDS_${PN} += "python-dbus" SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " -PR = "r1" +PR = "r0" inherit autotools -SRC_URI[md5sum] = "51da78a77681b0652d9b4ca941da0658" -SRC_URI[sha256sum] = "f9f5c260188e9e27af9152bfc6d622cc5c0ea48d63d5fa9985abbdd69fda0e87" +SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017" +SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376" FILES_${PN} += "\ ${libdir}/python*/site-packages/telepathy/*.py \ diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc index 78ce914c3..7865b8fdc 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc @@ -20,8 +20,9 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " -FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" +FILES_wpa-supplicant-passphrase = "${sbindir}/wpa_passphrase" +FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" +FILES_${PN} += " ${datadir}/dbus-1/system-services/* do_configure () { install -m 0755 ${WORKDIR}/defconfig-gnutls .config @@ -29,7 +30,7 @@ do_configure () { export EXTRA_CFLAGS = "${CFLAGS}" do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + unset CFLAGS CPPFLAGS CXXFLAGS oe_runmake } @@ -56,6 +57,9 @@ do_install () { install -d ${D}/${sysconfdir}/dbus-1/system.d install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d + install -d ${D}/${datadir}/dbus-1/system-services + sed -i -e s:${base_sbindir}:${sbindir}:g ${S}/dbus/*.service + install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb index 2d7729c8d..87baf336d 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb @@ -1,6 +1,6 @@ require wpa-supplicant-0.7.inc -PR = "r0" +PR = "r3" SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443" |