Merge branch 'baserock/jonathan/drop-devel'

Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>

8 files changed, 121 insertions, 103 deletions

diff --git a/deploy-genivi-devel-system-armv7.sh b/deploy-genivi-devel-system-armv7.sh
index 989176fe..1e3ecce8 100755
--- a/deploy-genivi-devel-system-armv7.sh
+++ b/deploy-genivi-devel-system-armv7.sh
@@ -17,6 +17,6 @@
 # Creates a GENIVI development system image that is configured for
 # being run inside a qemu-arm emulator.
 
-morph deploy rawdisk genivi-devel-system-armv7-versatile \
+morph deploy rawdisk devel-system-armv7-versatile \
              genivi-devel-system-armv7-versatile.img \
              DISK_SIZE=30G INSTALL_FILES=genivi-devel-system-armv7/manifest
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index ed28417f..64a7cb79 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -13,9 +13,33 @@ strata:
 - morph: foundation
   repo: baserock:baserock/morphs
   ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: bsp-armv7-highbank
   repo: baserock:baserock/morphs
   ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: tools
   repo: baserock:baserock/morphs
   ref: master
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index 89734239..ba000a9f 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -13,9 +13,33 @@ strata:
 - morph: foundation
   repo: baserock:baserock/morphs
   ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: bsp-armv7-versatile
   repo: baserock:baserock/morphs
   ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: tools
   repo: baserock:baserock/morphs
   ref: master
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 39927403..a0b22513 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -13,9 +13,33 @@ strata:
 - morph: foundation
   repo: baserock:baserock/morphs
   ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: bsp-armv7b-highbank
   repo: baserock:baserock/morphs
   ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: tools
   repo: baserock:baserock/morphs
   ref: master
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 4ee93880..157a05f4 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -13,9 +13,33 @@ strata:
 - morph: foundation
   repo: baserock:baserock/morphs
   ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: bsp-x86_32-generic
   repo: baserock:baserock/morphs
   ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: tools
   repo: baserock:baserock/morphs
   ref: master
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 3c66d0c1..55bc76d1 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -13,9 +13,33 @@ strata:
 - morph: foundation
   repo: baserock:baserock/morphs
   ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: bsp-x86_64-generic
   repo: baserock:baserock/morphs
   ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
 - morph: tools
   repo: baserock:baserock/morphs
   ref: master
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
deleted file mode 100644
index e7fb2594..00000000
--- a/genivi-devel-system-armv7-versatile.morph
+++ /dev/null
@@ -1,51 +0,0 @@
-name: genivi-devel-system-armv7-versatile
-description: A GENIVI baseline system for an ARMv7 system.
-kind: system
-arch: armv7
-strata:
-- morph: build-essential
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: core
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: foundation
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi-foundation
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: bsp-armv7-versatile
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: connectivity
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: audio-bluetooth
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: x-common
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: x-armv7-versatile
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: multimedia
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi-x-armv7-versatile
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: tools
-  repo: baserock:baserock/morphs
-  ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
deleted file mode 100644
index cbfdb73c..00000000
--- a/genivi-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,51 +0,0 @@
-name: genivi-devel-system-x86_64-generic
-description: A GENIVI baseline system for a 64-bit x86 system.
-kind: system
-arch: x86_64
-strata:
-- morph: build-essential
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: core
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: foundation
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi-foundation
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: bsp-x86_64-generic
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: connectivity
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: audio-bluetooth
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: x-common
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: x-x86_64-generic
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: multimedia
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: genivi-x-x86_64-generic
-  repo: baserock:baserock/morphs
-  ref: master
-- morph: tools
-  repo: baserock:baserock/morphs
-  ref: master
-configuration-extensions:
-- set-hostname
-- ssh
-- add-config-files
-- simple-network
-- nfsboot
-- install-files