Merge remote-tracking branch 'baserock/master'

26 files changed, 135 insertions, 75 deletions

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
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
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 832d6118..e7da1784 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -63,8 +63,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
@@ -219,8 +219,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
diff --git a/strata/chef.morph b/strata/chef.morph
index cd969cda..9105a2e0 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -202,13 +202,13 @@ 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
   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/core/libpopt.morph b/strata/chef/libpopt.morph
index ae27432c..6adde30c 100644
--- a/strata/core/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
-
diff --git a/strata/core/sgdisk.morph b/strata/chef/sgdisk.morph
index e792f9d9..e792f9d9 100644
--- a/strata/core/sgdisk.morph
+++ b/strata/chef/sgdisk.morph
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
diff --git a/strata/core.morph b/strata/core.morph
index 0184de51..5de96bd4 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -119,18 +119,15 @@ chunks:
 - name: libtool-tarball
   morph: strata/core/libtool-tarball.morph
   repo: upstream:libtool-tarball
-  ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160
-  unpetrify-ref: libtool-2.4.5
-  build-depends:
-  - bash
+  ref: c026ca36e37d2643623a75d0d3e9e451023139f3
+  unpetrify-ref: libtool-2.4.6
+  build-depends: []
 - name: gtk-doc-stub
   repo: upstream:gtk-doc-stub
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf-tarball
-  - automake
-  - libtool-tarball
+  - bash
 - name: xz
   repo: upstream:xz
   ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
@@ -197,10 +194,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
@@ -212,7 +208,6 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - bash
   - flex
   - gettext-tarball
   - git
@@ -245,8 +240,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
@@ -270,20 +265,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: 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
@@ -301,5 +282,4 @@ chunks:
   ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
   unpetrify-ref: baserock/v2.7.1
   build-depends:
-  - bash
   - shadow
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index a9497d4e..5f50fe89 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -1,10 +1,5 @@
 name: bison
 kind: chunk
-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
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
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
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 01d977c4..b7f146ef 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -1,9 +1,5 @@
 name: patch
 kind: chunk
-configure-commands:
-- bash bootstrap --skip-po
-- ./configure --prefix="$PREFIX" --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
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=
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
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
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
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
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
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
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
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 409d6f17..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
@@ -25,3 +32,10 @@ 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:
+  - python-setuptools
diff --git a/strata/core/pyyaml.morph b/strata/python-core/pyyaml.morph
index 8ebd7b57..8ebd7b57 100644
--- a/strata/core/pyyaml.morph
+++ b/strata/python-core/pyyaml.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
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index a632d4df..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
@@ -21,16 +22,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 +92,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
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