mirror of
https://github.com/OpenSolo/OpenSolo.git
synced 2025-05-03 07:54:29 +02:00
VAGRANT: Update to 16.04 and update dependencies
Update vagrant build system to Trusty64 and update dpendincies file
This commit is contained in:
parent
958f6a0f2b
commit
f439caa678
4
artoo/Vagrantfile
vendored
4
artoo/Vagrantfile
vendored
@ -10,11 +10,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||||||
# please see the online documentation at vagrantup.com.
|
# please see the online documentation at vagrantup.com.
|
||||||
|
|
||||||
# Every Vagrant virtual environment requires a box to build off of.
|
# Every Vagrant virtual environment requires a box to build off of.
|
||||||
config.vm.box = "ubuntu/precise64"
|
config.vm.box = "ubuntu/trusty64"
|
||||||
|
|
||||||
config.vm.provision "shell", path: "tools/install-vagrant-deps.sh"
|
config.vm.provision "shell", path: "tools/install-vagrant-deps.sh"
|
||||||
|
|
||||||
config.vm.provider "virtualbox" do |v|
|
config.vm.provider "virtualbox" do |v|
|
||||||
v.cpus = 4
|
v.cpus = 2
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -2,29 +2,30 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF0E1940624A220
|
|||||||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6D1D8367A3421AFB
|
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6D1D8367A3421AFB
|
||||||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5BB92C09DB82666C
|
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5BB92C09DB82666C
|
||||||
|
|
||||||
# fix broken urllib3 or some ssl stuff diesn't work
|
# included python 2.7.12 is broken. Install latest Python 2.7
|
||||||
sudo apt-get install -y --force-yes python-pip
|
sudo add-apt-repository -y ppa:jonathonf/python-2.7
|
||||||
sudo pip install urllib3[secure]
|
|
||||||
|
|
||||||
# fix broken python2.7.x by moving it forward to something newer than 2.7.8:
|
|
||||||
sudo add-apt-repository -y ppa:fkrull/deadsnakes-python2.7
|
|
||||||
sudo apt-get -y --force-yes update
|
sudo apt-get -y --force-yes update
|
||||||
sudo apt-get install -y --force-yes python2.7 python2.7-dev
|
sudo apt-get install -y --force-yes python2.7 python2.7
|
||||||
|
|
||||||
## get deps for pillow, and note that we get Pillow from easy_install instead of 'pip' or apt-get becuase this method actually works.
|
|
||||||
#sudo apt-get install -y python-dev python-setuptools
|
|
||||||
sudo apt-get install -y --force-yes libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk
|
|
||||||
sudo easy_install Pillow
|
|
||||||
|
|
||||||
sudo apt-add-repository 'deb http://ppa.launchpad.net/anatol/tup/ubuntu precise main' -y
|
|
||||||
sudo add-apt-repository 'ppa:terry.guo/gcc-arm-embedded' -y
|
|
||||||
|
|
||||||
sudo apt-get --assume-yes update
|
|
||||||
sudo apt-get --assume-yes install tup freetype* python-pip python-dev gcc-arm-none-eabi git
|
|
||||||
|
|
||||||
|
# install PIP. FYI the obvious apt-get install python-pip doesn't work. So this does.
|
||||||
|
sudo curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
|
||||||
|
sudo python get-pip.py
|
||||||
sudo pip install --upgrade pip
|
sudo pip install --upgrade pip
|
||||||
|
|
||||||
|
# install pillow dependencies, then install pillow
|
||||||
|
sudo apt-get install -y --force-yes freetype* python-dev libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk git freetype* python-dev git
|
||||||
sudo pip install pillow
|
sudo pip install pillow
|
||||||
|
|
||||||
|
# install GCC Arm
|
||||||
|
sudo add-apt-repository 'ppa:team-gcc-arm-embedded/ppa' -y
|
||||||
|
sudo apt-get -y --force-yes update
|
||||||
|
sudo apt-get install -y --force-yes gcc-arm-embedded
|
||||||
|
|
||||||
|
# install TUP
|
||||||
|
sudo apt-add-repository 'deb http://ppa.launchpad.net/anatol/tup/ubuntu precise main' -y
|
||||||
|
sudo apt-get -y --force-yes update
|
||||||
|
sudo apt-get install -y --force-yes tup
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo To build the artoo stm32 binary enter the VM with:
|
echo To build the artoo stm32 binary enter the VM with:
|
||||||
echo vagrant ssh
|
echo vagrant ssh
|
||||||
|
Loading…
x
Reference in New Issue
Block a user