From 0e842cf1b5356090005ddb301e86bee7b1a180fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 Sep 2009 10:07:29 +0100 Subject: zeroconf: Fix compile issue Signed-off-by: Richard Purdie --- meta/packages/zeroconf/files/debian-zeroconf | 51 ------------------------ meta/packages/zeroconf/files/zeroconf-default | 17 -------- meta/packages/zeroconf/zeroconf/compilefix.patch | 17 ++++++++ meta/packages/zeroconf/zeroconf/debian-zeroconf | 51 ++++++++++++++++++++++++ meta/packages/zeroconf/zeroconf/zeroconf-default | 17 ++++++++ meta/packages/zeroconf/zeroconf_0.9.bb | 7 ++-- 6 files changed, 89 insertions(+), 71 deletions(-) delete mode 100644 meta/packages/zeroconf/files/debian-zeroconf delete mode 100644 meta/packages/zeroconf/files/zeroconf-default create mode 100644 meta/packages/zeroconf/zeroconf/compilefix.patch create mode 100644 meta/packages/zeroconf/zeroconf/debian-zeroconf create mode 100644 meta/packages/zeroconf/zeroconf/zeroconf-default (limited to 'meta/packages') diff --git a/meta/packages/zeroconf/files/debian-zeroconf b/meta/packages/zeroconf/files/debian-zeroconf deleted file mode 100644 index c3705d278..000000000 --- a/meta/packages/zeroconf/files/debian-zeroconf +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -if [ ! -x /usr/sbin/zeroconf ]; then - exit 0 -fi - -# IPv4 link-local addresses (zeroconf) are -# only applicable on the 'inet' address family -[ "X$ADDRFAM" != "Xinet" ] && exit 0 - -# However there are some methods where it doesn't -# make any sense to configure an IPv4LL address - -# not on loopback -[ "X$METHOD" = "Xloopback" ] && exit 0 - -# not on ppp or wvdial either -[ "X$METHOD" = "Xppp" ] && exit 0 -[ "X$METHOD" = "Xwvdial" ] && exit 0 - -# The administrator may have blacklisted interfaces -# or only want zeroconf in a fallback situation -[ -f /etc/default/zeroconf ] && - . /etc/default/zeroconf - -[ -n "$DISABLE" ] && exit 0 - -for BLACK in $IFBLACKLIST; do - case $IFACE in - $BLACK) - exit 0 - ;; - esac -done - -# should we only allocate an address if we do not already have one? -if [ -n "$FALLBACK" ]; then - /bin/ip addr show $IFACE scope global | grep -q "inet" - IP=$? - if [ $IP -eq 0 ]; then - /bin/ip route add 169.254.0.0/16 dev $IFACE - exit 0 - fi -fi - -# otherwise, run if we aren't already going -if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then - /usr/sbin/zeroconf -i $IFACE -fi - -exit 0 diff --git a/meta/packages/zeroconf/files/zeroconf-default b/meta/packages/zeroconf/files/zeroconf-default deleted file mode 100644 index cc07b275f..000000000 --- a/meta/packages/zeroconf/files/zeroconf-default +++ /dev/null @@ -1,17 +0,0 @@ -# Default for zeroconf - -# disable zeroconf -# If you want to disable zeroconf completely, uncomment the following line -# this may be useful if you are debugging zeroconf or starting it manually -#DISABLE=yes - -# black-listed interfaces -# Interfaces which you never wish to have zeroconf run on should -# be listed here. e.g. "eth2 wlan1" in a space seperated string -IFBLACKLIST="" - -# fallback only -# If you would only like a link-local address if you were unable to -# obtain an address via DHCP then uncomment the following line -#FALLBACK=yes - diff --git a/meta/packages/zeroconf/zeroconf/compilefix.patch b/meta/packages/zeroconf/zeroconf/compilefix.patch new file mode 100644 index 000000000..b7b917dc2 --- /dev/null +++ b/meta/packages/zeroconf/zeroconf/compilefix.patch @@ -0,0 +1,17 @@ +| zeroconf.c: In function 'main': +| zeroconf.c:145: error: 'PATH_MAX' undeclared (first use in this function) + +RP - 4/9/09 + +Index: zeroconf-0.9/zeroconf.c +=================================================================== +--- zeroconf-0.9.orig/zeroconf.c 2009-09-04 10:05:25.000000000 +0100 ++++ zeroconf-0.9/zeroconf.c 2009-09-04 10:05:42.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "delay.h" + diff --git a/meta/packages/zeroconf/zeroconf/debian-zeroconf b/meta/packages/zeroconf/zeroconf/debian-zeroconf new file mode 100644 index 000000000..c3705d278 --- /dev/null +++ b/meta/packages/zeroconf/zeroconf/debian-zeroconf @@ -0,0 +1,51 @@ +#!/bin/sh + +if [ ! -x /usr/sbin/zeroconf ]; then + exit 0 +fi + +# IPv4 link-local addresses (zeroconf) are +# only applicable on the 'inet' address family +[ "X$ADDRFAM" != "Xinet" ] && exit 0 + +# However there are some methods where it doesn't +# make any sense to configure an IPv4LL address + +# not on loopback +[ "X$METHOD" = "Xloopback" ] && exit 0 + +# not on ppp or wvdial either +[ "X$METHOD" = "Xppp" ] && exit 0 +[ "X$METHOD" = "Xwvdial" ] && exit 0 + +# The administrator may have blacklisted interfaces +# or only want zeroconf in a fallback situation +[ -f /etc/default/zeroconf ] && + . /etc/default/zeroconf + +[ -n "$DISABLE" ] && exit 0 + +for BLACK in $IFBLACKLIST; do + case $IFACE in + $BLACK) + exit 0 + ;; + esac +done + +# should we only allocate an address if we do not already have one? +if [ -n "$FALLBACK" ]; then + /bin/ip addr show $IFACE scope global | grep -q "inet" + IP=$? + if [ $IP -eq 0 ]; then + /bin/ip route add 169.254.0.0/16 dev $IFACE + exit 0 + fi +fi + +# otherwise, run if we aren't already going +if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then + /usr/sbin/zeroconf -i $IFACE +fi + +exit 0 diff --git a/meta/packages/zeroconf/zeroconf/zeroconf-default b/meta/packages/zeroconf/zeroconf/zeroconf-default new file mode 100644 index 000000000..cc07b275f --- /dev/null +++ b/meta/packages/zeroconf/zeroconf/zeroconf-default @@ -0,0 +1,17 @@ +# Default for zeroconf + +# disable zeroconf +# If you want to disable zeroconf completely, uncomment the following line +# this may be useful if you are debugging zeroconf or starting it manually +#DISABLE=yes + +# black-listed interfaces +# Interfaces which you never wish to have zeroconf run on should +# be listed here. e.g. "eth2 wlan1" in a space seperated string +IFBLACKLIST="" + +# fallback only +# If you would only like a link-local address if you were unable to +# obtain an address via DHCP then uncomment the following line +#FALLBACK=yes + diff --git a/meta/packages/zeroconf/zeroconf_0.9.bb b/meta/packages/zeroconf/zeroconf_0.9.bb index c8f7ddfa3..f22466eea 100644 --- a/meta/packages/zeroconf/zeroconf_0.9.bb +++ b/meta/packages/zeroconf/zeroconf_0.9.bb @@ -5,11 +5,12 @@ LICENSE = "GPL" SECTION = "net" PRIORITY = "optional" -PR = "r0" +PR = "r1" SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ - file://zeroconf-default \ - file://debian-zeroconf" + file://compilefix.patch;patch=1 \ + file://zeroconf-default \ + file://debian-zeroconf" do_install () { install -d ${D}${sbindir} -- cgit v1.2.3