1
=== modified file 'HACKING.md'
2
--- HACKING.md	2013-04-26 10:39:19 +0000
3
+++ HACKING.md	2013-05-01 19:14:27 +0000
4
@@ -99,7 +99,7 @@
5
99
from dying at the same time.
99
from dying at the same time.
6
100
100
7
101
1. Make sure your hardware is supported. That means you're using a Mesa driver,
101
1. Make sure your hardware is supported. That means you're using a Mesa driver,
9
102
   of which only intel and radeon families are presently supported. If you're
102
   of which intel, radeon, and nouveau families are supported. If you're
10
103
   logged in to X then run this command to verify an appropriate DRI driver
103
   logged in to X then run this command to verify an appropriate DRI driver
11
104
   is active:
104
   is active:
12
105
       sudo pmap `pidof X` | grep dri.so
105
       sudo pmap `pidof X` | grep dri.so
13
@@ -115,34 +115,24 @@
14
115
115
15
116
3. Build Mir as described at the top of this document.
116
3. Build Mir as described at the top of this document.
16
117
117
45
118
4. Log in to VT1 (Ctrl+Alt+F1) _after_ you are already logged in to X. If you
118
4. Log in to VT1 (Ctrl+Alt+F1)
46
119
   do so before then you will not be assigned adequate credentials to access
119
47
120
   the graphics hardware and will get strange errors.
120
5. Start Mir as root:
48
121
121
    
49
122
5. Note that you can switch back to X using Alt+F7. But it is very important
122
    $ cd <mir_source_dir>/build/bin
50
123
   to remember NOT to switch once you have any mir binaries running. Doing
123
    $ sudo ./mir
51
124
   so will make X die (!).
124
52
125
125
6. To VT2: Ctrl+Alt+F2
53
126
6. Switch back to VT1: Ctrl+Alt+F1
126
54
127
127
7. Fix permissions on the Mir socket so that non-root clients can connect:
55
128
7. Now we want to run the mir server and a client to render something. The
128
56
129
   trick is that we need to make sure the mir server is easy to terminate
129
    $ sudo chmod 777 /tmp/mir_socket
57
130
   before ever switching back to X. To ensure this, the server needs to be in
130
58
131
   the foreground, but starting before your client (in the background). To
131
8. Start a mir client
59
132
   do this, you must:
132
60
133
       cd <mir_source_dir>/build/bin
133
    $ ./mir_demo_client_accelerated
61
134
       (sleep 5; ./mir_demo_client_accelerated) & ./mir ; kill $!
134
62
135
135
9. Switch back to Mir on VT1 (Ctrl+Alt+F1)
35
136
   Wait 5 seconds and the client will start. You can kill it with Ctrl+C or
36
137
   Alt+F2,Alt+F1,Ctrl+C. REMEMBER to kill the mir processes fully before
37
138
   attempting to switch back to X or your X login will die.
38
139
39
140
8. In case you accidentally killed your X login and ended up with a failsafe
40
141
   screen, you might find on subsequent reboots you can't log in to X at all
41
142
   any more (it instantly and silently takes you back to the login screen).
42
143
   The fix for this is to log in to a VT and:
43
144
       rm .Xauthority
44
145
       sudo restart lightdm
63
146
136
64
147
137
65
148
Documentation
138
Documentation
66
149
139
67
=== modified file 'doc/using_mir_on_pc.md'
68
--- doc/using_mir_on_pc.md	2013-03-11 14:23:19 +0000
69
+++ doc/using_mir_on_pc.md	2013-05-01 19:14:27 +0000
70
@@ -27,7 +27,7 @@
71
27
    [SeatDefaults]
27
    [SeatDefaults]
72
28
    user-session=ubuntu
28
    user-session=ubuntu
73
29
    greeter-session=unity-greeter
29
    greeter-session=unity-greeter
75
30
    type=mir
30
    type=unity
76
31
31
77
32
Now restart lightdm:
32
Now restart lightdm:
78
33
33
79
@@ -48,20 +48,14 @@
80
48
assigned adequate credentials to access the graphics hardware and will get
48
assigned adequate credentials to access the graphics hardware and will get
81
49
strange errors.
49
strange errors.
82
50
50
97
51
Note that you can switch back to X using Alt+F7. But it is very important to
51
VT switching away from Mir will only work if Mir is run as root. In this case
98
52
remember NOT to switch once you have any mir binaries running. Doing so will
52
we need to change the permissions to the Mir socket so that clients can connect:
99
53
currently make X die (!).
53
100
54
54
    $ sudo mir
101
55
Now we want to run the mir server and a client to render something. The trick
55
    <Ctrl+Alt+F2> - log in to VT 2
102
56
is that we need to make sure the mir server is easy to terminate before ever
56
    $ sudo chmod 777 /tmp/mir_socket
103
57
switching back to X. To ensure this, the server needs to be in the foreground,
57
    $ some-mir-client
104
58
but starting before your client (in the background). To do this, you must:
58
    <Ctrl+Alt+F1> - switch back to mir. Watch your friends be amazed!
91
59
92
60
    $ (sleep 3; some-mir-client) & mir ; kill $!
93
61
94
62
Wait 3 seconds and the client will start. You can kill it with Ctrl+C. REMEMBER
95
63
to kill the mir processes fully before attempting to switch back to X or your X
96
64
login will die.
105
65
59
106
66
In case you accidentally killed your X login and ended up with a failsafe
60
In case you accidentally killed your X login and ended up with a failsafe
107
67
screen, you might find on subsequent reboots you can't log in to X at all any
61
screen, you might find on subsequent reboots you can't log in to X at all any
Status:	Merged
Approved by:	Robert Ancell on 2013-05-01
Approved revision:	no longer in the source branch.
Merged at revision:	652
Proposed branch:	lp:~raof/mir/document-reality
Merge into:	lp:~mir-team/mir/trunk
Diff against target:	107 lines (+28/-44) 2 files modified HACKING.md (+19/-29) doc/using_mir_on_pc.md (+9/-15)
To merge this branch:	bzr merge lp:~raof/mir/document-reality
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-05-01
Kevin DuBois (community)			Approve on 2013-05-01
Alexandros Frantzis (community)			Approve on 2013-05-01
Daniel van Vugt		2013-05-01	Needs Fixing on 2013-05-01
Review via email: mp+161895@code.launchpad.net