From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- 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 | 22 ---------- 4 files changed, 107 deletions(-) delete mode 100644 meta/packages/zeroconf/zeroconf/compilefix.patch delete mode 100644 meta/packages/zeroconf/zeroconf/debian-zeroconf delete mode 100644 meta/packages/zeroconf/zeroconf/zeroconf-default delete mode 100644 meta/packages/zeroconf/zeroconf_0.9.bb (limited to 'meta/packages/zeroconf') diff --git a/meta/packages/zeroconf/zeroconf/compilefix.patch b/meta/packages/zeroconf/zeroconf/compilefix.patch deleted file mode 100644 index b7b917dc2..000000000 --- a/meta/packages/zeroconf/zeroconf/compilefix.patch +++ /dev/null @@ -1,17 +0,0 @@ -| 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 deleted file mode 100644 index c3705d278..000000000 --- a/meta/packages/zeroconf/zeroconf/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/zeroconf/zeroconf-default b/meta/packages/zeroconf/zeroconf/zeroconf-default deleted file mode 100644 index cc07b275f..000000000 --- a/meta/packages/zeroconf/zeroconf/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_0.9.bb b/meta/packages/zeroconf/zeroconf_0.9.bb deleted file mode 100644 index f22466eea..000000000 --- a/meta/packages/zeroconf/zeroconf_0.9.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "IPv4 link-local address allocator" -AUTHOR = "Anand Kumria " -HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" -LICENSE = "GPL" -SECTION = "net" -PRIORITY = "optional" - -PR = "r1" - -SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ - file://compilefix.patch;patch=1 \ - file://zeroconf-default \ - file://debian-zeroconf" - -do_install () { - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/network/if-up.d - install -d ${D}${sysconfdir}/default - install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf - install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf - install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf -} -- cgit v1.2.3