diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-11 15:54:10 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-11 15:54:10 +0000 |
| commit | 0ea2a3eacf6bd7f2bd8be28db697fa3c6c8fb2dd (patch) | |
| tree | b27715ea5bc2af8cfdfee8afba9947e732f2e126 | |
| parent | 76a92660f68f46dd4e91811ede1de9db6e609da2 (diff) | |
| parent | ebcfc2917b588f690f45d40a0dae97ab5bb2543c (diff) | |
merge of '716838c61d439ea48ec596bb358e6fe8674c26fe'
and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'
| -rw-r--r-- | packages/lighttpd/lighttpd/lighttpd | 11 | ||||
| -rw-r--r-- | packages/lighttpd/lighttpd_1.4.18.bb | 2 | ||||
| -rw-r--r-- | packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/netbase/netbase/mpc8313e-rdb/interfaces | 16 | ||||
| -rw-r--r-- | packages/python/python-flup_1.0.bb | 10 |
5 files changed, 16 insertions, 23 deletions
diff --git a/packages/lighttpd/lighttpd/lighttpd b/packages/lighttpd/lighttpd/lighttpd index 572381499a..bf89a60b7d 100644 --- a/packages/lighttpd/lighttpd/lighttpd +++ b/packages/lighttpd/lighttpd/lighttpd @@ -1,16 +1,15 @@ #!/bin/sh -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin +PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/lighttpd NAME=lighttpd DESC="Lighttpd Web Server" - +OPTS="-f /etc/lighttpd.conf" case "$1" in start) echo -n "Starting $DESC: " - start-stop-daemon --start -x "$DAEMON" -- -f /etc/lighttpd.conf + start-stop-daemon --start -x "$DAEMON" -- $OPTS echo "$NAME." ;; stop) @@ -20,9 +19,9 @@ case "$1" in ;; restart|force-reload) echo -n "Restarting $DESC: " - start-stop-daemon -K -x "$DAEMON" + start-stop-daemon --stop -x "$DAEMON" sleep 1 - start-stop-daemon -S -x "$DAEMON" + start-stop-daemon --start -x "$DAEMON" -- $OPTS echo "$NAME." ;; *) diff --git a/packages/lighttpd/lighttpd_1.4.18.bb b/packages/lighttpd/lighttpd_1.4.18.bb index a83efcaf40..4a27c626e4 100644 --- a/packages/lighttpd/lighttpd_1.4.18.bb +++ b/packages/lighttpd/lighttpd_1.4.18.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Web server" SECTION = "net" LICENSE = "BSD" DEPENDS = "libpcre" -PR = "r1" +PR = "r2" SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ diff --git a/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty b/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty +++ /dev/null diff --git a/packages/netbase/netbase/mpc8313e-rdb/interfaces b/packages/netbase/netbase/mpc8313e-rdb/interfaces deleted file mode 100644 index 64d65e3ad9..0000000000 --- a/packages/netbase/netbase/mpc8313e-rdb/interfaces +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Wired interface -auto eth1 -iface eth1 inet dhcp - -# Wireless interface -auto ath0 -iface ath0 inet static - address 192.168.99.1 - netmask 255.255.255.0 - diff --git a/packages/python/python-flup_1.0.bb b/packages/python/python-flup_1.0.bb new file mode 100644 index 0000000000..963c1ca6c2 --- /dev/null +++ b/packages/python/python-flup_1.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Random assortment of WSGI servers" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flup" + +SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools |