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

Mach bootstrap: Add more platforms #579

Merged
merged 3 commits into from Jan 25, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Avoid some stuff for `mach bootstrap` on Ubuntu

  • Loading branch information
UK992 committed Jan 25, 2017
commit 0b8abce77168f24bf0f5ab7ab5b3bc8df76b314c
@@ -37,15 +37,17 @@ servo-dependencies:
- xserver-xorg-input-void
- xserver-xorg-video-dummy
{% endif %}
{% if salt['pillar.get']('fully_managed', True) %}
pip.installed:
- pkgs:
- ghp-import
- s3cmd
- require:
- pkg: pip
- pip: virtualenv
{% endif %}

{% if grains['os'] == 'Ubuntu' %}
{% if grains['os'] == 'Ubuntu' and grains['oscodename'] == 'trusty' %}
multiverse:
pkgrepo.managed:
- name: 'deb http://archive.ubuntu.com/ubuntu trusty multiverse'

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Jan 25, 2017

Member

Instead of gating on being Trusty, try replacing trusty on this line with {{ grains['oscodename'] }}. I'm not 100% sure but I think it should work on Trusty and Xenial both.

This comment has been minimized.

Copy link
@UK992

UK992 Jan 25, 2017

Author Contributor

Doesn't work on Xenial.

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Jan 25, 2017

Member

I just tried it locally with an ubuntu/xenial64 Vagrant box and it worked fine. What error are you getting?

This comment has been minimized.

Copy link
@UK992

UK992 Jan 25, 2017

Author Contributor

that python-apt is not installed, after installing it, still same error.

This comment has been minimized.

Copy link
@UK992

UK992 Jan 25, 2017

Author Contributor
[ERROR   ] Failed to examine repo 'deb http://archive.ubuntu.com/ubuntu xenial multiverse': Error: 'python-apt' package not installed
[ERROR   ] State 'debconf.set' was not found in SLS 'servo-build-dependencies'
Reason: 'debconf.set' is not available.

This comment has been minimized.

Copy link
@aneeshusa

aneeshusa Jan 25, 2017

Member

OK, I've reproduced this and the fix is non-trivial so I will handle it in a follow up.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.