Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
magic-lantern
magic-lantern
Commits
ba9dfe3c1245
Commit
acf3d15e
authored
Apr 15, 2019
by
alex@thinkpad
Browse files
QEMU install: also install python3 and use it by default for additional packages
(todo: update all our python scripts) --HG-- branch : qemu
parent
43e2b44457d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
contrib/qemu/install.sh
View file @
ba9dfe3c
...
...
@@ -241,7 +241,7 @@ if [ $(uname) == "Darwin" ]; then
ruby
-e
"
$(
curl
-fsSL
https://raw.githubusercontent.com/Homebrew/install/master/install
)
"
fi
packages
=
"python wget mercurial xz grep pkg-config glib automake libtool pixman mtools"
packages
=
"python
2 python3
wget mercurial xz grep pkg-config glib automake libtool pixman mtools"
for
pkg
in
$packages
;
do
brew list
$pkg
&> /dev/null
||
brew
install
$pkg
done
...
...
@@ -258,7 +258,7 @@ if [ -n "$(lsb_release -i 2>/dev/null | grep Ubuntu)" ]; then
build-essential mercurial pkg-config libtool
git libglib2.0-dev libpixman-1-dev zlib1g-dev
libgtk2.0-dev xz-utils mtools netcat-openbsd
python python-pip python-docutils"
python python
3 python3
-pip python
3
-docutils"
# if a valid arm-none-eabi-gcc/gdb is already in PATH, try to use that
# otherwise, we'll try to install something
...
...
@@ -452,8 +452,8 @@ echo
# install docutils (for compiling ML modules) and vncdotool (for test suite)
# only install if any of them is missing
pip
2
list |
grep
docutils
||
rst2html
-h
>
/dev/null
||
pip
2
install
docutils
pip
2
list |
grep
vncdotool
||
vncdotool
-h
>
/dev/null
||
pip
2
install
vncdotool
pip
3
list |
grep
docutils
||
rst2html
-h
>
/dev/null
||
pip
3
install
docutils
pip
3
list |
grep
vncdotool
||
vncdotool
-h
>
/dev/null
||
pip
3
install
vncdotool
function
die
{
echo
"
${
1
:-
"Unknown Error"
}
"
1>&2
;
exit
1
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment