[oe-commits] org.oe.dev merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
jluebbe commit
oe at amethyst.openembedded.net
Wed Jun 11 16:14:50 UTC 2008
merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'
Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: 162bf228da944fcdae3d12cc94a424a78acc3dd1
ViewMTN: http://monotone.openembedded.org/revision/info/162bf228da944fcdae3d12cc94a424a78acc3dd1
Files:
1
packages/netbase/netbase/mpc8313e-rdb
packages/netbase/netbase/mpc8313e-rdb/interfaces
packages/pulseaudio/pulseaudio-meta/pulseaudio
packages/pulseaudio/pulseaudio-meta/session
packages/python/python-flup_1.0.bb
packages/lighttpd/lighttpd/lighttpd
packages/lighttpd/lighttpd_1.4.18.bb
mtn:execute
true
packages/freesmartphone/python-odeviced_git.bb
packages/freesmartphone/python-oeventd_git.bb
packages/freesmartphone/python-ophoned_git.bb
packages/freesmartphone/python-ousaged_git.bb
Diffs:
#
# mt diff -r6aa3a34371e0ba98066d355ab1bc9a3c72356bf0 -r162bf228da944fcdae3d12cc94a424a78acc3dd1
#
#
#
# delete "packages/netbase/netbase/mpc8313e-rdb"
#
# delete "packages/netbase/netbase/mpc8313e-rdb/interfaces"
#
# add_file "packages/pulseaudio/pulseaudio-meta/pulseaudio"
# content [dcb5a9c029d96ff9418987416eec111961106e7b]
#
# add_file "packages/pulseaudio/pulseaudio-meta/session"
# content [d1ea222bbf61b01bc25d1ab9343a26fafd6dbbf5]
#
# add_file "packages/python/python-flup_1.0.bb"
# content [bd94350652fdf5be0b31f303fdbc32aa3c2d48ab]
#
# patch "packages/lighttpd/lighttpd/lighttpd"
# from [ed9e3cde9e3adcba2416e92aeda833fd0ea52a92]
# to [bbac6389b51a271519deaf171d00386c6fa9925d]
#
# patch "packages/lighttpd/lighttpd_1.4.18.bb"
# from [8a644dc2f8ecc2188c7f8a1eb1604e32bfad9315]
# to [632e100a9bf487c1c13ab8a725b547925ad9d3b4]
#
# set "packages/pulseaudio/pulseaudio-meta/pulseaudio"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/pulseaudio/pulseaudio-meta/pulseaudio dcb5a9c029d96ff9418987416eec111961106e7b
+++ packages/pulseaudio/pulseaudio-meta/pulseaudio dcb5a9c029d96ff9418987416eec111961106e7b
@@ -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
============================================================
--- packages/pulseaudio/pulseaudio-meta/session d1ea222bbf61b01bc25d1ab9343a26fafd6dbbf5
+++ packages/pulseaudio/pulseaudio-meta/session d1ea222bbf61b01bc25d1ab9343a26fafd6dbbf5
@@ -0,0 +1,36 @@
+#!/usr/bin/pulseaudio -nF
+
+#
+# Barebones PA Session File for Devices w/ ALSA
+# (C) Michael 'Mickey' Lauer <mlauer at 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
+
============================================================
--- packages/python/python-flup_1.0.bb bd94350652fdf5be0b31f303fdbc32aa3c2d48ab
+++ packages/python/python-flup_1.0.bb bd94350652fdf5be0b31f303fdbc32aa3c2d48ab
@@ -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
============================================================
--- packages/lighttpd/lighttpd/lighttpd ed9e3cde9e3adcba2416e92aeda833fd0ea52a92
+++ packages/lighttpd/lighttpd/lighttpd bbac6389b51a271519deaf171d00386c6fa9925d
@@ -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."
;;
*)
============================================================
--- packages/lighttpd/lighttpd_1.4.18.bb 8a644dc2f8ecc2188c7f8a1eb1604e32bfad9315
+++ packages/lighttpd/lighttpd_1.4.18.bb 632e100a9bf487c1c13ab8a725b547925ad9d3b4
@@ -2,7 +2,7 @@ DEPENDS = "libpcre"
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 \
#
# mt diff -r99ed4d92c897fb19999e63a3d7eb3b5fae762ff3 -r162bf228da944fcdae3d12cc94a424a78acc3dd1
#
#
#
# patch "packages/freesmartphone/python-odeviced_git.bb"
# from [089f3674dfb9222f65b9c78075e3a9facdc80077]
# to [2fca36542c50c1867791e83a4f116efc030620da]
#
# patch "packages/freesmartphone/python-oeventd_git.bb"
# from [72521aafc5003ba7ecc03af2a008263423a70da9]
# to [bacfb1c277c5ba2d3651e38b1884e47843397098]
#
# patch "packages/freesmartphone/python-ophoned_git.bb"
# from [e858c518c17070ad938fb291af8a6bd7474d439c]
# to [89cf8879bb1bcfb38d248682fd172a2113932984]
#
# patch "packages/freesmartphone/python-ousaged_git.bb"
# from [7e85950cc2cc762a57a6e4933d57332db89c97f4]
# to [69790c915b7e2072b034c367d75b5b0c5b10182c]
#
============================================================
--- packages/freesmartphone/python-odeviced_git.bb 089f3674dfb9222f65b9c78075e3a9facdc80077
+++ packages/freesmartphone/python-odeviced_git.bb 2fca36542c50c1867791e83a4f116efc030620da
@@ -5,12 +5,12 @@ PV = "0.7.9+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPLv2"
PV = "0.7.9+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
INITSCRIPT_NAME = "odeviced"
-INITSCRIPT_PARAMS = "defaults 20"
+INITSCRIPT_PARAMS = "defaults 21"
SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \
file://odeviced \
============================================================
--- packages/freesmartphone/python-oeventd_git.bb 72521aafc5003ba7ecc03af2a008263423a70da9
+++ packages/freesmartphone/python-oeventd_git.bb bacfb1c277c5ba2d3651e38b1884e47843397098
@@ -5,12 +5,12 @@ PV = "0.0.0+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPLv2"
PV = "0.0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
INITSCRIPT_NAME = "oeventd"
-INITSCRIPT_PARAMS = "defaults 20"
+INITSCRIPT_PARAMS = "defaults 21"
SRC_URI = "\
${FREESMARTPHONE_GIT}/eventd.git;protocol=git;branch=master \
============================================================
--- packages/freesmartphone/python-ophoned_git.bb e858c518c17070ad938fb291af8a6bd7474d439c
+++ packages/freesmartphone/python-ophoned_git.bb 89cf8879bb1bcfb38d248682fd172a2113932984
@@ -5,12 +5,12 @@ PV = "0.0.0+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPLv2"
PV = "0.0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
INITSCRIPT_NAME = "ophoned"
-INITSCRIPT_PARAMS = "defaults 20"
+INITSCRIPT_PARAMS = "defaults 21"
SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \
file://ophoned"
============================================================
--- packages/freesmartphone/python-ousaged_git.bb 7e85950cc2cc762a57a6e4933d57332db89c97f4
+++ packages/freesmartphone/python-ousaged_git.bb 69790c915b7e2072b034c367d75b5b0c5b10182c
@@ -5,12 +5,12 @@ PV = "0.7.9+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPLv2"
PV = "0.7.9+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit distutils update-rc.d
INITSCRIPT_NAME = "ousaged"
-INITSCRIPT_PARAMS = "defaults 20"
+INITSCRIPT_PARAMS = "defaults 21"
SRC_URI = "\
${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \
More information about the Openembedded-commits
mailing list