From 70467f959fc4bc35508d9c44a27a5eac05358074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:09:10 +0000
Subject: build-essential: Upgrade linux-headers to 3.19

---
 strata/build-essential.morph | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 9884d29d..12da5a7a 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -60,8 +60,8 @@ chunks:
 - name: stage2-linux-api-headers
   morph: strata/build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
-  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
-  unpetrify-ref: baserock/v3.8
+  ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735
+  unpetrify-ref: v3.19
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -216,8 +216,8 @@ chunks:
 - name: linux-api-headers
   morph: strata/build-essential/linux-api-headers.morph
   repo: upstream:linux
-  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
-  unpetrify-ref: baserock/v3.8
+  ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735
+  unpetrify-ref: v3.19
   build-depends:
   - stage2-binutils
   - stage2-busybox
-- 
cgit v1.2.1


From c9290dce4d0203b5fa4e40bffed1b2596c1c2c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:10:06 +0000
Subject: strata/core: Upgrade util-linux to v2.25.2

---
 strata/core.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 0184de51..3c92831f 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -245,8 +245,8 @@ chunks:
 - name: util-linux
   morph: strata/core/util-linux.morph
   repo: upstream:util-linux
-  ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
-  unpetrify-ref: baserock/morph
+  ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
+  unpetrify-ref: v2.25.2
   build-depends:
   - autoconf-tarball
   - automake
-- 
cgit v1.2.1


From f14e69565a067701c9cf0e2430380ba41e04f6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:11:39 +0000
Subject: strata/foundation.morph: Upgrade systemd to v219

---
 strata/foundation.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index 533ac9ee..9a4a15ec 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -82,8 +82,8 @@ chunks:
 - name: systemd
   morph: strata/foundation/systemd.morph
   repo: upstream:systemd
-  ref: df0082ede6d0ca4db6773747eaf1c36d97458744
-  unpetrify-ref: baserock/v218-with-canonical-hostname-fix
+  ref: a88abde72169ddc2df77df3fa5bed30725022253
+  unpetrify-ref: v219
   build-depends:
   - dbus-pre
   - gobject-introspection
-- 
cgit v1.2.1


From 15e545281e39b09217d23de88e9c2bdbd6e71062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:11:57 +0000
Subject: strata/foundation/systemd.morph: Allow multiple threads when building

---
 strata/foundation/systemd.morph | 1 -
 1 file changed, 1 deletion(-)

diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index c298748a..81db9acd 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -1,6 +1,5 @@
 name: systemd
 kind: chunk
-max-jobs: 1
 build-system: autotools
 configure-commands:
 - sh autogen.sh
-- 
cgit v1.2.1


From e1af470d8845ae155bc9542040bf8931da110937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 11:55:42 +0000
Subject: Add Python 3 stratum

This is based in a patch from Paul Sherwood
---
 strata/python3-core.morph         | 12 ++++++++++++
 strata/python3-core/python3.morph |  7 +++++++
 2 files changed, 19 insertions(+)
 create mode 100644 strata/python3-core.morph
 create mode 100644 strata/python3-core/python3.morph

diff --git a/strata/python3-core.morph b/strata/python3-core.morph
new file mode 100644
index 00000000..2dc41438
--- /dev/null
+++ b/strata/python3-core.morph
@@ -0,0 +1,12 @@
+name: python3-core
+kind: stratum
+description: Core python3 packages
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: python3
+  morph: strata/python3-core/python3.morph
+  repo: upstream:cpython
+  ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c
+  unpetrify-ref: v3.4.2
+  build-depends: []
diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph
new file mode 100644
index 00000000..f02452d4
--- /dev/null
+++ b/strata/python3-core/python3.morph
@@ -0,0 +1,7 @@
+name: python3
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --enable-shared
+post-install-commands:
+- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3
-- 
cgit v1.2.1


From c5cdc0b1557416e09b5392e2360cf2110925a3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 00:06:02 +0000
Subject: Move pyyalm from core to python-core

