Unity 8

Merge lp:~3v1n0/unity8/mirsocket-env-set into lp:unity8

mirsocket-env-set
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2016-06-09

Status:	Merged
Approved by:	Albert Astals Cid on 2016-06-10
Approved revision:	2442
Merged at revision:	2502
Proposed branch:	lp:~3v1n0/unity8/mirsocket-env-set
Merge into:	lp:unity8
Diff against target:	22 lines (+13/-0) 1 file modified data/unity8.conf (+13/-0)
To merge this branch:	bzr merge lp:~3v1n0/unity8/mirsocket-env-set
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-19
Albert Astals Cid (community)		2016-06-09	Approve on 2016-06-10
Review via email: mp+296944@code.launchpad.net

Commit Message

Unity8.conf: ensure MIR_SOCKET is set for future customers (such as the dash)

This ensures that if we run unity8 as standalone in Mir on X/KMS the MIR_SOCKET
is defined for other clients.

Description of the Change

Loading unity8 clients (such as the dash) in Mir or Mir on X can fail if no MIR_SOCKET is set, let's try to fallback to the standard paths.

Indicators client just creates dynamic components without being informative on failures...

* Are there any related MPs required for this MP to build/function as expected?

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes, tested both running unity8 from the builddir and the system-wide installed one.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A

Albert Astals Cid (aacid) wrote on 2016-06-09:

How do i test this? i.e. how do i make it fail without this branch and then work with this branch?

review: Needs Information

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1450/rebuild

review: Needs Fixing (continuous-integration)

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-06-09:

To get unity8 running in mir on X properly without crashing you'd need lp:~gerboland/qtmir/fix-gl-on-x11, in case you don't get mouse events you'd also need lp:~3v1n0/qtmir/ensure-activate-window.

Then just
initctl set-env -g QT_QPA_PLATFORM=mirserver
start unity8 #(or use the ./run.sh)

Albert Astals Cid (aacid) wrote on 2016-06-10:

I did use a branch with both the fix-gl and the ensure-activate-window and this branch but unity8-dash still doesn't start up

I get

ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
Dynamic exception type: boost::exception_detail::clone_impl<boost::exception_detail::error_info_injector<boost::system::system_error> >
std::exception::what: bind: L’adreça ja és en ús

The bind error translates to "address in use"

review: Needs Fixing

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-06-10:

Ouch, I just pasted the wrong thing here

It was:
initctl set-env -g QT_QPA_PLATFORM=ubuntumirclient
start unity8 #(or use the ./run.sh)

Albert Astals Cid (aacid) wrote on 2016-06-10:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-19:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1524/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Marco Trevisan (Treviño)

Mohammad Rakibul Hasan

Unity Team

 === modified file 'data/unity8.conf'
 --- data/unity8.conf	2016-03-14 07:30:54 +0000
 +++ data/unity8.conf	2016-06-09 14:14:44 +0000
@@ -55,6 +55,19 @@
  exec ${BINARY:-unity8} $ARGS
  post-start script
++    # If no MIR_SOCKET was defined on launch, we try to set one here
++    if [ -z "$(initctl get-env --global UNITY_MIR_SOCKET)" ]; then
++        if [ -S "$XDG_RUNTIME_DIR/mir_socket" ]; then
++            mir_socket=$XDG_RUNTIME_DIR/mir_socket
++        elif [ -S "/tmp/mir_socket" ]; then
++            mir_socket=/tmp/mir_socket
++        fi
++
++        if [ -n "$mir_socket" ]; then
++            initctl set-env --global MIR_SOCKET="$mir_socket"
++        fi
++    fi
++
      initctl emit --no-wait indicator-services-start
  end script