Merge lp:~mir-team/mir/consolidate-crossbuild-scripts into lp:~mir-team/mir/trunk
- consolidate-crossbuild-scripts
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 540 |
Proposed branch: | lp:~mir-team/mir/consolidate-crossbuild-scripts |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
311 lines (+160/-33) 7 files modified
cross-compile-chroot.sh (+7/-19) debian/control (+2/-1) doc/building_source_for_android.md (+6/-3) tests/mir_test_framework/signal_dispatcher.cpp (+6/-5) tools/install_on_android.sh (+9/-5) tools/setup-android-dependencies.sh (+31/-0) tools/setup-partial-armhf-chroot.sh (+99/-0) |
To merge this branch: | bzr merge lp:~mir-team/mir/consolidate-crossbuild-scripts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Abstain | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Alexandros Frantzis (community) | Approve | ||
Alan Griffiths | Approve | ||
Kevin DuBois (community) | Abstain | ||
Review via email: mp+154762@code.launchpad.net |
Commit message
pull the scripts used to help cross compile mir into the main build tree. also, add glog dependency to the armhf dependencies, remove some boost usage
fixes: LP #1124873
Description of the change
pull over the script used in ~kdub/mir/
This branch will be deprecated.
This requires you to add the phablet-team/ppa to the setup you have for retrieving the dependencies (the ndk-rewrite branch had previously stored a copy of hybris in it, a hack that is going away)
example deb line: deb [arch=armhf] http://
also, remove some usage of boost threads that was causing me some problems
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:474
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Kevin DuBois (kdub) wrote : | # |
the failure is because this line:
deb [arch=armhf] http://
is needed in the builder setup's sources.list for the hybris armhf packages
Daniel van Vugt (vanvugt) wrote : | # |
I know it's just a test right now. But the name "consolidate-
=== modified file 'tests/
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:474
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:475
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:476
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Kevin DuBois (kdub) wrote : | # |
> just a test branch at the moment to check jenkins still works with the script
> bumps
scripts now work, changing to abstain
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:476
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Kevin DuBois (kdub) wrote : | # |
> I know it's just a test right now. But the name "consolidate-
> scripts" implies only script changes, and maybe docs. So this change looks out
> of place:
>
> === modified file 'tests/
updated the descriptions to bring attention to it.
Alan Griffiths (alan-griffiths) wrote : | # |
LGTM
(The cleanup of signal_
Alexandros Frantzis (afrantzis) wrote : | # |
63 can look at the script and instructions in lp:~kdub/mir/ndk-rewrite as an
Should we change this to point to lp:mir, or is the information in lp:~kdub/mir/ndk-rewrite more suitable?
76 +provides a scripting example of how to cross compile. The 'setup partial-
Since we want .md files to be readable without preprocessing, we should wrap the lines nicely.
103 +++ setup-android-
139 +++ setup-partial-
Perhaps tools/ would be a better place for these files?
Kevin DuBois (kdub) wrote : | # |
> 63 can look at the script and instructions in lp:~kdub/mir/ndk-rewrite as
> an
>
> Should we change this to point to lp:mir, or is the information in
> lp:~kdub/mir/ndk-rewrite more suitable?
>
> 76 +provides a scripting example of how to cross compile. The 'setup partial-
> armhf-chroot.sh' will attempt to download all the arm dependencies you need.
> You have to have your APT sources.list files pointed at arm repositories.
>
> Since we want .md files to be readable without preprocessing, we should wrap
> the lines nicely.
>
> 103 +++ setup-android-
> 139 +++ setup-partial-
>
> Perhaps tools/ would be a better place for these files?
should be addressed
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:477
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Alexandros Frantzis (afrantzis) wrote : | # |
Looks good.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:479
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
Daniel van Vugt (vanvugt) wrote : | # |
Linked bug 1124873 because it appears to be relevant.
Daniel van Vugt (vanvugt) wrote : | # |
I'm not going to spend time testing with the Nexus today so can't really declare this properly reviewed.
If I was to nit-pick then I would say try to avoid using "$1" more than once in a script. It is easier for maintenance and readability to use:
foo="$1"
and then $foo thereafter.
I will trust the existing approvals are enough for now.
Preview Diff
1 | === modified file 'cross-compile-chroot.sh' | |||
2 | --- cross-compile-chroot.sh 2013-03-14 05:33:42 +0000 | |||
3 | +++ cross-compile-chroot.sh 2013-03-26 16:33:23 +0000 | |||
4 | @@ -1,34 +1,22 @@ | |||
5 | 1 | #!/bin/bash | 1 | #!/bin/bash |
6 | 2 | # build script for Mir on android arm devices | 2 | # build script for Mir on android arm devices |
7 | 3 | # test run requires package 'android-tools-adb' | ||
8 | 4 | # | ||
9 | 5 | # you should use this file if you have to do an integration test, or as | ||
10 | 6 | # an example of how to build. this script will do more downloading than you | ||
11 | 7 | # might want in a development workflow | ||
12 | 8 | # | 3 | # |
13 | 9 | set -e | 4 | set -e |
14 | 10 | 5 | ||
15 | 11 | BUILD_DIR=build-android-arm | 6 | BUILD_DIR=build-android-arm |
16 | 12 | 7 | ||
17 | 13 | #note:ndk-rewrite is just temporary until the real is pushed | ||
18 | 14 | if [ "$MIR_NDK_PATH" = "" ]; then | 8 | if [ "$MIR_NDK_PATH" = "" ]; then |
20 | 15 | export MIR_NDK_PATH=`pwd`/ndk-rewrite | 9 | export MIR_NDK_PATH=`pwd`/partial-armhf-chroot |
21 | 10 | if [ ! -d ${MIR_NDK_PATH} ]; then | ||
22 | 11 | echo "no partial root specified or detected. attempting to create one" | ||
23 | 12 | pushd tools > /dev/null | ||
24 | 13 | ./setup-partial-armhf-chroot.sh ${MIR_NDK_PATH} | ||
25 | 14 | popd > /dev/null | ||
26 | 15 | fi | ||
27 | 16 | fi | 16 | fi |
28 | 17 | 17 | ||
29 | 18 | echo "Using MIR_NDK_PATH: $MIR_NDK_PATH" | 18 | echo "Using MIR_NDK_PATH: $MIR_NDK_PATH" |
30 | 19 | 19 | ||
31 | 20 | if [[ -d ${MIR_NDK_PATH} ]]; then | ||
32 | 21 | pushd ${MIR_NDK_PATH} | ||
33 | 22 | bzr pull | ||
34 | 23 | popd | ||
35 | 24 | else | ||
36 | 25 | bzr branch lp:~kdub/mir/ndk-rewrite ${MIR_NDK_PATH} | ||
37 | 26 | fi | ||
38 | 27 | |||
39 | 28 | pushd ${MIR_NDK_PATH} > /dev/null | ||
40 | 29 | ./generate-armhf-deps.sh | ||
41 | 30 | popd > /dev/null | ||
42 | 31 | |||
43 | 32 | #start with a clean build every time | 20 | #start with a clean build every time |
44 | 33 | rm -rf ${BUILD_DIR} | 21 | rm -rf ${BUILD_DIR} |
45 | 34 | mkdir ${BUILD_DIR} | 22 | mkdir ${BUILD_DIR} |
46 | 35 | 23 | ||
47 | === modified file 'debian/control' | |||
48 | --- debian/control 2013-03-13 04:54:15 +0000 | |||
49 | +++ debian/control 2013-03-26 16:33:23 +0000 | |||
50 | @@ -16,7 +16,8 @@ | |||
51 | 16 | libgbm-dev [!armhf], | 16 | libgbm-dev [!armhf], |
52 | 17 | libprotobuf-dev, | 17 | libprotobuf-dev, |
53 | 18 | pkg-config, | 18 | pkg-config, |
55 | 19 | libhybris-dev [armhf] | 19 | libhybris-dev [armhf], |
56 | 20 | libgoogle-glog-dev | ||
57 | 20 | Standards-Version: 3.9.3 | 21 | Standards-Version: 3.9.3 |
58 | 21 | Homepage: https://launchpad.net/mir | 22 | Homepage: https://launchpad.net/mir |
59 | 22 | # If you aren't a member of ~mir-team but need to upload packaging changes, | 23 | # If you aren't a member of ~mir-team but need to upload packaging changes, |
60 | 23 | 24 | ||
61 | === modified file 'doc/building_source_for_android.md' | |||
62 | --- doc/building_source_for_android.md 2013-03-13 09:19:56 +0000 | |||
63 | +++ doc/building_source_for_android.md 2013-03-26 16:33:23 +0000 | |||
64 | @@ -56,10 +56,10 @@ | |||
65 | 56 | targeting a quantal phablet image) | 56 | targeting a quantal phablet image) |
66 | 57 | 57 | ||
67 | 58 | 2. Set up a chroot with the mir dependencies installed. At the moment, you | 58 | 2. Set up a chroot with the mir dependencies installed. At the moment, you |
69 | 59 | can look at the script and instructions in lp:~kdub/mir/ndk-rewrite as an | 59 | can look at the script and instructions in lp:mir as an |
70 | 60 | example of how to set up a partial chroot you can build mir against. | 60 | example of how to set up a partial chroot you can build mir against. |
71 | 61 | 61 | ||
73 | 62 | 3. There are a few options, but here is an example of how to build mir for android | 62 | 3. There are a few ways to do this, but here is an example of how to build mir for android |
74 | 63 | 63 | ||
75 | 64 | $ bzr branch lp:mir | 64 | $ bzr branch lp:mir |
76 | 65 | $ mkdir mir/build; cd mir/build | 65 | $ mkdir mir/build; cd mir/build |
77 | @@ -67,4 +67,7 @@ | |||
78 | 67 | $ make | 67 | $ make |
79 | 68 | 68 | ||
80 | 69 | N.B. The `cross-compile-android.sh` script in mir's top level directory | 69 | N.B. The `cross-compile-android.sh` script in mir's top level directory |
82 | 70 | provides a scripting example of how to cross compile | 70 | provides a scripting example of how to cross compile. |
83 | 71 | The 'setup-partial-armhf-chroot.sh' will attempt to download all the arm | ||
84 | 72 | dependencies you need. You have to have your APT sources.list files pointed at | ||
85 | 73 | arm repositories. | ||
86 | 71 | 74 | ||
87 | === modified file 'tests/mir_test_framework/signal_dispatcher.cpp' | |||
88 | --- tests/mir_test_framework/signal_dispatcher.cpp 2012-12-21 08:16:26 +0000 | |||
89 | +++ tests/mir_test_framework/signal_dispatcher.cpp 2013-03-26 16:33:23 +0000 | |||
90 | @@ -18,8 +18,8 @@ | |||
91 | 18 | 18 | ||
92 | 19 | #include "mir_test_framework/signal_dispatcher.h" | 19 | #include "mir_test_framework/signal_dispatcher.h" |
93 | 20 | 20 | ||
96 | 21 | #include <boost/thread.hpp> | 21 | #include <mutex> |
97 | 22 | 22 | #include <thread> | |
98 | 23 | #include <signal.h> | 23 | #include <signal.h> |
99 | 24 | #include <sys/types.h> | 24 | #include <sys/types.h> |
100 | 25 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
101 | @@ -84,7 +84,7 @@ | |||
102 | 84 | namespace | 84 | namespace |
103 | 85 | { | 85 | { |
104 | 86 | std::shared_ptr<mtf::SignalDispatcher> instance; | 86 | std::shared_ptr<mtf::SignalDispatcher> instance; |
106 | 87 | boost::once_flag init_flag; | 87 | std::once_flag init_flag; |
107 | 88 | 88 | ||
108 | 89 | void init() | 89 | void init() |
109 | 90 | { | 90 | { |
110 | @@ -104,6 +104,7 @@ | |||
111 | 104 | { | 104 | { |
112 | 105 | Private() : worker_thread(std::bind(&Private::worker, this)) | 105 | Private() : worker_thread(std::bind(&Private::worker, this)) |
113 | 106 | { | 106 | { |
114 | 107 | worker_thread.detach(); | ||
115 | 107 | } | 108 | } |
116 | 108 | 109 | ||
117 | 109 | void worker() | 110 | void worker() |
118 | @@ -123,13 +124,13 @@ | |||
119 | 123 | } | 124 | } |
120 | 124 | } | 125 | } |
121 | 125 | 126 | ||
123 | 126 | boost::thread worker_thread; | 127 | std::thread worker_thread; |
124 | 127 | mtf::SignalDispatcher::SignalType signal_channel; | 128 | mtf::SignalDispatcher::SignalType signal_channel; |
125 | 128 | }; | 129 | }; |
126 | 129 | 130 | ||
127 | 130 | std::shared_ptr<mtf::SignalDispatcher> mtf::SignalDispatcher::instance() | 131 | std::shared_ptr<mtf::SignalDispatcher> mtf::SignalDispatcher::instance() |
128 | 131 | { | 132 | { |
130 | 132 | boost::call_once(::init_flag, ::init); | 133 | std::call_once(::init_flag, ::init); |
131 | 133 | 134 | ||
132 | 134 | return ::instance; | 135 | return ::instance; |
133 | 135 | } | 136 | } |
134 | 136 | 137 | ||
135 | === renamed file 'install_on_android.sh' => 'tools/install_on_android.sh' | |||
136 | --- install_on_android.sh 2013-03-12 21:45:48 +0000 | |||
137 | +++ tools/install_on_android.sh 2013-03-26 16:33:23 +0000 | |||
138 | @@ -1,5 +1,7 @@ | |||
139 | 1 | #!/bin/bash | 1 | #!/bin/bash |
140 | 2 | # build script for Mir on android arm devices | 2 | # build script for Mir on android arm devices |
141 | 3 | # script assumes that the Mir dependencies are already set up on the device. | ||
142 | 4 | # if they are not set up, see the setup-android-dependencies.sh script | ||
143 | 3 | # test run requires package 'android-tools-adb' | 5 | # test run requires package 'android-tools-adb' |
144 | 4 | # test also assumes that the device is rooted and accessible over the adb bridge | 6 | # test also assumes that the device is rooted and accessible over the adb bridge |
145 | 5 | # | 7 | # |
146 | @@ -7,7 +9,13 @@ | |||
147 | 7 | # | 9 | # |
148 | 8 | 10 | ||
149 | 9 | set -e | 11 | set -e |
151 | 10 | BUILD_DIR=build-android-arm | 12 | |
152 | 13 | if [ -z ${1} ]; then | ||
153 | 14 | BUILD_DIR=build-android-arm | ||
154 | 15 | else | ||
155 | 16 | BUILD_DIR=${1} | ||
156 | 17 | fi | ||
157 | 18 | |||
158 | 11 | pushd ${BUILD_DIR} > /dev/null | 19 | pushd ${BUILD_DIR} > /dev/null |
159 | 12 | # | 20 | # |
160 | 13 | # Upload and run the tests! | 21 | # Upload and run the tests! |
161 | @@ -32,10 +40,6 @@ | |||
162 | 32 | done | 40 | done |
163 | 33 | 41 | ||
164 | 34 | echo "ubuntu_chroot shell; | 42 | echo "ubuntu_chroot shell; |
165 | 35 | apt-get install libprotobuf7 | ||
166 | 36 | libboost-system1.49.0 | ||
167 | 37 | libboost-program-options1.49.0 | ||
168 | 38 | libboost-thread1.49.0; | ||
169 | 39 | cd ${RUN_DIR}; | 43 | cd ${RUN_DIR}; |
170 | 40 | export GTEST_OUTPUT=xml:./; | 44 | export GTEST_OUTPUT=xml:./; |
171 | 41 | export LD_LIBRARY_PATH=.; | 45 | export LD_LIBRARY_PATH=.; |
172 | 42 | 46 | ||
173 | === added file 'tools/setup-android-dependencies.sh' | |||
174 | --- tools/setup-android-dependencies.sh 1970-01-01 00:00:00 +0000 | |||
175 | +++ tools/setup-android-dependencies.sh 2013-03-26 16:33:23 +0000 | |||
176 | @@ -0,0 +1,31 @@ | |||
177 | 1 | #!/bin/bash | ||
178 | 2 | # build script for Mir on android arm devices | ||
179 | 3 | # test run requires package 'android-tools-adb' | ||
180 | 4 | # test also assumes that the device is rooted and accessible over the adb bridge | ||
181 | 5 | # | ||
182 | 6 | # todo: this script should become part of the 'make install'/'make test' system | ||
183 | 7 | # | ||
184 | 8 | |||
185 | 9 | set -e | ||
186 | 10 | |||
187 | 11 | pushd /tmp > /dev/null | ||
188 | 12 | rm -f libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb | ||
189 | 13 | rm -f libgflags2_2.0-1_armhf.deb | ||
190 | 14 | |||
191 | 15 | wget "https://launchpad.net/ubuntu/+archive/primary/+files/libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb" | ||
192 | 16 | wget "https://launchpad.net/ubuntu/+archive/primary/+files/libgflags2_2.0-1_armhf.deb" | ||
193 | 17 | |||
194 | 18 | adb push libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb /data/ubuntu/root | ||
195 | 19 | adb push libgflags2_2.0-1_armhf.deb /data/ubuntu/root | ||
196 | 20 | |||
197 | 21 | echo "ubuntu_chroot shell; | ||
198 | 22 | cd /root; | ||
199 | 23 | dpkg -i libgflags2_2.0-1_armhf.deb libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb | ||
200 | 24 | apt-get install libprotobuf7 \ | ||
201 | 25 | libboost-system1.49.0 \ | ||
202 | 26 | libboost-program-options1.49.0 \ | ||
203 | 27 | libboost-thread1.49.0; | ||
204 | 28 | |||
205 | 29 | exit; | ||
206 | 30 | exit" | adb shell | ||
207 | 31 | popd > /dev/null | ||
208 | 0 | 32 | ||
209 | === added file 'tools/setup-partial-armhf-chroot.sh' | |||
210 | --- tools/setup-partial-armhf-chroot.sh 1970-01-01 00:00:00 +0000 | |||
211 | +++ tools/setup-partial-armhf-chroot.sh 2013-03-26 16:33:23 +0000 | |||
212 | @@ -0,0 +1,99 @@ | |||
213 | 1 | #!/bin/bash | ||
214 | 2 | |||
215 | 3 | set -e | ||
216 | 4 | |||
217 | 5 | if [ -z $1 ]; then | ||
218 | 6 | echo "please supply directory to create partial chroot in. (eg, ./setup-partial-armhf-chroot.sh mychroot-dir)" | ||
219 | 7 | exit | ||
220 | 8 | fi | ||
221 | 9 | |||
222 | 10 | echo "creating phablet-compatible quantal armhf partial chroot for mir compiles in directory ${1}" | ||
223 | 11 | |||
224 | 12 | if [ ! -d ${1} ]; then | ||
225 | 13 | mkdir -p ${1} | ||
226 | 14 | fi | ||
227 | 15 | |||
228 | 16 | pushd ${1} > /dev/null | ||
229 | 17 | |||
230 | 18 | ARCHITECTURE=armhf | ||
231 | 19 | |||
232 | 20 | declare -a PACKAGES=( | ||
233 | 21 | libboost1.49-dev | ||
234 | 22 | libboost-chrono1.49-dev | ||
235 | 23 | libboost-chrono1.49-dev | ||
236 | 24 | libboost-date-time1.49-dev | ||
237 | 25 | libboost-filesystem1.49-dev | ||
238 | 26 | libboost-program-options1.49-dev | ||
239 | 27 | libprotobuf-dev | ||
240 | 28 | libboost-chrono1.49.0 | ||
241 | 29 | libboost-date-time1.49.0 | ||
242 | 30 | libboost-filesystem1.49.0 | ||
243 | 31 | libboost-system1.49.0 | ||
244 | 32 | libboost-system1.49-dev | ||
245 | 33 | libboost-thread1.49-dev | ||
246 | 34 | libboost-thread1.49.0 | ||
247 | 35 | libboost-regex1.49-dev | ||
248 | 36 | libboost-regex1.49.0 | ||
249 | 37 | libboost-program-options1.49.0 | ||
250 | 38 | libhybris | ||
251 | 39 | libhybris-dev | ||
252 | 40 | libicu48 | ||
253 | 41 | libprotobuf7 | ||
254 | 42 | libprotobuf-dev | ||
255 | 43 | libegl1-mesa-dev | ||
256 | 44 | libgles2-mesa-dev | ||
257 | 45 | zlib1g) | ||
258 | 46 | |||
259 | 47 | #cleanup | ||
260 | 48 | for i in * ; do | ||
261 | 49 | if [[ -d ${i} ]]; then | ||
262 | 50 | echo "removing directory: ./${i}" | ||
263 | 51 | rm -rf ./${i} | ||
264 | 52 | fi | ||
265 | 53 | done | ||
266 | 54 | |||
267 | 55 | for i in ${PACKAGES[@]}; do | ||
268 | 56 | |||
269 | 57 | PACKAGE_VERSION=`apt-cache show ${i}:${ARCHITECTURE} | grep Version | awk -F: '{print $NF}' | sed "s/ //g"` | ||
270 | 58 | PACKAGE_FILENAME="${i}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb" | ||
271 | 59 | |||
272 | 60 | if [ ! -f ${PACKAGE_FILENAME} ]; then | ||
273 | 61 | echo "Downloading mir dependency: ${i}" | ||
274 | 62 | apt-get download "${i}:${ARCHITECTURE}" | ||
275 | 63 | else | ||
276 | 64 | echo "already downloaded: ${PACKAGE_FILENAME}" | ||
277 | 65 | fi | ||
278 | 66 | |||
279 | 67 | #quick sanity check | ||
280 | 68 | if [ ! -f ${PACKAGE_FILENAME} ]; then | ||
281 | 69 | echo "error: did not download expected file (${PACKAGE_FILENAME}. script is malformed!"; exit 1 | ||
282 | 70 | fi | ||
283 | 71 | |||
284 | 72 | echo "Extracting: ${PACKAGE_FILENAME}" | ||
285 | 73 | dpkg -x ${PACKAGE_FILENAME} . | ||
286 | 74 | done | ||
287 | 75 | |||
288 | 76 | #glog is only available in raring for armhf. we download the raring sources and | ||
289 | 77 | #install them manually for this quantal script | ||
290 | 78 | if [ ! -f libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb ]; then | ||
291 | 79 | wget "https://launchpad.net/ubuntu/+archive/primary/+files/libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb" | ||
292 | 80 | fi | ||
293 | 81 | |||
294 | 82 | if [ ! -f libgflags2_2.0-1_armhf.deb ]; then | ||
295 | 83 | wget "https://launchpad.net/ubuntu/+archive/primary/+files/libgflags2_2.0-1_armhf.deb" | ||
296 | 84 | fi | ||
297 | 85 | |||
298 | 86 | if [ ! -f libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb ]; then | ||
299 | 87 | wget "http://launchpadlibrarian.net/134086853/libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb" | ||
300 | 88 | fi | ||
301 | 89 | dpkg -x libgflags2_2.0-1_armhf.deb . | ||
302 | 90 | dpkg -x libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb . | ||
303 | 91 | dpkg -x libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb . | ||
304 | 92 | |||
305 | 93 | #todo: we get egl/gles headers from the mesa packages, but should be pointing at the hybris libraries | ||
306 | 94 | #just rewrite the symlinks for now | ||
307 | 95 | rm ./usr/lib/arm-linux-gnueabihf/libEGL.so | ||
308 | 96 | rm ./usr/lib/arm-linux-gnueabihf/libGLESv2.so | ||
309 | 97 | ln -s libhybris-egl/libEGL.so.1 ./usr/lib/arm-linux-gnueabihf/libEGL.so | ||
310 | 98 | ln -s libhybris-egl/libGLESv2.so.2 ./usr/lib/arm-linux-gnueabihf/libGLESv2.so | ||
311 | 99 | popd > /dev/null |
just a test branch at the moment to check jenkins still works with the script bumps