---
 strata/core.morph               | 7 -------
 strata/core/pyyaml.morph        | 6 ------
 strata/python-core.morph        | 6 ++++++
 strata/python-core/pyyaml.morph | 6 ++++++
 4 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 strata/core/pyyaml.morph
 create mode 100644 strata/python-core/pyyaml.morph

diff --git a/strata/core.morph b/strata/core.morph
index 0184de51..126bd6ed 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -277,13 +277,6 @@ chunks:
   unpetrify-ref: baserock/master
   build-depends:
   - cpython
-- name: pyyaml
-  morph: strata/core/pyyaml.morph
-  repo: upstream:pyyaml
-  ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - python-setuptools
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.morph
deleted file mode 100644
index 8ebd7b57..00000000
--- a/strata/core/pyyaml.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pyyaml
-kind: chunk
-build-commands:
-- python setup.py --without-libyaml build
-install-commands:
-- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 409d6f17..6f61a0e8 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -25,3 +25,9 @@ chunks:
   ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
   unpetrify-ref: 1.9.0
   build-depends: []
+- name: pyyaml
+  morph: strata/python-core/pyyaml.morph
+  repo: upstream:pyyaml
+  ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
+  unpetrify-ref: baserock/morph
+  build-depends: []
diff --git a/strata/python-core/pyyaml.morph b/strata/python-core/pyyaml.morph
new file mode 100644
index 00000000..8ebd7b57
--- /dev/null
+++ b/strata/python-core/pyyaml.morph
@@ -0,0 +1,6 @@
+name: pyyaml
+kind: chunk
+build-commands:
+- python setup.py --without-libyaml build
+install-commands:
+- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
-- 
cgit v1.2.1


From 5f951de61c9ed050381054dd71ea07da37b3f19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:02:00 +0000
Subject: Move python-setuptools from core to python-core

---
 strata/core.morph        |  7 -------
 strata/python-core.morph | 12 ++++++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 126bd6ed..37183baa 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -270,13 +270,6 @@ chunks:
   build-depends:
   - flex
   - texinfo-tarball
-- name: python-setuptools
-  morph: strata/core/python-setuptools.morph
-  repo: upstream:python-setuptools-bitbucket
-  ref: 0aa6a4de5931d02876428388678802db2371fd37
-  unpetrify-ref: baserock/master
-  build-depends:
-  - cpython
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 6f61a0e8..2daf78b0 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -4,11 +4,18 @@ description: Core python packages
 build-depends:
 - morph: strata/core.morph
 chunks:
+- name: python-setuptools
+  morph: strata/core/python-setuptools.morph
+  repo: upstream:python-setuptools-bitbucket
+  ref: 0aa6a4de5931d02876428388678802db2371fd37
+  unpetrify-ref: baserock/master
+  build-depends: []
 - name: pip
   repo: upstream:pip
   ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
   unpetrify-ref: baserock/master
-  build-depends: []
+  build-depends:
+  - python-setuptools
 - name: pbr
   repo: upstream:pbr
   ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
@@ -30,4 +37,5 @@ chunks:
   repo: upstream:pyyaml
   ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
   unpetrify-ref: baserock/morph
-  build-depends: []
+  build-depends:
+  - python-setuptools
-- 
cgit v1.2.1


From f21d558266412551d05cd56339d779456bde6199 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 20 Feb 2015 13:32:58 +0000
Subject: Disable extra GCC warnings for GNU Diff

These are enabled based on the presence of a .git directory in the source tree by
diff's configure.ac script. It includes the dreaded -Werror.

This fixes the build on armv7lhf.
---
 strata/coreutils-common/diff.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
index 3a05af2d..346f8635 100644
--- a/strata/coreutils-common/diff.morph
+++ b/strata/coreutils-common/diff.morph
@@ -4,4 +4,4 @@ build-system: autotools
 configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
 - ./bootstrap --skip-po
