25 files changed, 43 insertions, 115 deletions
diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph
index ea791c6f..88922e27 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot an ARM highbank
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7-highbank
   repo: upstream:linux
-  ref: cb27bf639e30c5126361c9cb7dd32c2e36a98d8a
-  unpetrify-ref: baserock/arm/highbank
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 797fdeec..cc1298f1 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -5,8 +5,8 @@ description: The platform dependent components required to boot an ARM versatile
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7-versatile
   repo: upstream:linux
-  ref: 5a9b14cc3d6bc4060cc55ed6e1d2b5565b201ad5
-  unpetrify-ref: baserock/arm/versatile
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph
index 491f0948..0a94bcc1 100644
--- a/bsp-armv7b-highbank.morph
+++ b/bsp-armv7b-highbank.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot an ARM highbank
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7b-highbank
   repo: upstream:linux
-  ref: ba8aac8133ac7191b6cdf3f1f62c70eb3983be17
-  unpetrify-ref: baserock/arm/highbank-be
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2.morph
index 3446cb9a..d8abde2d 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/bsp-armv7b-vexpress-tc2.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot Versatile TC2 bo
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-armv7b-vexpress-tc2
   repo: upstream:linux
-  ref: db9d2e3dd6fc61f0f7a01ce11ad10f27e648e2b0
-  unpetrify-ref: baserock/arm/vexpress-tc2
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-ppc64-generic.morph b/bsp-ppc64-generic.morph
index d765e6c2..fdafb86f 100644
--- a/bsp-ppc64-generic.morph
+++ b/bsp-ppc64-generic.morph
@@ -4,8 +4,8 @@ description: The platform dependent components required to boot a ppc64 board.
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-ppc64
   repo: upstream:linux
-  ref: 7758cbb7fe9277c8486d87791f0e5f1398d0fb22
-  unpetrify-ref: baserock/powerpc/ppc64
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
+  unpetrify-ref: baserock/morph
   build-depends: []
diff --git a/bsp-wandboard.morph b/bsp-wandboard.morph
index 95f61bc9..cab25125 100644
--- a/bsp-wandboard.morph
+++ b/bsp-wandboard.morph
@@ -9,9 +9,9 @@ chunks:
   ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: linux
+- name: linux-armv7-wandboard
   repo: upstream:linux
-  ref: 635ad1134d5e3fccf8c9ec50983b8d39e1493ae9
-  unpetrify-ref: baserock/arm/wandboard_bsp
+  ref: 9573986cf27ff44814f3efb1f1e95638406db456
+  unpetrify-ref: baserock/morph
   build-depends:
   - u-boot
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index b6cb845a..625f854c 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -5,9 +5,9 @@ description: The set of platform specific components required for booting a 32-b
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-x86-32-generic
   repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: nasm
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index a824fdfc..ea7ab404 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -5,9 +5,9 @@ description: The set of platform specific components required for booting a 64-b
 build-depends:
 - morph: core
 chunks:
-- name: linux
+- name: linux-x86-64-generic
   repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  ref: d67a0e110187abd560a1de63fa172894a52839d5
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: nasm
diff --git a/core.morph b/core.morph
index 15922b65..cbe3348e 100644
--- a/core.morph
+++ b/core.morph
@@ -206,7 +206,7 @@ chunks:
   - perl
 - name: util-linux
   repo: upstream:util-linux
-  ref: 2fb567c080e1762ec6a2147564f03068f55d4f14
+  ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
   unpetrify-ref: baserock/morph
   build-depends:
   - autoconf
