Merge lp:~mterry/ubuntu-touch-session/pulse-in-snap into lp:ubuntu-touch-session

[Michael Terry]

Support running inside a snap (without breaking non-snap runs).

Support running inside a snap (without breaking non-snap runs).

For testing this, you can install silo 2129 (which will pull in a lot of other stuff too though...)

[lp:~mterry/ubuntu-touch-session/pulse-in-snap]

293. By Michael Terry on 2016-10-11

Rely on PATH where possible

[Albert Astals Cid (aacid)]

I needed to add
  initctl set-env LD_LIBRARY_PATH=$SNAP/usr/lib/pulse-8.0/modules:$LD_LIBRARY_PATH
after
  initctl set-env --global PULSE_SCRIPT=$SNAP_USER_DATA/etc/pulse/touch.pa

so that pulseaudio actually started.

Lukas had a different/similar solution.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

Well we have currently this in our snacraft.yaml:

export PULSE_DLPATH=$(ls -d $SNAP/usr/lib/pulse-*/modules)

But that wasn't enough; what I did was to add:

export GST_PLUGIN_SYSTEM_PATH=$SNAP/usr/lib/$ARCH/gstreamer-1.0

and
...
 apps:
   unity8-session:
     command: snappyenv ${SNAP}/sbin/upstart --user
- plugs: [home]
+ plugs: [home, gsettings, pulseaudio, opengl]

After that, the indicator-sound starts and logout actually takes no more than a few seconds.

[Michael Terry (mterry)]

Hmm, I'm having pulseaudio start for me fine without any changes in this MP. I'm curious what our differences would be.

[Albert Astals Cid (aacid)]

You are running the snap in a xenial install while i'm running it in a zesty one? (Not idea about ltinkl)

[lp:~mterry/ubuntu-touch-session/pulse-in-snap]

294. By Michael Terry on 2016-11-15

Use .local/share/pulse instead of etc/pulse inside SNAP_USER_DATA in case we're using that for HOME too, like we do in u8 snap

[Michael Terry (mterry)]

I've committed a change to our snap packaging that uses the snapcraft-desktop-helpers scripts. I bet with those + this MP things work for you.

I'm working on updating the silo PPA and snap to have all the latest changes.

[Michael Terry (mterry)]

(or you could just build your own snap and test that way)

[Michael Terry (mterry)]

Try again. I fixed an issue with our wrapper script that might have prevented this from working. (I hope)

[Albert Astals Cid (aacid)]

> Try again. I fixed an issue with our wrapper script that might have prevented
> this from working. (I hope)

Yes, that worked.

[Albert Astals Cid (aacid)]

review: Abstain

[lp:~mterry/ubuntu-touch-session/pulse-in-snap]

295. By Michael Terry on 2016-11-29

Only override PULSE_* if those vars aren't set (by a snap wrapper script, say)

[Łukasz Zemczak (sil2100)]

Looks good.

review: Approve

=== modified file 'etc/profile.d/upstart-phablet.sh'
--- etc/profile.d/upstart-phablet.sh	2014-04-01 12:24:32 +0000
+++ etc/profile.d/upstart-phablet.sh	2016-11-29 23:53:13 +0000
@@ -4,5 +4,5 @@
     uid=$(getent passwd "$USER"|cut -d: -f3)
     export XDG_RUNTIME_DIR="/run/user/$uid"
 
-    export UPSTART_SESSION=$(/sbin/initctl list-sessions | awk '{ print $NF; quit }')
+    export UPSTART_SESSION=$(initctl list-sessions | awk '{ print $NF; quit }')
 fi

=== modified file 'ubuntu-touch-lightdm-session'
--- ubuntu-touch-lightdm-session	2014-06-03 14:31:27 +0000
+++ ubuntu-touch-lightdm-session	2016-11-29 23:53:13 +0000
@@ -7,5 +7,5 @@
 if [ -n "$MIR_SOCKET" ]; then
     exec $@
 else
-    exec /usr/sbin/lightdm-session $@
+    exec lightdm-session $@
 fi

=== modified file 'ubuntu-touch-session'
--- ubuntu-touch-session	2016-10-11 10:07:50 +0000
+++ ubuntu-touch-session	2016-11-29 23:53:13 +0000
@@ -14,11 +14,11 @@
 
 # override defaults by sourcing /etc/ubuntu-touch-session.d/$device.conf
 device=$(getprop ro.product.device)
-if [ -e /etc/ubuntu-touch-session.d/$device.conf ]; then
-    . /etc/ubuntu-touch-session.d/$device.conf
+if [ -e $SNAP/etc/ubuntu-touch-session.d/$device.conf ]; then
+    . $SNAP/etc/ubuntu-touch-session.d/$device.conf
 else
     # android.conf is used by the bind mount
-    . /etc/ubuntu-touch-session.d/android.conf
+    . $SNAP/etc/ubuntu-touch-session.d/android.conf
 fi
 
 # Workaround for bug 1308210 / 1318070 (x86 emulator and scopes)
@@ -30,11 +30,11 @@
 fi
 
 # Set up xdg dirs