-- ./configure --prefix="$PREFIX"
+- ./configure --prefix="$PREFIX" --disable-gcc-warnings
-- 
cgit v1.2.1


From 7db9df02b815aa031d862024e749e60e0ebbe8c9 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Mon, 23 Feb 2015 12:19:11 +0000
Subject: Add back ARM SDK systems

I accidentally removed these instead of renaming them in commit
efe5807433bb576bbba4312d2e3d150ed6f7e1a4
---
 systems/armv7lhf-cross-toolchain-system-x86_32.morph | 18 ++++++++++++++++++
 systems/armv7lhf-cross-toolchain-system-x86_64.morph | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_32.morph
 create mode 100644 systems/armv7lhf-cross-toolchain-system-x86_64.morph

diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32.morph b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
new file mode 100644
index 00000000..3f66d178
--- /dev/null
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32.morph
@@ -0,0 +1,18 @@
+name: armv7lhf-cross-toolchain-system-x86_32
+kind: system
+description: A system that contains an ARM cross compiler, intended to be used as
+  a sysroot.
+arch: x86_32
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: armv7lhf-cross-toolchain
+  morph: strata/armv7lhf-cross-toolchain.morph
+- name: cross-tools
+  morph: strata/cross-tools.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64.morph b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
new file mode 100644
index 00000000..76197491
--- /dev/null
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64.morph
@@ -0,0 +1,18 @@
+name: armv7lhf-cross-toolchain-system-x86_64
+kind: system
+description: A system that contains an ARM cross compiler, intended to be used as
+  a sysroot.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: armv7lhf-cross-toolchain
+  morph: strata/armv7lhf-cross-toolchain.morph
+- name: cross-tools
+  morph: strata/cross-tools.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
-- 
cgit v1.2.1


From c5090c1729dc177f2047285fb210484c9096e07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 20 Feb 2015 11:55:47 +0000
Subject: strata/core: Upgrade to libtool 2.4.6

From the release notes:

"This version regains most of the speed of 2.4.2 by correcting one of
two known regressions that were causing noticable slow-down when
building projects with many source files."
---
 strata/core.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 0184de51..3f8c8ed9 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -119,8 +119,8 @@ chunks:
 - name: libtool-tarball
   morph: strata/core/libtool-tarball.morph
   repo: upstream:libtool-tarball
-  ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160
-  unpetrify-ref: libtool-2.4.5
+  ref: c026ca36e37d2643623a75d0d3e9e451023139f3
+  unpetrify-ref: libtool-2.4.6
   build-depends:
   - bash
 - name: gtk-doc-stub
-- 
cgit v1.2.1


From 4348a04b5775a792a18e6804b716bacd28a9b618 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Mon, 23 Feb 2015 09:24:27 +0000
Subject: Add more xstatic packages required by Horizon

This static packages were required when trying to collect the
static files for horizon.
This conflicts with the 'everything from Git' policy of
Baserock,but it is required right now for the Openstack system to
work.
---
 strata/xstatic.morph | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index a632d4df..d3a4228f 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -21,16 +21,41 @@ chunks:
   ref: dac047df05da5bb20de4e78876bc03820d0c6671
   unpetrify-ref: 1.3.7.0
   build-depends: []
+- name: xstatic-angular-animate
+  repo: upstream:xstatic-packages/xstatic-angular-animate
+  ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7
+  unpetrify-ref: master
+  build-depends: []
+- name: xstatic-angular-bootstrap
+  repo: upstream:xstatic-packages/xstatic-angular-bootstrap
+  ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483
+  unpetrify-ref: master
+  build-depends: []
 - name: xstatic-angular-cookies
   repo: upstream:xstatic-packages/xstatic-angular-cookies
   ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5
   unpetrify-ref: 1.2.1.1
   build-depends: []
