Merge lp:~phablet-team/mtp/fix-upstart-handling into lp:mtp

[Ricardo Salveti]

fix the upstart job of mtp-server to make it start again

drop all mtp-state handling, we start/stop the server directly from udev events via the usb-service shipped in lxc-android-config now

fix the upstart job of mtp-server to make it start again

drop all mtp-state handling, we start/stop the server directly from udev events via the usb-service shipped in lxc-android-config now

[Sergio Schvezov (sergiusens)]

I took a glance at the lxc-android-config and it seems like a neat approach.

And given that there are start and stop stanzas there, do we need upstart jobs at all here?

Also, since I can't review lxc-android-config; there seems to be no locking and wait_for_greeter blocks for mtp at least, so you might have a situation of multiple calls causing races. Should be lock/mutex the binary call?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/mtp-ci/33/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/33/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, will test and then top approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/mtp-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/34/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me too.

review: Approve

[Ricardo Salveti (rsalveti)]

review: Approve

[lp:~phablet-team/mtp/fix-upstart-handling]

69. By Ricardo Salveti on 2015-03-11

Adding again removed blank line from previous merge

70. By Oliver Grawert on 2015-03-19

drop th DISCONNECTED check from the upstart job

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-11 19:36:38 +0000
+++ debian/changelog	2015-03-19 13:20:48 +0000
@@ -1,3 +1,13 @@
+mtp (0.0.4+15.04.20150219-0ubuntu3) UNRELEASED; urgency=medium
+
+  * fix the upstart job of mtp-server to make it start again
+  * drop all mtp-state handling, we start/stop the server directly from udev
+    events via the usb-service shipped in lxc-android-config now
+  * drop "DISCONNECTED" check, we are on manual anyway with the upstart job,
+    only udev rules or explicit session jobs will trigger it.
+
+ -- Oliver Grawert <[e-mail]>  Wed, 11 Mar 2015 13:34:14 +0100
+
 mtp (0.0.4+15.04.20150219-0ubuntu2) vivid; urgency=medium
 
   * Properly fixing the startup script, as the previous change broke
 
=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2015-03-11 19:35:22 +0000
+++ debian/mtp-server.conf	2015-03-19 13:20:48 +0000
@@ -1,13 +1,12 @@
 description "MTP protocol server"
 
-start on :sys:android-usb-connected or android-usb-connected or :sys:android-mtp-on or android-mtp-on or started unity8
-stop on :sys:android-usb-disconnected or android-usb-disconnected or :sys:android-mtp-off or android-mtp-off or desktop-end
+start on :sys:android-usb-connected or android-usb-connected or started unity8
+stop on :sys:android-usb-disconnected or android-usb-disconnected or desktop-end
 
 pre-start script
     [ "$USER" != "lightdm" ] || { stop; exit 0; }
 
     test -e /sys/devices/virtual/android_usb/android0/state || { stop; exit 0; }
-    grep -q DISCONNECTED /sys/devices/virtual/android_usb/android0/state && { stop; exit 0; }
     grep -q mtp /sys/devices/virtual/android_usb/android0/functions || { stop; exit 0; }
 
     # Fix for bug LP: #1389223: UnityGreeter isn't available immediately
 
=== modified file 'debian/mtp-server.install'
--- debian/mtp-server.install	2015-01-20 00:54:30 +0000
+++ debian/mtp-server.install	2015-03-19 13:20:48 +0000
@@ -1,4 +1,3 @@
 usr/bin/mtp-server
 usr/share/locale
 debian/mtp-server.conf /usr/share/upstart/sessions/
-debian/mtp-state.conf /usr/share/upstart/sessions/
 
=== removed file 'debian/mtp-server.mtp-state.upstart'
--- debian/mtp-server.mtp-state.upstart	2014-03-07 19:11:20 +0000
+++ debian/mtp-server.mtp-state.upstart	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-start on android-container persist.sys.usb.config=* and started lightdm
-
-task
-
-emits android-mtp-on
-emits android-mtp-off
-
-script
- VAL=$(env | grep  persist.sys.usb.config=)
- case ${VAL##*=} in
-   mtp*)
-     /sbin/initctl emit android-mtp-on
-     ;;
-   *)
-     /sbin/initctl emit android-mtp-off
-    ;;
- esac
-end script
 
=== modified file 'debian/rules'
--- debian/rules	2015-01-20 00:54:30 +0000
+++ debian/rules	2015-03-19 13:20:48 +0000
@@ -7,11 +7,3 @@
 
 %:
 	dh $@ --with translations -- --fail-missing
-
-override_dh_installinit:
-	dh_installinit -pmtp-server --name=mtp-state --no-start -r -n
-	dh_installinit
-
-override_dh_install:
-	cp debian/mtp-server.mtp-state.upstart debian/mtp-state.conf
-	dh_install