Mach bootstrap: Add more platforms #579

UK992 · 2017-01-22T17:09:03Z

This PR add support for Fedora/CentOS platforms and also Ubuntu 16.04.

This change is

aneeshusa · 2017-01-22T21:18:28Z

I haven't reviewed this yet, but please rebase on top of #582 and make similar additions for other OSes. (The requirement is LLVM > 3.3, so exact version can vary a little.)

UK992 · 2017-01-22T22:12:04Z

Done, llvm-devel installs llvm 3.8

aneeshusa · 2017-01-23T20:55:49Z

python/init.sls

@@ -21,7 +21,7 @@ python2-dev:
 pip:
  pkg.installed:
    - pkgs:
-      {% if grains['os'] == 'Ubuntu' %}
+      {% if grains['os'] in ('CentOS', 'Fedora', 'Ubuntu') %}


nit: use a list instead of a tuple

aneeshusa · 2017-01-23T20:56:01Z

servo-build-dependencies/init.sls

@@ -35,6 +35,31 @@ servo-dependencies:
      - xpra
      - xserver-xorg-input-void
      - xserver-xorg-video-dummy
+      {% elif grains['os'] in ('CentOS', 'Fedora') %}


nit: use a list instead of a tuple

aneeshusa · 2017-01-23T20:56:51Z

servo-build-dependencies/init.sls

+      - libXi-devel
+      - libXmu-devel
+      - libXrandr-devel
+      - libtool


nit: for sorting, put libtool before the various libX* packages

aneeshusa · 2017-01-23T20:59:07Z

servo-build-dependencies/init.sls

+      - mesa-libGL-devel
+      - mesa-libOSMesa-devel
+      - openssl-devel
+      - rpm-build


Why is this package needed?

this one is needed for osmesa

aneeshusa · 2017-01-23T21:00:07Z

servo-build-dependencies/init.sls

+      - freetype-devel
+      - gcc-c++
+      - glib2-devel
+      - gperf


Why is this package needed?

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.

aneeshusa · 2017-01-23T21:00:47Z

servo-build-dependencies/init.sls


-{% if grains['os'] == 'Ubuntu' %}
+{% if grains['os'] == 'Ubuntu' and not salt['pillar.get']('is_bootstrap') %}


Why disable this? We need the multiverse repo for fonts IIRC.

now it's only enabled on Ubuntu 14

aneeshusa · 2017-01-23T21:03:14Z

python/init.sls

@@ -28,6 +28,7 @@ pip:
      {% endif %}
    - reload_modules: True

+{% if not salt['pillar.get']('is_bootstrap') %}


There's no is_bootstrap pillar; use {% if salt['pillar.get']('fully_managed', True) %} for now instead.

Also, I don't see the harm in having this while bootstrapping anyways.

aneeshusa · 2017-01-23T21:04:05Z

servo-build-dependencies/init.sls

@@ -36,15 +36,17 @@ servo-dependencies:
      - xserver-xorg-input-void
      - xserver-xorg-video-dummy
      {% endif %}
+  {% if not salt['pillar.get']('is_bootstrap') %}


Ditto about using fully_managed for now.

aneeshusa · 2017-01-23T21:06:11Z

Overall looks good, but I'd like to take this chance to remove any obsolete dependencies. Also, there is no is_bootstrap pillar yet; I'll need to think a little more about pillar items to use and refactoring to handle bootstrapping, our prod infra, Dockerfiles, etc.


        Avoid some stuff for `mach bootstrap` on Ubuntu


        Add missing Ubuntu package


        Add support for Fedora/CentOS

aneeshusa · 2017-01-25T17:42:41Z

servo-build-dependencies/init.sls


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


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.

Doesn't work on Xenial.

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

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

[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.

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

aneeshusa · 2017-01-25T22:13:56Z

Thanks @UK992! @bors-servo r+

bors-servo · 2017-01-25T22:13:56Z

📌 Commit 4dc6227 has been approved by aneeshusa

bors-servo · 2017-01-25T22:14:00Z

⚡ Test exempted - status


        Auto merge of #579 - UK992:bootstrap-salt, r=aneeshusa

@aneeshusa

Mach bootstrap: Add more platforms This PR add support for Fedora/CentOS platforms and also Ubuntu 16.04. r? @aneeshusa  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/579)

highfive assigned aneeshusa Jan 22, 2017

highfive added the S-awaiting-review label Jan 22, 2017

aneeshusa added the S-needs-code-changes label Jan 22, 2017

UK992 force-pushed the UK992:bootstrap-salt branch from 49dcdc5 to 86b4612 Jan 22, 2017

highfive removed the S-needs-code-changes label Jan 22, 2017

aneeshusa reviewed Jan 23, 2017

View changes

servo-build-dependencies/init.sls Outdated

- libXi-devel

- libXmu-devel

- libXrandr-devel

- libtool

This comment has been minimized.

Sign in to view

aneeshusa Jan 23, 2017
Member

nit: for sorting, put libtool before the various libX* packages

aneeshusa reviewed Jan 23, 2017

View changes

aneeshusa added S-needs-code-changes and removed S-awaiting-review labels Jan 23, 2017

UK992 added 3 commits Jan 21, 2017

Avoid some stuff for `mach bootstrap` on Ubuntu

0b8abce

Add missing Ubuntu package

f11af72

Add support for Fedora/CentOS

Loading status checks…

4dc6227

UK992 force-pushed the UK992:bootstrap-salt branch from 86b4612 to 4dc6227 Jan 25, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Jan 25, 2017

aneeshusa suggested changes Jan 25, 2017

View changes

aneeshusa added S-needs-code-changes and removed S-awaiting-review labels Jan 25, 2017

highfive removed the S-needs-code-changes label Jan 25, 2017

highfive added the S-awaiting-merge label Jan 25, 2017

bors-servo merged commit 4dc6227 into servo:master Jan 25, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test exempted
Details

highfive removed the S-awaiting-merge label Jan 25, 2017

servo / saltfs

Mach bootstrap: Add more platforms #579

Mach bootstrap: Add more platforms #579

UK992 commented Jan 22, 2017 •

edited by larsbergstrom

aneeshusa commented Jan 22, 2017

UK992 commented Jan 22, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

aneeshusa commented Jan 23, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

aneeshusa commented Jan 25, 2017

bors-servo commented Jan 25, 2017

bors-servo commented Jan 25, 2017


		{% if grains['os'] == 'Ubuntu' %}
		{% if grains['os'] == 'Ubuntu' and not salt['pillar.get']('is_bootstrap') %}

servo / saltfs

Join GitHub today

Mach bootstrap: Add more platforms #579

Mach bootstrap: Add more platforms #579

Conversation

UK992 commented Jan 22, 2017 • edited by larsbergstrom

aneeshusa commented Jan 22, 2017

UK992 commented Jan 22, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

aneeshusa commented Jan 23, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

UK992 Jan 25, 2017 • edited

This comment has been minimized.

aneeshusa commented Jan 25, 2017

bors-servo commented Jan 25, 2017

bors-servo commented Jan 25, 2017

UK992 commented Jan 22, 2017 •

edited by larsbergstrom

UK992 Jan 25, 2017 •

edited