+- name: xstatic-angular-fileupload
+  repo: upstream:xstatic-packages/xstatic-angular-fileupload
+  ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae
+  unpetrify-ref: master
+  build-depends: []
 - name: xstatic-angular-mock
   repo: upstream:xstatic-packages/xstatic-angular-mock
   ref: 20fdada109b167bcdcacec22986b43fdb42866f3
   unpetrify-ref: 1.2.1.1
   build-depends: []
+- name: xstatic-angular-sanitize
+  repo: upstream:xstatic-packages/xstatic-angular-sanitize
+  ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999
+  unpetrify-ref: master
+  build-depends: []
+- name: xstatic-angular-smart-table
+  repo: upstream:xstatic-packages/xstatic-angular-smart-table
+  ref: e0fbf69fb156b995547471d71c5c6a7f88989d47
+  unpetrify-ref: master
+  build-depends: []
 - name: xstatic-bootstrap-datepicker
   repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker
   ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a
@@ -66,6 +91,11 @@ chunks:
   ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5
   unpetrify-ref: master
   build-depends: []
+- name: xstatic-jquery-bootstrap-wizard
+  repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard
+  ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142
+  unpetrify-ref: master
+  build-depends: []
 - name: xstatic-jquery-migrate
   repo: upstream:xstatic-packages/xstatic-jquery-migrate
   ref: 989b3b31106727542dd83810c3b952f90d8cdb8f
-- 
cgit v1.2.1


From 048c29a6e86bbc036db684c7e7aa045b6c7f1e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 24 Feb 2015 12:31:56 +0000
Subject: strata/gtk3.morph: Build GTK+ 3.15.4

versions >= 3.15.5 doesn't compile as they need a new version of GLib
---
 strata/gtk3.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 851cb3dd..8af030bb 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -13,7 +13,7 @@ chunks:
 - name: gtk3
   morph: strata/gtk3/gtk3.morph
   repo: upstream:gtk+
-  ref: 9e96461aa59cdb5454a48200b8b80caaf04c4147
-  unpetrify-ref: 3.15.5
+  ref: da163469f9d344190f69bfc163517154af0e2dab
+  unpetrify-ref: 3.15.4
   build-depends:
   - libepoxy
-- 
cgit v1.2.1


From eaed1f0daa82a482166f5a938c3ef52c407aebf0 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 25 Feb 2015 17:39:03 +0000
Subject: Update Morph for distbuild fixes and sourceresolver bug fixes

---
 strata/morph-utils.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index aecf2a1d..d70a39ea 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
   build-depends: []
 - name: morph
   repo: baserock:baserock/morph
-  ref: 74f60a7ed286dd88e24539d46b9a86147a8e78b5
+  ref: f5163dd418e342fe6e5fb18625828076130a5e57
   unpetrify-ref: master
   build-depends:
   - cliapp
-- 
cgit v1.2.1


From 4c4d4e24f29daab7ae8bb21e96461740823ce5ae Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Thu, 26 Feb 2015 09:01:43 +0000
Subject: Make cloudinit depend on python-core since setuptools has moved

---
 strata/cloudinit-support.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 14786dde..535beef6 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: A stratum with cloudinit to fit a system in the OpenStack cloud.
 build-depends:
 - morph: strata/build-essential.morph
-- morph: strata/core.morph
+- morph: strata/python-core.morph
 - morph: strata/foundation.morph
 chunks:
 - name: configobj
-- 
cgit v1.2.1


From ced9d46974b3e36e6a87a6a44000e61f67bead47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 16:41:57 +0000
Subject: strata/core/bison: Use default autotools commands instead hardcode
 them

---
 strata/core/bison.morph | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index a9497d4e..0c649e78 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -1,10 +1,6 @@
 name: bison
 kind: chunk
-configure-commands:
+build-system: autotools
+pre-configure-commands:
 - echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
 - bash bootstrap --skip-po
-- ./configure --prefix=/usr --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1


From b09dc25ecfc6685a8b0c9337f228b6fe44bd00c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 25 Feb 2015 14:51:24 +0000
Subject: Update gstreamer to include fix to detect bison version correcly