diff --git a/devel-system-armv7-chroot.morph b/devel-system-armv7-chroot.morph
index 0ec755f8..aabf9ec1 100644
--- a/devel-system-armv7-chroot.morph
+++ b/devel-system-armv7-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index adeb07b3..a4ebd37e 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index e4cf3d53..2fc3e585 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-versatile
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
index 2d758824..08aeb4af 100644
--- a/devel-system-armv7-wandboard.morph
+++ b/devel-system-armv7-wandboard.morph
@@ -12,13 +12,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-wandboard
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7b-chroot.morph b/devel-system-armv7b-chroot.morph
index 66fa0af2..6a417ec6 100644
--- a/devel-system-armv7b-chroot.morph
+++ b/devel-system-armv7b-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 1a120e10..bbb50976 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7b-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-chroot.morph b/devel-system-armv7lhf-chroot.morph
index c6d5b5a2..f07fc777 100644
--- a/devel-system-armv7lhf-chroot.morph
+++ b/devel-system-armv7lhf-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph
index d357f483..7a9fd2cd 100644
--- a/devel-system-armv7lhf-highbank.morph
+++ b/devel-system-armv7lhf-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-jetson.morph b/devel-system-armv7lhf-jetson.morph
index 99157402..07a66d3e 100644
--- a/devel-system-armv7lhf-jetson.morph
+++ b/devel-system-armv7lhf-jetson.morph
@@ -12,13 +12,5 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
-- morph: bsp-wandboard
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-wandboard.morph b/devel-system-armv7lhf-wandboard.morph
index 2a0969ec..c9b7c8a5 100644
--- a/devel-system-armv7lhf-wandboard.morph
+++ b/devel-system-armv7lhf-wandboard.morph
@@ -12,13 +12,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-wandboard
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
index 1297acba..cbe42301 100644
--- a/devel-system-ppc64-generic.morph
+++ b/devel-system-ppc64-generic.morph
@@ -13,14 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-ppc64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-ppc64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-ppc64-generic
 - morph: tools
 - morph: openstack-clients
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 42d363b5..28c89447 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -13,14 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-x86_32-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
 - morph: tools
 - morph: openstack-clients
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 7048df53..1daa45d2 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -13,15 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
 - morph: tools
-- morph: virtualization
 - morph: openstack-clients
diff --git a/release.morph b/release.morph
index beac3b92..de9e4e15 100644
--- a/release.morph
+++ b/release.morph
@@ -7,28 +7,28 @@ systems:
   deploy:
     release:
       type: tar
-      location: /src/release/baserock-14.23-devel-system-armv7lhf-wandboard.tar
+      location: /src/release/baserock-14.24-devel-system-armv7lhf-wandboard.tar
 - morph: devel-system-x86_32-chroot
   deploy:
     release:
       type: tar
-      location: /src/release/baserock-14.23-devel-system-x86_32-chroot.tar
+      location: /src/release/baserock-14.24-devel-system-x86_32-chroot.tar
 - morph: devel-system-x86_32-generic
   deploy:
     release:
       type: rawdisk
-      location: /src/release/baserock-14.23-devel-system-x86_32-generic.img
+      location: /src/release/baserock-14.24-devel-system-x86_32-generic.img
       DISK_SIZE: 4G
-      VERSION_LABEL: baserock-14.23
+      VERSION_LABEL: baserock-14.24
 - morph: devel-system-x86_64-chroot
   deploy:
     release:
       type: tar
-      location: /src/release/baserock-14.23-devel-system-x86_64-chroot.tar
+      location: /src/release/baserock-14.24-devel-system-x86_64-chroot.tar
 - morph: devel-system-x86_64-generic
   deploy:
     release:
       type: rawdisk
-      location: /src/release/baserock-14.23-devel-system-x86_64-generic.img
+      location: /src/release/baserock-14.24-devel-system-x86_64-generic.img
       DISK_SIZE: 4G
-      VERSION_LABEL: baserock-14.23
+      VERSION_LABEL: baserock-14.24
diff --git a/scripts/distbuild-cluster.py b/scripts/distbuild-cluster.py
index 2d0e64d3..e5bada58 100644
--- a/scripts/distbuild-cluster.py
+++ b/scripts/distbuild-cluster.py
@@ -39,7 +39,7 @@ controllers = {
 }
 
 
-ref_to_build = 'baserock-14.22'
+ref_to_build = 'baserock-14.24'
 
 
 def read_morph(morph_name, kind=None):
diff --git a/tools.morph b/tools.morph
index a5731246..831af23d 100644
--- a/tools.morph
+++ b/tools.morph
@@ -56,7 +56,7 @@ chunks:
   build-depends: []
 - name: e2fsprogs
   repo: upstream:e2fsprogs
-  ref: 5f4b406b03dc9fa27c78184df5b1d501e373ca01
+  ref: 485edc675200ff3097cec521c357441a1c2d9b0d
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: file
@@ -92,7 +92,7 @@ chunks:
   - six
 - name: morph
   repo: baserock:baserock/morph
-  ref: 3e4edca024ae5ea0ff5516a7ae2402fae1108b83
+  ref: d9be3c69242ff44fd8af05cf4b0bc7f8fe41d691
   unpetrify-ref: master
   build-depends:
   - cliapp