From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/avahi/avahi-python_0.6.21.bb | 19 ++++ recipes/avahi/avahi-ui_0.6.21.bb | 21 +++++ recipes/avahi/avahi.inc | 115 +++++++++++++++++++++++ recipes/avahi/avahi_0.6.19.bb | 3 + recipes/avahi/avahi_0.6.20.bb | 3 + recipes/avahi/avahi_0.6.21.bb | 6 ++ recipes/avahi/avahi_0.6.22.bb | 6 ++ recipes/avahi/avahi_0.6.23.bb | 7 ++ recipes/avahi/avahi_0.6.24.bb | 5 + recipes/avahi/files/00avahi-autoipd | 10 ++ recipes/avahi/files/99avahi-autoipd | 10 ++ recipes/avahi/files/avr32-ipv6-fix.patch | 42 +++++++++ recipes/avahi/files/configure-check-pymod.patch | 27 ++++++ recipes/avahi/files/dbus-pre-1.1.1-support.patch | 17 ++++ recipes/avahi/mango-lassi_git.bb | 13 +++ 15 files changed, 304 insertions(+) create mode 100644 recipes/avahi/avahi-python_0.6.21.bb create mode 100644 recipes/avahi/avahi-ui_0.6.21.bb create mode 100644 recipes/avahi/avahi.inc create mode 100644 recipes/avahi/avahi_0.6.19.bb create mode 100644 recipes/avahi/avahi_0.6.20.bb create mode 100644 recipes/avahi/avahi_0.6.21.bb create mode 100644 recipes/avahi/avahi_0.6.22.bb create mode 100644 recipes/avahi/avahi_0.6.23.bb create mode 100644 recipes/avahi/avahi_0.6.24.bb create mode 100755 recipes/avahi/files/00avahi-autoipd create mode 100755 recipes/avahi/files/99avahi-autoipd create mode 100644 recipes/avahi/files/avr32-ipv6-fix.patch create mode 100644 recipes/avahi/files/configure-check-pymod.patch create mode 100644 recipes/avahi/files/dbus-pre-1.1.1-support.patch create mode 100644 recipes/avahi/mango-lassi_git.bb (limited to 'recipes/avahi') diff --git a/recipes/avahi/avahi-python_0.6.21.bb b/recipes/avahi/avahi-python_0.6.21.bb new file mode 100644 index 0000000000..639f1de34e --- /dev/null +++ b/recipes/avahi/avahi-python_0.6.21.bb @@ -0,0 +1,19 @@ +require avahi.inc + +PR = "r8" + +# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built +FILES_avahi-discover = "" + +PROVIDES = "avahi" +DEPENDS += "python-native" + +SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \ + file://configure-check-pymod.patch;patch=1" +S = "${WORKDIR}/avahi-${PV}" + +RDEPENDS_avahi-discover = "python-avahi python-pygtk" +RDEPENDS_python-avahi = "python-dbus" +PACKAGES =+ "python-avahi" + +AVAHI_PYTHON = "--enable-python" diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb new file mode 100644 index 0000000000..4323b49640 --- /dev/null +++ b/recipes/avahi/avahi-ui_0.6.21.bb @@ -0,0 +1,21 @@ +require avahi.inc + +PR = "r8" + +DEPENDS += "avahi gtk+" + +SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1" +AVAHI_GTK = "--enable-gtk" + +S = "${WORKDIR}/avahi-${PV}" + +do_stage() { + install -d ${STAGING_INCDIR}/avahi-ui + cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/ + oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR} +} + +PACKAGES = "${PN} ${PN}-dbg" + +FILES_${PN} = "${libdir}/libavahi-ui*.so.*" +FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc new file mode 100644 index 0000000000..cbd6ac3d03 --- /dev/null +++ b/recipes/avahi/avahi.inc @@ -0,0 +1,115 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +AUTHOR = "Lennart Poettering " +HOMEPAGE = "http://avahi.org" +SECTION = "network" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" + +# uclibc has no nss +RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" +RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d" +RDEPENDS_avahi-autoipd += "update-rc.d" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ + file://00avahi-autoipd file://99avahi-autoipd" + +inherit autotools pkgconfig update-rc.d +# handle update-rc.d RDEPENDS manually, we don't need it on +# anything but avahi-daemon and avahi-autoipd +RDEPENDS_append = "" + +# TODO: build and enable all the extra stuff avahi offers +EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" +AVAHI_PYTHON = "--disable-python" +AVAHI_GTK = "--disable-gtk" + +LDFLAGS_append_linux-uclibc = " -lintl" +LDFLAGS_append_linux-uclibcgnueabi = " -lintl " +LDFLAGS_append_uclinux-uclibc = " -lintl" + +PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action \ + ${sysconfdir}/udhcpc.d/*avahi-autoipd" +FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*" +FILES_avahi-discover = "${bindir}/avahi-discover \ + ${datadir}/applications/avahi-discover.desktop \ + ${datadir}/avahi/interfaces/avahi-discover.glade" +FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ + ${datadir}/avahi/interfaces/avahi-discover.glade" +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +# At the time the postinst runs, dbus might not be setup so only restart if running + +pkg_postinst_avahi-daemon () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep "^avahi:" /etc/group > /dev/null || addgroup avahi + grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + + DBUSPID="/var/run/dbus/pid" + if [ -f $DBUSPID ]; then + if ps `cat $DBUSPID` > /dev/null; then + /etc/init.d/dbus-1 force-reload + fi + fi +} + +pkg_postinst_avahi-autoipd () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd + grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} + +pkg_postrm_avahi-autoipd () { + deluser avahi-autoipd || true + delgroup avahi-autoipd || true +} + +do_install() { + autotools_do_install + install -d ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d +} + +do_stage() { + autotools_stage_all +} diff --git a/recipes/avahi/avahi_0.6.19.bb b/recipes/avahi/avahi_0.6.19.bb new file mode 100644 index 0000000000..f3e9c6bdee --- /dev/null +++ b/recipes/avahi/avahi_0.6.19.bb @@ -0,0 +1,3 @@ +require avahi.inc + +PR = "r10" diff --git a/recipes/avahi/avahi_0.6.20.bb b/recipes/avahi/avahi_0.6.20.bb new file mode 100644 index 0000000000..f3e9c6bdee --- /dev/null +++ b/recipes/avahi/avahi_0.6.20.bb @@ -0,0 +1,3 @@ +require avahi.inc + +PR = "r10" diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb new file mode 100644 index 0000000000..04f92f16d5 --- /dev/null +++ b/recipes/avahi/avahi_0.6.21.bb @@ -0,0 +1,6 @@ +require avahi.inc + +PR = "r10" + +SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1" +SRC_URI += "file://avr32-ipv6-fix.patch;patch=1" diff --git a/recipes/avahi/avahi_0.6.22.bb b/recipes/avahi/avahi_0.6.22.bb new file mode 100644 index 0000000000..f1f82a053a --- /dev/null +++ b/recipes/avahi/avahi_0.6.22.bb @@ -0,0 +1,6 @@ +require avahi.inc + +DEPENDS += "intltool-native" +PR = "r10" + +PACKAGES =+ "libavahi-gobject" diff --git a/recipes/avahi/avahi_0.6.23.bb b/recipes/avahi/avahi_0.6.23.bb new file mode 100644 index 0000000000..61a62a54a4 --- /dev/null +++ b/recipes/avahi/avahi_0.6.23.bb @@ -0,0 +1,7 @@ +require avahi.inc + +PR = "r1" + +DEPENDS += "intltool-native" + +PACKAGES =+ "libavahi-gobject" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb new file mode 100644 index 0000000000..15f56ffa95 --- /dev/null +++ b/recipes/avahi/avahi_0.6.24.bb @@ -0,0 +1,5 @@ +require avahi.inc + +DEPENDS += "intltool-native" + +PACKAGES =+ "libavahi-gobject" diff --git a/recipes/avahi/files/00avahi-autoipd b/recipes/avahi/files/00avahi-autoipd new file mode 100755 index 0000000000..a0ab814603 --- /dev/null +++ b/recipes/avahi/files/00avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + deconfig|renew|bound) + /usr/sbin/avahi-autoipd -k $interface 2> /dev/null + ;; +esac diff --git a/recipes/avahi/files/99avahi-autoipd b/recipes/avahi/files/99avahi-autoipd new file mode 100755 index 0000000000..234cdaa3eb --- /dev/null +++ b/recipes/avahi/files/99avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + leasefail) + /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null + ;; +esac diff --git a/recipes/avahi/files/avr32-ipv6-fix.patch b/recipes/avahi/files/avr32-ipv6-fix.patch new file mode 100644 index 0000000000..f0710a1002 --- /dev/null +++ b/recipes/avahi/files/avr32-ipv6-fix.patch @@ -0,0 +1,42 @@ +--- /tmp/socket.c 2007-09-14 14:03:01.395330465 +0200 ++++ avahi-0.6.21/avahi-core/socket.c 2007-09-14 14:08:42.081140297 +0200 +@@ -66,6 +66,39 @@ + #endif + #endif + ++#define IPV6_ADDRFORM 1 ++#define IPV6_2292PKTINFO 2 ++#define IPV6_2292HOPOPTS 3 ++#define IPV6_2292DSTOPTS 4 ++#define IPV6_2292RTHDR 5 ++#define IPV6_2292PKTOPTIONS 6 ++#define IPV6_CHECKSUM 7 ++#define IPV6_2292HOPLIMIT 8 ++#define IPV6_NEXTHOP 9 ++#define IPV6_AUTHHDR 10 /* obsolete */ ++#define IPV6_FLOWINFO 11 ++ ++#define IPV6_UNICAST_HOPS 16 ++#define IPV6_MULTICAST_IF 17 ++#define IPV6_MULTICAST_HOPS 18 ++#define IPV6_MULTICAST_LOOP 19 ++#define IPV6_ADD_MEMBERSHIP 20 ++#define IPV6_DROP_MEMBERSHIP 21 ++#define IPV6_ROUTER_ALERT 22 ++#define IPV6_MTU_DISCOVER 23 ++#define IPV6_MTU 24 ++#define IPV6_RECVERR 25 ++#define IPV6_V6ONLY 26 ++#define IPV6_JOIN_ANYCAST 27 ++#define IPV6_LEAVE_ANYCAST 28 ++ ++/* IPV6_MTU_DISCOVER values */ ++#define IPV6_PMTUDISC_DONT 0 ++#define IPV6_PMTUDISC_WANT 1 ++#define IPV6_PMTUDISC_DO 2 ++#define IPV6_PMTUDISC_PROBE 3 ++ ++ + static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) { + assert(ret_sa); + diff --git a/recipes/avahi/files/configure-check-pymod.patch b/recipes/avahi/files/configure-check-pymod.patch new file mode 100644 index 0000000000..e2df5d6fc0 --- /dev/null +++ b/recipes/avahi/files/configure-check-pymod.patch @@ -0,0 +1,27 @@ +Index: avahi-0.6.21/configure.ac +=================================================================== +--- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200 ++++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200 +@@ -700,10 +700,6 @@ + esac], + [HAVE_PYGTK=yes]) + +- if test "x$HAVE_PYGTK" = "xyes" ; then +- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)]) +- fi +- + + if test "x$HAVE_DBUS" = "xyes" ; then + AC_ARG_ENABLE(python-dbus, +@@ -715,11 +711,6 @@ + esac], + [HAVE_PYTHON_DBUS=yes]) + +- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then +- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) +- fi +- +- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) + if test "x$HAVE_GDBM" = "xyes"; then + AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) + fi diff --git a/recipes/avahi/files/dbus-pre-1.1.1-support.patch b/recipes/avahi/files/dbus-pre-1.1.1-support.patch new file mode 100644 index 0000000000..a92fb82710 --- /dev/null +++ b/recipes/avahi/files/dbus-pre-1.1.1-support.patch @@ -0,0 +1,17 @@ +http://avahi.org/changeset/1518 + +Index: trunk/avahi-common/dbus-watch-glue.c +=================================================================== +--- trunk/avahi-common/dbus-watch-glue.c (revision 1507) ++++ trunk/avahi-common/dbus-watch-glue.c (revision 1518) +@@ -135,5 +135,9 @@ + if (!(avahi_watch = poll_api->watch_new( + poll_api, ++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) + dbus_watch_get_unix_fd(dbus_watch), ++#else ++ dbus_watch_get_fd(dbus_watch), ++#endif + translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)), + watch_callback, + diff --git a/recipes/avahi/mango-lassi_git.bb b/recipes/avahi/mango-lassi_git.bb new file mode 100644 index 0000000000..c2250d8781 --- /dev/null +++ b/recipes/avahi/mango-lassi_git.bb @@ -0,0 +1,13 @@ +ESCRIPTION = "Input sharing, the avahi way" +DEPENDS = "avahi-ui libglade libnotify" + +SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" +PV = "0.0+${PR}+gitr${SRCREV}" +PR = "r1" + +SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" + +S = "${WORKDIR}/git" + +inherit autotools + -- cgit 1.2.3-korg