-[ -z "$XDG_CONFIG_DIRS" ] && export XDG_CONFIG_DIRS=/etc/xdg
-[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS=/usr/local/share:/usr/share
+[ -z "$XDG_CONFIG_DIRS" ] && export XDG_CONFIG_DIRS=$SNAP/etc/xdg
+[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS=$SNAP/usr/local/share:$SNAP/usr/share
 if [ -n "$DESKTOP_SESSION" ]; then
-    export XDG_CONFIG_DIRS=/etc/xdg/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
-    export XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
+    export XDG_CONFIG_DIRS=$SNAP/etc/xdg/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=$SNAP/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
 fi
 
 # if /custom/xdg/config exists, add it to xdg_config_dirs. this is so upstart can get job definitions from /custom
@@ -51,8 +51,8 @@
 grep -q GRID_UNIT_PX $dot_profile || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $dot_profile
 
 # Make sure we're also exporting the profile.d variables
-if [ -d /etc/profile.d ]; then
-    for i in /etc/profile.d/*.sh; do
+if [ -d $SNAP/etc/profile.d ]; then
+    for i in $SNAP/etc/profile.d/*.sh; do
         if [ -r $i ]; then
             . $i
         fi

=== modified file 'upstart-session/bluez-mpris-proxy.conf'
--- upstart-session/bluez-mpris-proxy.conf	2015-10-19 20:21:22 +0000
+++ upstart-session/bluez-mpris-proxy.conf	2016-11-29 23:53:13 +0000
@@ -6,4 +6,4 @@
 
 respawn
 
-exec /usr/lib/bluetooth/mpris-proxy -s core.ubuntu.media.Service
+exec $SNAP/usr/lib/bluetooth/mpris-proxy -s core.ubuntu.media.Service

=== modified file 'upstart-session/cameraservice-trust-stored.conf'
--- upstart-session/cameraservice-trust-stored.conf	2016-07-08 13:50:16 +0000
+++ upstart-session/cameraservice-trust-stored.conf	2016-11-29 23:53:13 +0000
@@ -22,7 +22,7 @@
     # TODO check if needed by inspection of trust store library / camera service
     sleep 1
 
-    exec /usr/bin/trust-stored-skeleton \
+    exec trust-stored-skeleton \
         --remote-agent UnixDomainSocketRemoteAgent --endpoint=$service_socket \
         --local-agent MirAgent \
         --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \

=== modified file 'upstart-session/obexd.conf'
--- upstart-session/obexd.conf	2016-04-15 07:55:53 +0000
+++ upstart-session/obexd.conf	2016-11-29 23:53:13 +0000
@@ -7,4 +7,4 @@
 respawn
 expect fork
 
-exec /usr/lib/bluetooth/obexd -P ftp,irmc,mas,pcsuite -r $HOME
+exec $SNAP/usr/lib/bluetooth/obexd -P ftp,irmc,mas,pcsuite -r $HOME

=== modified file 'upstart-session/ofono-setup.conf'
--- upstart-session/ofono-setup.conf	2015-07-28 19:02:49 +0000
+++ upstart-session/ofono-setup.conf	2016-11-29 23:53:13 +0000
@@ -4,4 +4,4 @@
 start on started dbus and started pulseaudio
 stop on desktop-end
 
-exec /usr/bin/ofono-setup
+exec ofono-setup

=== modified file 'upstart-session/pulseaudio-trust-stored.conf'
--- upstart-session/pulseaudio-trust-stored.conf	2016-07-08 13:50:16 +0000
+++ upstart-session/pulseaudio-trust-stored.conf	2016-11-29 23:53:13 +0000
@@ -10,7 +10,7 @@
     # for the service
     sleep 2
 
-    exec /usr/bin/trust-stored-skeleton \
+    exec trust-stored-skeleton \
         --remote-agent DBusRemoteAgent --bus=session \
         --local-agent MirAgent \
         --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \

=== modified file 'upstart-session/pulseaudio.conf'
--- upstart-session/pulseaudio.conf	2015-04-07 04:25:00 +0000
+++ upstart-session/pulseaudio.conf	2016-11-29 23:53:13 +0000
@@ -9,14 +9,23 @@
 
 pre-start script
     # Use the Touch specific Pulseaudio script file
-    initctl set-env --global PULSE_SCRIPT=/etc/pulse/touch.pa
-    initctl set-env --global PULSE_CLIENTCONFIG=/etc/pulse/touch-client.conf
+    if [ -z "$PULSE_SCRIPT" ]; then
+        initctl set-env --global PULSE_SCRIPT=/etc/pulse/touch.pa
+    fi
+    if [ -z "$PULSE_CLIENTCONFIG" ]; then
+        initctl set-env --global PULSE_CLIENTCONFIG=/etc/pulse/touch-client.conf
+    fi
 
     # Force a default audio role (apps can overwrite this)
     initctl set-env --global PULSE_PROP='media.role=multimedia'
 
     # Force server-side corking when stalled (playback)
     initctl set-env --global PULSE_PLAYBACK_CORK_STALLED=1
+
+    # Pulseaudio enforces this variable internally, but tries to re-exec itself
+    # when enabling it and has difficulty finding its own binary, if in a snap.
+    # So let's set it for the daemon, so it won't have to.
+    initctl set-env LD_BIND_NOW=1
 end script
 
 exec pulseaudio --start --log-target=syslog

=== modified file 'usc-wrapper'
--- usc-wrapper	2014-09-08 21:02:31 +0000
+++ usc-wrapper	2016-11-29 23:53:13 +0000
@@ -5,4 +5,4 @@
 . /etc/environment
 export ANDROID_ROOT
 
-exec unity-system-compositor --disable-overlays=false --spinner=/usr/bin/unity-system-compositor-spinner $@
+exec unity-system-compositor --disable-overlays=false --spinner=$SNAP/usr/bin/unity-system-compositor-spinner $@