Simplify ARM triples

Previouly, we had 'name', 'symlink_name', and 'download_name'.
 - We are changing the S3 URL scheme to make 'download_name' redundant.
 - 'symlink_name' referred to the full target triple, and has been
   replaced with just 'triple'.
 - 'name' referred to an ambiguously shortened triple (which omitted
   the vendor field of 'unknown'), which is used by Ubuntu, and has
   been replaced with 'ubuntu_triple'.

Most of the references have been switched to use just 'triple', which
is the most specific identifier, with 'ubuntu_triple' used where
necessary (references to the /usr/bin/* cross-compilation binaries,
and references to the lib, usr/lib, and usr/include dirs extracted
from the ARM rootfs tarballs).
e Please enter the commit message for your changes. Lines starting

servo-build-dependencies/arm.sls

@@ -33,34 +33,34 @@ arm-dependencies:
 
 {% for target in arm.targets %}
 
-libs-{{ target.name }}:
+libs-{{ target.triple }}:
   archive.extracted:
-    - name: {{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}
-    - source: https://servo-rust.s3.amazonaws.com/ARM/{{ target.download_name }}/{{ target.version }}/{{ target.download_name }}-{{ target.version }}.tgz
+    - name: {{ common.servo_home }}/rootfs-trusty-{{ target.triple }}/{{ target.version }}
+    - source: https://servo-rust.s3.amazonaws.com/ARM/{{ target.triple }}-trusty-libs/{{ target.version }}/{{ target.triple }}-trusty-libs-{{ target.version }}.tgz
     - source_hash: sha512={{ target.sha512 }}
     - archive_format: tar
     - archive_user: servo
 
 {% for binary in binaries %}
-{{ common.servo_home }}/bin/{{ target.symlink_name }}-{{ binary }}:
+{{ common.servo_home }}/bin/{{ target.triple }}-{{ binary }}:
   file.symlink:
-    - target: /usr/bin/{{ target.name }}-{{ binary }}
+    - target: /usr/bin/{{ target.ubuntu_triple }}-{{ binary }}
     - makedirs: True
     - require:
-      - archive: libs-{{ target.name }}
+      - archive: libs-{{ target.triple }}
 {% endfor %}
 
-{{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}:
+{{ common.servo_home }}/rootfs-trusty-{{ target.triple }}/{{ target.version }}:
   file.directory:
     - user: servo
     - group: servo
     - dir_mode: 755
     - file_mode: 644
     - makedirs: True
     - require:
-      - archive: libs-{{ target.name }}
+      - archive: libs-{{ target.triple }}
 
-{{ common.servo_home }}/rootfs-trusty-{{ target.name }}:
+{{ common.servo_home }}/rootfs-trusty-{{ target.triple }}:
   file.directory:
     - user: servo
     - group: servo
@@ -69,14 +69,14 @@ libs-{{ target.name }}:
     - makedirs: True
     - clean: True
     - require:
-      - file: {{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}
+      - file: {{ common.servo_home }}/rootfs-trusty-{{ target.triple }}/{{ target.version }}
 
 {% for root in ['usr/include', 'usr/lib', 'lib'] %}
-/{{ root }}/{{ target.name }}:
+/{{ root }}/{{ target.ubuntu_triple }}:
   file.symlink:
-    - target: {{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}/{{ root }}/{{ target.name }}
+    - target: {{ common.servo_home }}/rootfs-trusty-{{ target.triple }}/{{ target.version }}/{{ root }}/{{ target.ubuntu_triple }}
     - require:
-      - archive: libs-{{ target.name }}
+      - archive: libs-{{ target.triple }}
 {% endfor %}
 
 {% endfor %}
@@ -92,6 +92,6 @@ libs-{{ target.name }}:
     - require:
       {% for target in arm.targets %}
       {% for binary in binaries %}
-      - file: {{ common.servo_home }}/bin/{{ target.symlink_name }}-{{ binary }}
+      - file: {{ common.servo_home }}/bin/{{ target.triple }}-{{ binary }}
       {% endfor %}
       {% endfor %}

servo-build-dependencies/map.jinja

@@ -16,16 +16,14 @@
   set arm = {
     'targets': [
       {
-        'name': 'arm-linux-gnueabihf',
-        'download_name': 'armhf-trusty-libs',
-        'symlink_name': 'arm-unknown-linux-gnueabihf',
+        'triple': 'arm-unknown-linux-gnueabihf',
+        'ubuntu_triple': 'arm-linux-gnueabihf',
         'version': 'v2',
         'sha512': '9273c980b45f2b8602afb98f904582b7de749cab5d388d834c085c95387f3423f330f30d85ce6e5ad55ebdd68fdd03602d3b6db23da07fb2f6dcafb429e79ac7'
       },
       {
-        'name': 'aarch64-linux-gnu',
-        'download_name': 'arm64-trusty-libs',
-        'symlink_name': 'aarch64-unknown-linux-gnu',
+        'triple': 'aarch64-unknown-linux-gnu',
+        'ubuntu_triple': 'aarch64-linux-gnu',
         'version': 'v2',
         'sha512': 'a08a90f8a91d644c9e8d7af7fe50fca8a92cdbe5dcbe5faebc16333c9429acd1f487add66a847b64f83ed87ee8e14d5b71efc0a3dba35657f527e649e6e3e35c'
       }