4 files changed, 41 insertions, 2 deletions
diff --git a/packages/gstreamer/gst-plugins-good_0.10.7.bb b/packages/gstreamer/gst-plugins-good_0.10.7.bb
index e84c4801f1..fb551f5176 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.7.bb
@@ -1,4 +1,5 @@
 require gst-plugins.inc
+PR = "r1"
 
 EXTRA_OECONF += "--with-check=no"
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base esound"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index a5bd9a39ac..72e6bb0df6 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -37,8 +37,11 @@ X_INSTALL = "\
 
 # useful command line tools
 TOOLS_INSTALL = "\
+  alsa-utils-aplay \
+#  bash \
   htop \
   mickeyterm \
+  mplayer \
   nano \
   powertop \
   s3c24xx-gpio \
@@ -46,8 +49,9 @@ TOOLS_INSTALL = "\
 
 # audio
 AUDIO_INSTALL = "\
-  openmoko-sound-system2 \
+  pulseaudio-meta \
   openmoko-sound-theme-standard2 \
+  gst-meta-audio \
 "
 
 AUDIO_INSTALL_append_om-gta01 = "\
@@ -91,6 +95,7 @@ mickey_rootfs_postprocess() {
     date "+%m%d%H%M%Y" >./etc/timestamp
     echo "alias pico=nano" >>./etc/profile
     echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+    echo "alias ipkg='opkg'" >>./etc/profile
     mkdir -p ./local/pkg
     echo >>./etc/fstab
     echo "# NFS Host" >>./etc/fstab
diff --git a/packages/pulseaudio/pulseaudio-meta/.mtn2git_empty b/packages/pulseaudio/pulseaudio-meta/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-meta/.mtn2git_empty
diff --git a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
new file mode 100644
index 0000000000..e99654a44b
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Pulseaudio Meta package w/ initscript et. al."
+SECTION = "audio"
+RDEPENDS = "\
+  pulseaudio-server \
+  pulseaudio-module-alsa-sink \
+  pulseaudio-module-alsa-source \
+  pulseaudio-module-cli \
+  pulseaudio-module-esound-protocol-unix \
+  pulseaudio-module-simple-protocol-tcp \
+  pulseaudio-module-native-protocol-unix \
+  pulseaudio-module-cli-protocol-unix \
+  pulseaudio-module-suspend-on-idle \
+  gst-plugin-pulse \
+"
+PR = "r0"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+           file://session"
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+    install -d ${D}/${sysconfdir}/pulse
+	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"