summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMarc Reilly <marc@cpdesign.com.au>2012-08-17 00:10:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:09:08 (GMT)
commite2a9a88b06e4edc5274ef9d5bee9f7b03467671b (patch)
tree4b5c5940fbb42d104ef838aca56ee6454a78a935 /meta/recipes-connectivity
parentc49ecc9849da177d28bf0b616fee220f36a7a5e7 (diff)
downloadpoky-e2a9a88b06e4edc5274ef9d5bee9f7b03467671b.tar.gz
avahi: fix packaging of avahi-autoipd
- Avahi's "avahi-autoipd" file is in the dhcp/ folder, not dhcp3/ - udhcpc files were being installed but not being shipped in avahi-autoipd - do_install override for avahi-autoipd was not being called and is not required, so join it into regular do_install. - While at it, fixup string quoting in description. This makes avahi-autoipd work with simple ifup/down scripts. (From OE-Core rev: 172e663f1b00733cf956cb118d7a5e1a252c1671) Signed-off-by: Marc Reilly <marc@cpdesign.com.au> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 37ff70d..c08acb5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -1,10 +1,10 @@
1SUMMARY = "Avahi IPv4LL network address configuration daemon" 1SUMMARY = "Avahi IPv4LL network address configuration daemon"
2DESCRIPTION = "Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \ 2DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
3allows programs to publish and discover services and hosts running on a local network \ 3allows programs to publish and discover services and hosts running on a local network \
4with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \ 4with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
5IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \ 5IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
6configuration from the link-local 169.254.0.0/16 range without the need for a central \ 6configuration from the link-local 169.254.0.0/16 range without the need for a central \
7server." 7server.'
8AUTHOR = "Lennart Poettering <lennart@poettering.net>" 8AUTHOR = "Lennart Poettering <lennart@poettering.net>"
9HOMEPAGE = "http://avahi.org" 9HOMEPAGE = "http://avahi.org"
10BUGTRACKER = "http://avahi.org/report" 10BUGTRACKER = "http://avahi.org/report"
@@ -63,7 +63,9 @@ PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-c
63FILES_avahi-systemd = "${systemd_unitdir}" 63FILES_avahi-systemd = "${systemd_unitdir}"
64FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ 64FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
65 ${sysconfdir}/avahi/avahi-autoipd.action \ 65 ${sysconfdir}/avahi/avahi-autoipd.action \
66 ${sysconfdir}/dhcp3/*/avahi-autoipd" 66 ${sysconfdir}/dhcp/*/avahi-autoipd \
67 ${sysconfdir}/udhcpc.d/00avahi-autoipd \
68 ${sysconfdir}/udhcpc.d/99avahi-autoipd"
67FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 69FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
68FILES_libavahi-core = "${libdir}/libavahi-core.so.*" 70FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
69FILES_avahi-daemon = "${sbindir}/avahi-daemon \ 71FILES_avahi-daemon = "${sbindir}/avahi-daemon \
@@ -116,10 +118,7 @@ do_install() {
116 rm -rf ${D}/var/run 118 rm -rf ${D}/var/run
117 rm -rf ${D}${datadir}/dbus-1/interfaces 119 rm -rf ${D}${datadir}/dbus-1/interfaces
118 rm -rf ${D}${libdir}/avahi 120 rm -rf ${D}${libdir}/avahi
119}
120 121
121do_install_avahi-autoipd() {
122 autotools_do_install
123 install -d ${D}${sysconfdir}/udhcpc.d 122 install -d ${D}${sysconfdir}/udhcpc.d
124 install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d 123 install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d
125 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d 124 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d