[oe-commits] org.oe.dreambox avahi: backport from .dev
tmbinc commit
openembedded-commits at lists.openembedded.org
Sun Nov 25 18:36:14 UTC 2007
avahi: backport from .dev
Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 7069315932d8d84f2f7a97441dac2050a4a7bb9e
ViewMTN: http://monotone.openembedded.org/revision/info/7069315932d8d84f2f7a97441dac2050a4a7bb9e
Files:
1
packages/avahi/avahi_0.6.10.bb
packages/avahi/avahi_0.6.11.bb
packages/avahi/avahi_0.6.12.bb
packages/avahi/avahi_0.6.13.bb
packages/avahi/avahi_0.6.5.bb
packages/avahi/avahi_0.6.8.bb
packages/avahi/files
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi-ui_0.6.21.bb
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/avahi/files/00avahi-autoipd
packages/avahi/files/99avahi-autoipd
packages/avahi/files/configure-check-pymod.patch
packages/avahi/files/dbus-pre-1.1.1-support.patch
packages/avahi/mango-lassi_git.bb
mtn:execute
true
Diffs:
#
# mt diff -r335eff19087bb711ff97a469ddb3eedf647a0f10 -r7069315932d8d84f2f7a97441dac2050a4a7bb9e
#
#
#
# delete "packages/avahi/avahi_0.6.10.bb"
#
# delete "packages/avahi/avahi_0.6.11.bb"
#
# delete "packages/avahi/avahi_0.6.12.bb"
#
# delete "packages/avahi/avahi_0.6.13.bb"
#
# delete "packages/avahi/avahi_0.6.5.bb"
#
# delete "packages/avahi/avahi_0.6.8.bb"
#
# add_dir "packages/avahi/files"
#
# add_file "packages/avahi/avahi-python_0.6.21.bb"
# content [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
#
# add_file "packages/avahi/avahi-ui_0.6.21.bb"
# content [cc3527f807c63548870af63770d65b1f11b377be]
#
# add_file "packages/avahi/avahi.inc"
# content [d2bd349453b3292c6f4dc32315a13bd9ef009dde]
#
# add_file "packages/avahi/avahi_0.6.19.bb"
# content [80d86f2e2b46546f508edb4d277fa1ef7bceb3b7]
#
# add_file "packages/avahi/avahi_0.6.20.bb"
# content [617eee50014403513ca14be25fd16c61c19bac14]
#
# add_file "packages/avahi/avahi_0.6.21.bb"
# content [20c7a5456d5de04217ea332f01c45d2027ebe4b7]
#
# add_file "packages/avahi/files/00avahi-autoipd"
# content [27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e]
#
# add_file "packages/avahi/files/99avahi-autoipd"
# content [a756b42982b7e319c2058b888bf265cd8e428d1a]
#
# add_file "packages/avahi/files/configure-check-pymod.patch"
# content [fb42206ea64396e348587b85e86e397a4a94004a]
#
# add_file "packages/avahi/files/dbus-pre-1.1.1-support.patch"
# content [d8bb507a275c57686d44908121501c39fda4d06c]
#
# add_file "packages/avahi/mango-lassi_git.bb"
# content [3a59c1e0e88776b7c84accb2784335ec0f085416]
#
# set "packages/avahi/files/00avahi-autoipd"
# attr "mtn:execute"
# value "true"
#
# set "packages/avahi/files/99avahi-autoipd"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/avahi/avahi-python_0.6.21.bb 91ec6e3aec765ad2c28ed09baa8424126d0b5baa
+++ packages/avahi/avahi-python_0.6.21.bb 91ec6e3aec765ad2c28ed09baa8424126d0b5baa
@@ -0,0 +1,18 @@
+require avahi.inc
+PR = "r0"
+
+# 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"
============================================================
--- packages/avahi/avahi-ui_0.6.21.bb cc3527f807c63548870af63770d65b1f11b377be
+++ packages/avahi/avahi-ui_0.6.21.bb cc3527f807c63548870af63770d65b1f11b377be
@@ -0,0 +1,20 @@
+require avahi.inc
+PR = "r0"
+
+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*"
============================================================
--- packages/avahi/avahi.inc d2bd349453b3292c6f4dc32315a13bd9ef009dde
+++ packages/avahi/avahi.inc d2bd349453b3292c6f4dc32315a13bd9ef009dde
@@ -0,0 +1,111 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+AUTHOR = "Lennart Poettering <lennart at poettering.net>"
+HOMEPAGE = "http://avahi.org"
+SECTION = "network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r5"
+
+DEPENDS = "expat 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-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+AVAHI_PYTHON = "--disable-python"
+AVAHI_GTK = "--disable-gtk"
+
+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_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 -D -S -h /var/run/avahi-daemon -H avahi -G avahi -g Avahi
+
+ DBUSPID=`pidof dbus-daemon`
+
+ if [ "x$DBUSPID" != "x" ]; then
+ /etc/init.d/dbus-1 force-reload
+ 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 -D -S -h /var/lib/avahi-autoipd -H avahi-autoipd -G 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
+}
============================================================
--- packages/avahi/avahi_0.6.19.bb 80d86f2e2b46546f508edb4d277fa1ef7bceb3b7
+++ packages/avahi/avahi_0.6.19.bb 80d86f2e2b46546f508edb4d277fa1ef7bceb3b7
@@ -0,0 +1,2 @@
+require avahi.inc
+PR = "r2"
============================================================
--- packages/avahi/avahi_0.6.20.bb 617eee50014403513ca14be25fd16c61c19bac14
+++ packages/avahi/avahi_0.6.20.bb 617eee50014403513ca14be25fd16c61c19bac14
@@ -0,0 +1,2 @@
+require avahi.inc
+PR = "r1"
============================================================
--- packages/avahi/avahi_0.6.21.bb 20c7a5456d5de04217ea332f01c45d2027ebe4b7
+++ packages/avahi/avahi_0.6.21.bb 20c7a5456d5de04217ea332f01c45d2027ebe4b7
@@ -0,0 +1,7 @@
+require avahi.inc
+PR = "r1"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
+
+EXTRA_OECONF += "jm_cv_func_working_malloc=yes ac_cv_func_malloc_0_nonnull=yes jm_cv_func_working_realloc=yes ac_cv_func_realloc_0_nonnull=yes"
+
============================================================
--- packages/avahi/files/00avahi-autoipd 27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e
+++ packages/avahi/files/00avahi-autoipd 27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e
@@ -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
============================================================
--- packages/avahi/files/99avahi-autoipd a756b42982b7e319c2058b888bf265cd8e428d1a
+++ packages/avahi/files/99avahi-autoipd a756b42982b7e319c2058b888bf265cd8e428d1a
@@ -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
============================================================
--- packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
+++ packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
@@ -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
============================================================
--- packages/avahi/files/dbus-pre-1.1.1-support.patch d8bb507a275c57686d44908121501c39fda4d06c
+++ packages/avahi/files/dbus-pre-1.1.1-support.patch d8bb507a275c57686d44908121501c39fda4d06c
@@ -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,
+
============================================================
--- packages/avahi/mango-lassi_git.bb 3a59c1e0e88776b7c84accb2784335ec0f085416
+++ packages/avahi/mango-lassi_git.bb 3a59c1e0e88776b7c84accb2784335ec0f085416
@@ -0,0 +1,18 @@
+DESCRIPTION = "Input sharing, the avahi way"
+DEPENDS = "avahi-ui libglade libnotify"
+
+PV = "0.0+git${SRCDATE}"
+
+SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
+
+
+S = "${WORKDIR}/${PN}"
+
+do_compile_prepend() {
+ export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`"
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 mango-lassi ${D}${bindir}
+}
More information about the Openembedded-commits
mailing list