Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct vagrant boot of boxes #13272

Merged
merged 1 commit into from Jan 15, 2020

Conversation

@andyp1per
Copy link
Contributor

andyp1per commented Jan 14, 2020

Our Vagrant file is incorrectly configuring the box to boot in that it is not configuring it at all and we always pick up disco64 as the default. This PR fixes this. It also makes some attempt to make sure that we install available pre-requisites for different ubuntu editions as these vary. I have corrected this for xenial, bionic and disco only.

@andyp1per andyp1per requested a review from peterbarker Jan 14, 2020
Vagrantfile Show resolved Hide resolved
…k the right versions of libraries based on the ubuntu release.
@andyp1per andyp1per force-pushed the andyp1per:pr-vagrant-correct-boxes branch from fbafe36 to 85e2ba1 Jan 15, 2020
@andyp1per

This comment has been minimized.

Copy link
Contributor Author

andyp1per commented Jan 15, 2020

I have verified that the changes to install-prereqs-ubuntu.sh work in a windows WSL environment

@khancyr

This comment has been minimized.

Copy link
Contributor

khancyr commented on Tools/environment_install/install-prereqs-ubuntu.sh in 85e2ba1 Jan 15, 2020

This should be move later as nothing garantee that we get lsb_release

@peterbarker

This comment has been minimized.

Copy link
Contributor

peterbarker commented Jan 15, 2020

@khancyr I reckon pretty much everything has to have it now. And Ubuntu definitely will.

If it breaks, i'll fix it if nobody else does :-)

@peterbarker peterbarker merged commit b41a9c5 into ArduPilot:master Jan 15, 2020
4 checks passed
4 checks passed
ArduPilot.ardupilot Build #20200115.35 succeeded
Details
ArduPilot.ardupilot (Cygwin SITL build) Cygwin SITL build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
semaphoreci The build passed on Semaphore.
Details
@peterbarker

This comment has been minimized.

Copy link
Contributor

peterbarker commented Jan 15, 2020

Merged, thanks!

@andyp1per andyp1per deleted the andyp1per:pr-vagrant-correct-boxes branch Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.