---
 strata/multimedia-gstreamer.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index cee7df71..2df8a0ce 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -13,8 +13,8 @@ chunks:
   build-depends: []
 - name: gstreamer
   repo: upstream:gstreamer
-  ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558
-  unpetrify-ref: baserock/1.4
+  ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86
+  unpetrify-ref: baserock/1.4.4+bison_fix
   build-depends:
   - orc
 - name: gstreamer-plugins-base
-- 
cgit v1.2.1


From e83d0a9565a99d5f7885f7b28ce21cca57e343d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 19:03:30 +0000
Subject: strata/core/bison: Do not use workaround to get package version

---
 strata/core/bison.morph | 1 -
 1 file changed, 1 deletion(-)

diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 0c649e78..7c7fffd9 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,5 +2,4 @@ name: bison
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
 - bash bootstrap --skip-po
-- 
cgit v1.2.1


From c5240343053398d288cc500ff54379a3b0de5309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 19:21:10 +0000
Subject: strata/core.morph: bison doesnt depend on bash

---
 strata/core.morph       | 1 -
 strata/core/bison.morph | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index a5ec5204..4a33d86d 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -212,7 +212,6 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - bash
   - flex
   - gettext-tarball
   - git
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 7c7fffd9..5f50fe89 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,4 +2,4 @@ name: bison
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- bash bootstrap --skip-po
+- ./bootstrap --skip-po
-- 
cgit v1.2.1


From 8be8eeed482a2fe7836973d4c4e3ae0babeb18dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 17:40:13 +0000
Subject: strata/coreutils-common/coreutils: Tell coreutils to not use git

---
 strata/coreutils-common/coreutils.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index cc1ae683..19542d79 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -3,7 +3,7 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- bash bootstrap --skip-po
+- bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
 - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
 build-commands:
 - make WERROR_CFLAGS=
-- 
cgit v1.2.1


From 0d70f2a93c1c8e9c0fe94c13b522126b2898c84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 19:07:31 +0000
Subject: strata/core: gtk-doc-stub doesnt depend on automake/autoconf/libtool

... but in a bash configure script
---
 strata/core.morph | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 4a33d86d..04b32e2b 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -128,9 +128,7 @@ chunks:
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf-tarball
-  - automake
-  - libtool-tarball
+  - bash
 - name: xz
   repo: upstream:xz
   ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
-- 
cgit v1.2.1


From 3c1861c9e2a5a54aa0ab289189ec291e1c22398b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 19:09:20 +0000
Subject: strata/core: Upgrade to latest version of help2man (1.46.5)

---
 strata/core.morph          | 5 ++---
 strata/core/help2man.morph | 9 ---------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 strata/core/help2man.morph

diff --git a/strata/core.morph b/strata/core.morph
index 04b32e2b..0dc3f150 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -195,10 +195,9 @@ chunks:
   - libexpat
   - openssl-new
 - name: help2man
-  morph: strata/core/help2man.morph
   repo: upstream:help2man
-  ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
-  unpetrify-ref: baserock/morph
+  ref: 83bab7e2e8e24a380266a9a247c029c49b0de666
+  unpetrify-ref: baserock/v1.46.5
   build-depends:
   - autoconf-tarball
   - automake
diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph
deleted file mode 100644
index e25a8d8e..00000000
--- a/strata/core/help2man.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: help2man
-kind: chunk
-configure-commands:
-- autoreconf -i
-- ./configure --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make  DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1


From 70357b67fabfdee12d4396296f145809fbc7b933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 19:18:30 +0000
Subject: strata/core.morph: libtool doesnt depend on bash

---
 strata/core.morph | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 0dc3f150..336a65dc 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -121,8 +121,7 @@ chunks:
   repo: upstream:libtool-tarball
   ref: c026ca36e37d2643623a75d0d3e9e451023139f3
   unpetrify-ref: libtool-2.4.6
