From 52070a20130555b83326d78d686ea7e9f816c723 Mon Sep 17 00:00:00 2001
From: Firehose merge bot <firehose@merge.bot>
Date: Wed, 7 Oct 2015 10:20:42 +0000
Subject: Firehose test commit

---
 scripts/release-build        | 19 +++++++++++++++----
 strata/graphics-common.morph | 17 +++++++++++++++--
 strata/gtk-deps.morph        |  6 +++---
 strata/gtk-deps/pango.morph  |  8 --------
 4 files changed, 33 insertions(+), 17 deletions(-)
 delete mode 100644 strata/gtk-deps/pango.morph

diff --git a/scripts/release-build b/scripts/release-build
index 4544dd41..2dc8c2ff 100755
--- a/scripts/release-build
+++ b/scripts/release-build
@@ -28,10 +28,17 @@ class Build(object):
 
     def __init__(self, name, arch, app):
         self.system_name = name
-        self.controller = app.controllers[arch]
+
+        controller_netloc = app.controllers[arch].split(':')
+        controller_args = [
+            '--controller-initiator-address=%s' % controller_netloc[0],
+        ]
+        if len(controller_netloc) > 1:
+            controller_args.append(
+                '--controller-initiator-port=%s' % controller_netloc[1])
+
         self.command = [
-            'morph', 'distbuild-morphology',
-            '--controller-initiator-address=%s' % self.controller,
+            'morph', 'distbuild-morphology'] + controller_args + [
             'baserock:baserock/definitions', app.ref, self.system_name]
 
     def start(self):
@@ -76,8 +83,9 @@ class ReleaseApp(cliapp.Application):
         '''Process the command line'''
         self.controllers = {}
         controllers_list = self.settings['controllers']
+
         for item in controllers_list:
-            arch, controller = item.split(':')
+            arch, controller = item.split(':', 1)
             self.controllers[arch] = controller
 
         self.ref = cliapp.runcmd(['git', 'rev-parse', 'HEAD']).strip()
@@ -139,6 +147,9 @@ class ReleaseApp(cliapp.Application):
             system, _ = self.load_morphology(system_name)
             if system['arch'] in self.controllers:
                 builds.append(Build(system_name, system['arch'], self))
+            else:
+                print("Unable to build %s: no %s distbuild available" %
+                        (system_name, system['arch']))
         return builds
 
     def deploy_images(self, cluster, cluster_path):
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index 3c35bb8c..3f37b8b3 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -52,10 +52,23 @@ chunks:
   - freetype2
   - pixman
   - libpng
+- name: colm-tarball
+  repo: upstream:colm-tarball
+  ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c
+  unpetrify-ref: colm-0.12.0
+  build-system: autotools
+- name: ragel-tarball
+  repo: upstream:ragel-tarball
+  ref: eafd7a3974e8605fd02794269db6114a3446e016
+  unpetrify-ref: ragel-6.9
+  build-system: autotools
+  build-depends:
+  - colm-tarball
 - name: harfbuzz
   repo: upstream:harfbuzz
-  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
-  unpetrify-ref: baserock/0.9.12
+  ref: 432ffc47a46d41bea17d839d0d3980e654c6e638
+  unpetrify-ref: 1.0.4
   build-system: autotools
   build-depends:
   - freetype2
+  - ragel-tarball
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index b400b30b..b3140215 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -7,10 +7,10 @@ build-depends:
 - morph: strata/x-common.morph
 chunks:
 - name: pango
-  morph: strata/gtk-deps/pango.morph
   repo: upstream:pango
-  ref: e0a21abf52a0b7588b1aa3357818948816ed9103
-  unpetrify-ref: 1.36.8
+  ref: 29a712f1af7bbb15bdc9d7e09cbf58517edf8c15
+  unpetrify-ref: 1.38.0
+  build-system: autotools
 - name: shared-mime-info
   morph: strata/gtk-deps/shared-mime-info.morph
   repo: upstream:shared-mime-info
diff --git a/strata/gtk-deps/pango.morph b/strata/gtk-deps/pango.morph
deleted file mode 100644
index 82b00ee3..00000000
--- a/strata/gtk-deps/pango.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: pango
-kind: chunk
-build-system: autotools
-system-integration:
-  pango-misc:
-    01-setup-modules:
-    - mkdir -p /usr/etc/pango/
-    - /usr/bin/pango-querymodules > /usr/etc/pango/pango.modules
-- 
cgit v1.2.1