Skip to content

/ saltfs

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
+30 −2
Merged

Mach bootstrap: Add more platforms #579

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b8abce
Avoid some stuff for `mach bootstrap` on Ubuntu
UK992 Jan 21, 2017
f11af72
Add missing Ubuntu package
UK992 Jan 22, 2017
4dc6227
Add support for Fedora/CentOS
UK992 Jan 22, 2017
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

2 python/init.sls
View file
Open in desktop
@@ -21,7 +21,7 @@ python2-dev:
pip:
pkg.installed:
- pkgs:
{% if grains['os'] == 'Ubuntu' %}
{% if grains['os'] in ['CentOS', 'Fedora', 'Ubuntu'] %}
- python-pip
{% elif grains['os'] == 'MacOS' %}
- python # pip is included with python in homebrew
30 servo-build-dependencies/init.sls
View file
Open in desktop
@@ -18,6 +18,7 @@ servo-dependencies:
- yasm
{% elif grains['os'] == 'Ubuntu' %}
- autoconf2.13
- curl
- freeglut3-dev
- gperf
- libavcodec-dev
@@ -36,16 +37,43 @@ servo-dependencies:
- xpra
- xserver-xorg-input-void
- xserver-xorg-video-dummy
{% elif grains['os'] in ['CentOS', 'Fedora'] %}
- bzip2-devel
- cabextract
- curl
- dbus-devel
- expat-devel
- fontconfig-devel
- freeglut-devel
- freetype-devel
- gcc-c++
- glib2-devel
- gperf

This comment has been minimized.

Sign in to view
Copy link
@aneeshusa

aneeshusa Jan 23, 2017

Member

Why is this package needed?

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Jan 25, 2017

Member

It's in the list of Servo prerequisites at https://github.com/servo/servo/#on-debian-based-linuxes; I forget which dependency in particular requires it.
- libtool
- libX11-devel
- libXcursor-devel
- libXi-devel
- libXmu-devel
- libXrandr-devel
- llvm-devel
- mesa-libEGL-devel
- mesa-libGL-devel
- mesa-libOSMesa-devel
- openssl-devel
- rpm-build

This comment has been minimized.

Sign in to view
Copy link
@aneeshusa

aneeshusa Jan 23, 2017

Member

Why is this package needed?

This comment has been minimized.

Sign in to view
Copy link
@UK992

UK992 Jan 25, 2017

Author Contributor

this one is needed for osmesa
- ttmkfdir
{% 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.

Sign in to view
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.

Sign in to view
Copy link
@UK992

UK992 Jan 25, 2017

Author Contributor

Doesn't work on Xenial.

This comment has been minimized.

Sign in to view
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.

Sign in to view
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.

Sign in to view
Copy link
@UK992

UK992 Jan 25, 2017 •
edited

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.

Sign in to view
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.