-  build-depends:
-  - bash
+  build-depends: []
 - name: gtk-doc-stub
   repo: upstream:gtk-doc-stub
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
-- 
cgit v1.2.1


From d1c392c5f176d578ee02b2b54d0bda6a1ff37794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 18 Feb 2015 20:22:26 +0000
Subject: strata/core: patch doesnt depend on bash

---
 strata/core.morph       | 1 -
 strata/core/patch.morph | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 336a65dc..5de96bd4 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -282,5 +282,4 @@ chunks:
   ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
   unpetrify-ref: baserock/v2.7.1
   build-depends:
-  - bash
   - shadow
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 01d977c4..8e8f309c 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -1,7 +1,7 @@
 name: patch
 kind: chunk
 configure-commands:
-- bash bootstrap --skip-po
+- ./bootstrap --skip-po
 - ./configure --prefix="$PREFIX" --disable-nls
 build-commands:
 - make
-- 
cgit v1.2.1


From c301e719a8d787341bea26e1ac6401b691b6570c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 12:46:15 +0000
Subject: strata/core/patch: Use default autotools commands instead hardcode
 them

---
 strata/core/patch.morph | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 8e8f309c..b7f146ef 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -1,9 +1,5 @@
 name: patch
 kind: chunk
-configure-commands:
+build-system: autotools
+pre-configure-commands:
 - ./bootstrap --skip-po
-- ./configure --prefix="$PREFIX" --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1


From 663e1f7dcec49ca6f6d53d69033ce3bd1ed483e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 12:59:23 +0000
Subject: Move libopt morph file to correct location (chef stratum)

---
 strata/chef.morph         |  2 +-
 strata/chef/libpopt.morph | 10 ++++++++++
 strata/core/libpopt.morph | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 strata/chef/libpopt.morph
 delete mode 100644 strata/core/libpopt.morph

diff --git a/strata/chef.morph b/strata/chef.morph
index cd969cda..059f8a6a 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -202,7 +202,7 @@ chunks:
   unpetrify-ref: 1.0.0
   build-depends: []
 - name: libpopt
-  morph: strata/core/libpopt.morph
+  morph: strata/chef/libpopt.morph
   repo: upstream:libpopt
   ref: c224abf28f4ff9bbf292908324359cb5905addf8
   unpetrify-ref: master
diff --git a/strata/chef/libpopt.morph b/strata/chef/libpopt.morph
new file mode 100644
index 00000000..ae27432c
--- /dev/null
+++ b/strata/chef/libpopt.morph
@@ -0,0 +1,10 @@
+name: libpopt
+kind: chunk
+configure-commands:
+- autoreconf -if
+- ./configure
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
+
diff --git a/strata/core/libpopt.morph b/strata/core/libpopt.morph
deleted file mode 100644
index ae27432c..00000000
--- a/strata/core/libpopt.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: libpopt
-kind: chunk
-configure-commands:
-- autoreconf -if
-- ./configure
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-
-- 
cgit v1.2.1


From 161d70eaa1202e0bda150f21e3d537cc23480772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 26 Feb 2015 11:48:03 +0000
Subject: strata/chef/libpopt: Use default autotools commands instead hardcode
 them

---
 strata/chef/libpopt.morph | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/strata/chef/libpopt.morph b/strata/chef/libpopt.morph
index ae27432c..6adde30c 100644
--- a/strata/chef/libpopt.morph
+++ b/strata/chef/libpopt.morph
@@ -1,10 +1,6 @@
 name: libpopt
 kind: chunk
+build-system: autotools
 configure-commands:
 - autoreconf -if
 - ./configure
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-
-- 
cgit v1.2.1


From 28c0cb385380ae3f956813068c741ab3e54f0ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 13:00:38 +0000
Subject: Move sgdisk morph file to correct location (chef stratum)

---
 strata/chef.morph        | 2 +-
 strata/chef/sgdisk.morph | 7 +++++++
 strata/core/sgdisk.morph | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 strata/chef/sgdisk.morph
 delete mode 100644 strata/core/sgdisk.morph

