Merge branch 'master' of git://git.baserock.org/baserock/baserock/definitions

This includes a fix for CVE-2015-7547, the recent GLIBC vulnerability.

Change-Id: Ie0901194d9e4a161659752837bac273beb93240e

25 files changed, 260 insertions, 48 deletions

diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 9a5f48f2..6812e622 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index fd0cdfcb..22cac493 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 423648c9..9a38f5ba 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 7e594710..c71a3319 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 0c9344c1..b385161e 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -47,8 +47,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 4bd34876..294ced01 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -54,8 +54,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
index 94f85ec2..f73576bc 100644
--- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph
+++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
@@ -51,8 +51,10 @@ strata:
   morph: strata/libsoup-common.morph
 - name: ostree-core
   morph: strata/ostree-core.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 203d5ef8..3e42adba 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index c0ccfa66..21b31da7 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -61,8 +61,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 14bc1b27..9d343db4 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -59,8 +59,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 6cf81846..e2482245 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -59,8 +59,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index ab8dcd1b..496da0bd 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index 3cf21388..fbfd8220 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 5e4c5f98..2fce60bf 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -53,8 +53,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index be76353c..1d89eb8a 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index bcd0acfc..b28b1ca5 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index c03c8b73..ba103e9d 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -60,8 +60,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 49fc75af..efadb210 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -57,8 +57,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 5ee32cc2..1dde180f 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -60,8 +60,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index e142c7c5..cf12e97e 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..44cf5e80
--- /dev/null
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -0,0 +1,90 @@
+name: gnome-system-armv7lhf-jetson
+kind: system
+description: A GNOME system system.
+arch: armv7lhf
+strata:
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: bsp-jetson
+  morph: strata/bsp-jetson.morph
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: NetworkManager-common
+  morph: strata/NetworkManager-common.morph
+- name: core
+  morph: strata/core.morph
+- name: data-indexing-management
+  morph: strata/data-indexing-management.morph
+- name: dlna-services
+  morph: strata/dlna-services.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: gnome
+  morph: strata/gnome.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: gtk-deps
+  morph: strata/gtk-deps.morph
+- name: gtk2
+  morph: strata/gtk2.morph
+- name: gtk3
+  morph: strata/gtk3.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: python3-gobject
+  morph: strata/python3-gobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: weston-common
+  morph: strata/weston-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-drivers
+  morph: strata/x-drivers.morph
+- name: x-generic
+  morph: strata/x-generic.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: xdg-app-common
+  morph: strata/xdg-app-common.morph
+- name: network-security
+  morph: strata/network-security.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+- name: samba
+  morph: strata/samba.morph
+- name: secret-service
+  morph: strata/secret-service.morph
+- name: spell-checking
+  morph: strata/spell-checking.morph
+- name: storage-management
+  morph: strata/storage-management.morph
+- name: cups
+  morph: strata/cups.morph
+- name: WebKitGtk1-common
+  morph: strata/WebKitGtk1-common.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 3166a486..2068397f 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -13,8 +13,14 @@ strata:
   morph: strata/NetworkManager-common.morph
 - name: core
   morph: strata/core.morph
+- name: data-indexing-management
+  morph: strata/data-indexing-management.morph
+- name: dlna-services
+  morph: strata/dlna-services.morph
 - name: foundation
   morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: gnome
@@ -35,20 +41,24 @@ strata:
   morph: strata/mesa-common.morph
 - name: multimedia-common
   morph: strata/multimedia-common.morph
+- name: multimedia-hardware-codecs-x86
+  morph: strata/multimedia-hardware-codecs-x86.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
+- name: privileges-management
+  morph: strata/privileges-management.morph
 - name: python2-core
   morph: strata/python2-core.morph
-- name: python-pygobject
-  morph: strata/python-pygobject.morph
+- name: python3-gobject
+  morph: strata/python3-gobject.morph
 - name: libsoup-common
   morph: strata/libsoup-common.morph
 - name: ruby
   morph: strata/ruby.morph
-- name: tools
-  morph: strata/tools.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
+- name: vala-common
+  morph: strata/vala-common.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
 - name: weston-common
@@ -69,8 +79,16 @@ strata:
   morph: strata/icu-common.morph
 - name: samba
   morph: strata/samba.morph
+- name: secret-service
+  morph: strata/secret-service.morph
+- name: spell-checking
+  morph: strata/spell-checking.morph
+- name: storage-management
+  morph: strata/storage-management.morph
 - name: cups
   morph: strata/cups.morph
+- name: WebKitGtk1-common
+  morph: strata/WebKitGtk1-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index e8230c88..d6a84fd6 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -30,8 +30,8 @@ strata:
   morph: strata/qt4-tools.morph
 - name: qt4-sdk
   morph: strata/qt4-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index b68faf79..90b6703a 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -32,8 +32,8 @@ strata:
   morph: strata/qt5-tools-qtwebkit.morph
 - name: qt5-sdk
   morph: strata/qt5-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph
new file mode 100644
index 00000000..b7fe546a
--- /dev/null
+++ b/systems/weston-qt5-system-x86_64.morph
@@ -0,0 +1,64 @@
+name: weston-qt5-system-x86_64.morph
+kind: system
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: coreutils-common
+  morph: strata/coreutils-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: weston-common
+  morph: strata/weston-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-generic
+  morph: strata/x-generic.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-tools-qtwebkit
+  morph: strata/qt5-tools-qtwebkit.morph
+- name: qt5-sdk
+  morph: strata/qt5-sdk.morph
+- name: qt5-tools-qtwayland
+  morph: strata/qt5-tools-qtwayland.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files