summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lübbe <jluebbe@debian.org>2008-06-11 15:48:27 +0000
committerJan Lübbe <jluebbe@debian.org>2008-06-11 15:48:27 +0000
commit3ff424897ffa847b198072c53bf40ec06961a8ef (patch)
tree213ba1d74ff9a34c25f4ff80e1675495aaf951fc
parentce83493ea8d3feab3cc01e5343586f8f69439eba (diff)
parentebcfc2917b588f690f45d40a0dae97ab5bb2543c (diff)
merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'
-rw-r--r--packages/lighttpd/lighttpd/lighttpd11
-rw-r--r--packages/lighttpd/lighttpd_1.4.18.bb2
-rw-r--r--packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty0
-rw-r--r--packages/netbase/netbase/mpc8313e-rdb/interfaces16
-rwxr-xr-xpackages/pulseaudio/pulseaudio-meta/pulseaudio50
-rw-r--r--packages/pulseaudio/pulseaudio-meta/session36
-rw-r--r--packages/python/python-flup_1.0.bb10
7 files changed, 102 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/pulseaudio/pulseaudio-meta/pulseaudio b/packages/pulseaudio/pulseaudio-meta/pulseaudio
new file mode 100755
index 0000000000..964947376e
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-meta/pulseaudio
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# pulseaudio This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+ echo -n "Starting audio server: "
+ # FIXME once alsa/shm permissions have been fixed, supply --system
+ start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
+
+ if [ $? = 0 ]; then
+ echo "$prog (warning ignores)." # FIXME remove comment on warning
+ else
+ echo "(failed.)"
+ fi
+}
+
+stop() {
+ echo -n "Stopping audio server: "
+ start-stop-daemon -K -x /usr/bin/pulseaudio
+ echo "pulseaudio."
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/packages/pulseaudio/pulseaudio-meta/session b/packages/pulseaudio/pulseaudio-meta/session
new file mode 100644
index 0000000000..55f2c16f26
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-meta/session
@@ -0,0 +1,36 @@
+#!/usr/bin/pulseaudio -nF
+
+#
+# Barebones PA Session File for Devices w/ ALSA
+# (C) Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+#
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink device=hw:0 sink_name=output
+add-autoload-source input module-alsa-source device=hw:0 source_name=input
+
+# Core protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Suspend on idle
+load-module module-suspend-on-idle
+
+# Set default sink and source
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+#load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+#load-module module-x11-bell sample=x11-bell
+
+# Load samples
+#load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
+#load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+#load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
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