diff --git a/strata/chef.morph b/strata/chef.morph
index 059f8a6a..9105a2e0 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -208,7 +208,7 @@ chunks:
   unpetrify-ref: master
   build-depends: []
 - name: sgdisk
-  morph: strata/core/sgdisk.morph
+  morph: strata/chef/sgdisk.morph
   repo: upstream:sgdisk
   ref: a920398fa393f9d6301b32b191bc01e086ab8bc8
   unpetrify-ref: master
diff --git a/strata/chef/sgdisk.morph b/strata/chef/sgdisk.morph
new file mode 100644
index 00000000..e792f9d9
--- /dev/null
+++ b/strata/chef/sgdisk.morph
@@ -0,0 +1,7 @@
+name: sgdisk
+kind: chunk
+build-commands:
+- make
+install-commands:
+- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk"
+
diff --git a/strata/core/sgdisk.morph b/strata/core/sgdisk.morph
deleted file mode 100644
index e792f9d9..00000000
--- a/strata/core/sgdisk.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: sgdisk
-kind: chunk
-build-commands:
-- make
-install-commands:
-- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk"
-
-- 
cgit v1.2.1


From e4fb5d0fbd07a96163e4b7c9b35e287b8465df20 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Thu, 26 Feb 2015 10:32:17 +0000
Subject: Add python-core to ansible stratum

markupsafe needs setuptools to compile and it got moved to
python-core, so ansible build-depends on python-core.
---
 strata/ansible.morph | 1 +
 1 file changed, 1 insertion(+)

diff --git a/strata/ansible.morph b/strata/ansible.morph
index e0cb8581..29ea73e6 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -3,6 +3,7 @@ kind: stratum
 description: A stratum with ansible and its dependencies
 build-depends:
 - morph: strata/core.morph
+- morph: strata/python-core.morph
 chunks:
 - name: paramiko
   repo: upstream:paramiko
-- 
cgit v1.2.1


From d9608c059f5880bd38bbc61164b6d185ee9d3380 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 26 Feb 2015 14:09:45 +0000
Subject: Python-core is needed in databases to build python-memcached

---
 strata/databases.morph | 1 +
 1 file changed, 1 insertion(+)

diff --git a/strata/databases.morph b/strata/databases.morph
index 4b06edf3..9171925c 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -4,6 +4,7 @@ description: some popular databases and some utils related to databases
 build-depends:
 - morph: strata/tools.morph
 - morph: strata/nfs.morph
+- morph: strata/python-core.morph
 chunks:
 - name: postgresql
   repo: upstream:postgresql
-- 
cgit v1.2.1


From 3db098545570f9a3c26f378457566b44c18a565e Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 26 Feb 2015 14:33:14 +0000
Subject: Python-core needed in apache-httpd for mod_wsgi-metrics

---
 strata/apache-httpd-server.morph | 1 +
 1 file changed, 1 insertion(+)

diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 1692c61c..065ec155 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -4,6 +4,7 @@ description: apache http web server and some utilities related to it
 build-depends:
 - morph: strata/tools.morph
 - morph: strata/pcre-utils.morph
+- morph: strata/python-core.morph
 chunks:
 - name: apr
   morph: strata/apache-httpd-server/apr.morph
-- 
cgit v1.2.1


From 2cd6084b0a24be5ab62a892bf4dfc5efd1b1db1e Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 26 Feb 2015 14:53:49 +0000
Subject: xstatic needs python-core

---
 strata/xstatic.morph | 1 +
 1 file changed, 1 insertion(+)

diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index d3a4228f..7b40ee60 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -10,6 +10,7 @@ description: |
     but it is required right now for the Openstack system to work.
 build-depends:
 - morph: strata/foundation.morph
+- morph: strata/python-core.morph
 chunks:
 - name: xstatic
   repo: upstream:xstatic
-- 
cgit v1.2.1