diff options
Diffstat (limited to 'systems')
47 files changed, 38 insertions, 52 deletions
diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph index 4efd3981..47c69bad 100644 --- a/systems/base-system-armv7-highbank.morph +++ b/systems/base-system-armv7-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph index 2c3634b5..e5b9d7f5 100644 --- a/systems/base-system-armv7-versatile.morph +++ b/systems/base-system-armv7-versatile.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph index 2218af6f..169d490e 100644 --- a/systems/base-system-armv7b-highbank.morph +++ b/systems/base-system-armv7b-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph index 83b437a1..76d5c006 100644 --- a/systems/base-system-armv7b-vexpress-tc2.morph +++ b/systems/base-system-armv7b-vexpress-tc2.morph @@ -14,6 +14,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph index f5ced471..b889278d 100644 --- a/systems/base-system-armv7lhf-highbank.morph +++ b/systems/base-system-armv7lhf-highbank.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph index 85bc50b4..488bf5e4 100644 --- a/systems/base-system-ppc64-generic.morph +++ b/systems/base-system-ppc64-generic.morph @@ -15,6 +15,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph index f82d1667..40e62cad 100644 --- a/systems/base-system-x86_32-generic.morph +++ b/systems/base-system-x86_32-generic.morph @@ -16,7 +16,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph index 1bcafc2a..a3346a44 100644 --- a/systems/base-system-x86_64-generic.morph +++ b/systems/base-system-x86_64-generic.morph @@ -17,7 +17,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 43e701b5..e26c4003 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index db0b36e9..f557722b 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph - name: morph-utils @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index a317c696..d1176135 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 776fa4ab..c77d7e3f 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -22,7 +22,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index e336d2ec..697119c7 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 4cc66226..b24bd8f4 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -22,7 +22,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 6db657a1..83a58ae1 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -24,7 +24,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 182cf0cd..9c0cfb4e 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -19,7 +19,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - ceph diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph index 4d731ea3..d75fbd14 100644 --- a/systems/cxmanage-system-x86_64-generic.morph +++ b/systems/cxmanage-system-x86_64-generic.morph @@ -18,7 +18,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - fstab diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index abc2308c..9d4de4dd 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -28,6 +28,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 1a6a0783..a408b557 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -26,9 +26,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index c934e639..6e386a94 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -26,9 +26,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index afb308c8..2797c00e 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -26,9 +26,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index d1484f04..ad3a145c 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -24,6 +24,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 1b46449b..6804c7fb 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -22,9 +22,10 @@ strata: morph: strata/openstack-clients.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 780e90a9..3cb93869 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -28,6 +28,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 8bbab10e..d83c46a0 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -27,9 +27,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index f3cbbdf7..736033d6 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -19,8 +19,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: nfs + morph: strata/nfs.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: nodejs morph: strata/nodejs.morph - name: ruby @@ -30,6 +32,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 75ec89ae..859f8ad5 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -27,9 +27,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index ddceaad1..804cf606 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -26,6 +26,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index d65388e8..6a9cb092 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -24,9 +24,10 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 063e2684..4c882c22 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -30,6 +30,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 6bfaafbf..d6fb17ec 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -28,10 +28,11 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 202fccc5..65a53072 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -30,6 +30,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 3bedbd68..5a16c90b 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -28,6 +28,8 @@ strata: morph: strata/ruby.morph - name: baserock-import morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 1bee92ca..413c5b54 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -31,7 +31,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - vagrant diff --git a/systems/distbuild-system-x86_64-openstack.morph b/systems/distbuild-system-x86_64-openstack.morph index 483d8b99..aab6b08f 100644 --- a/systems/distbuild-system-x86_64-openstack.morph +++ b/systems/distbuild-system-x86_64-openstack.morph @@ -26,7 +26,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - distbuild diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 39f05b4f..5cbfddbe 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-genivi - morph: strata/bsp-jetson-genivi.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common @@ -36,7 +36,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index ccc1419d..a5f07750 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -34,7 +34,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 883c0efe..f5fb571e 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -38,7 +38,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - strip-gplv3 diff --git a/systems/gerrit-x86_64.morph b/systems/gerrit-x86_64.morph index 0dbca14e..91d4c701 100644 --- a/systems/gerrit-x86_64.morph +++ b/systems/gerrit-x86_64.morph @@ -26,7 +26,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - cloud-init diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 919b3647..9eabc403 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -33,6 +33,8 @@ strata: morph: strata/openstack-clients.morph - name: databases morph: strata/databases.morph +- name: pcre-utils + morph: strata/pcre-utils.morph - name: webtools morph: strata/webtools.morph - name: ruby @@ -42,6 +44,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph index c78abe1c..83093ac1 100644 --- a/systems/gitlab-server.morph +++ b/systems/gitlab-server.morph @@ -17,6 +17,8 @@ strata: morph: strata/nfs.morph - name: databases morph: strata/databases.morph +- name: pcre-utils + morph: strata/pcre-utils.morph - name: webtools morph: strata/webtools.morph - name: ruby @@ -26,7 +28,6 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files - gitlab diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph index b34d6626..2692e2fc 100644 --- a/systems/nodejs-system-x86_64.morph +++ b/systems/nodejs-system-x86_64.morph @@ -17,6 +17,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 0b4e4638..9a23bdeb 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -37,6 +37,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 7171c0ca..6cb9377b 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -37,6 +37,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 297c9fb2..b4f2c537 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,8 +15,12 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: pcre-utils + morph: strata/pcre-utils.morph - name: trove morph: strata/trove.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: nfs morph: strata/nfs.morph - name: ansible @@ -28,6 +32,5 @@ configuration-extensions: - trove - nfsboot-server - fstab -- simple-network - install-files - cloud-init diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 1e6eba80..22aa88c0 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -17,6 +17,10 @@ strata: morph: strata/nfs.morph - name: databases morph: strata/databases.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: webtools morph: strata/webtools.morph - name: erlang @@ -28,6 +32,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 1a2f8a97..152bf16b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -36,6 +36,5 @@ strata: configuration-extensions: - set-hostname - add-config-files -- simple-network - nfsboot - install-files |