diff options
36 files changed, 249 insertions, 129 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index 4aaba633..2ab3aaf7 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -1,10 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi-foundation ref: master repo: baserock:baserock/morphs diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index 6944e2cc..3adb45eb 100644 --- a/base-system-armv7-highbank.morph +++ b/base-system-armv7-highbank.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index f20cfa8a..c505f7ca 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph index ba347c30..c3f042a3 100644 --- a/base-system-armv7b-highbank.morph +++ b/base-system-armv7b-highbank.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7b-vexpress-tc2.morph b/base-system-armv7b-vexpress-tc2.morph index 66dba656..66a6b101 100644 --- a/base-system-armv7b-vexpress-tc2.morph +++ b/base-system-armv7b-vexpress-tc2.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index f825becc..2425e989 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index 73806329..970e60c7 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2.morph index 7eacca97..9a47580b 100644 --- a/bsp-armv7b-vexpress-tc2.morph +++ b/bsp-armv7b-vexpress-tc2.morph @@ -5,7 +5,7 @@ build-depends: chunks: - build-depends: [] name: linux - ref: baserock/liw/tc2 + ref: baserock/arm/vexpress-tc2 repo: upstream:linux description: The platform dependent components required to boot Versatile TC2 board kind: stratum diff --git a/bsp-wandboard.morph b/bsp-wandboard.morph index 88a4e163..b6ee4d3c 100644 --- a/bsp-wandboard.morph +++ b/bsp-wandboard.morph @@ -10,7 +10,7 @@ chunks: - build-depends: - u-boot name: linux - ref: baserock/liw/wandboard_bsp + ref: baserock/arm/wandboard_bsp repo: upstream:linux description: The platform dependent components required to boot an wandboard ARM board. kind: stratum diff --git a/ceph-service-x86_64-generic.morph b/ceph-service-x86_64-generic.morph index f1d65b12..5c02fbe5 100644 --- a/ceph-service-x86_64-generic.morph +++ b/ceph-service-x86_64-generic.morph @@ -21,8 +21,8 @@ strata: ref: master configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot - install-files +- ceph diff --git a/ceph.configure b/ceph.configure new file mode 100644 index 00000000..14fa6f6b --- /dev/null +++ b/ceph.configure @@ -0,0 +1,216 @@ +#!/usr/bin/python +# Copyright (C) 2013 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License.5 +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import cliapp +import sys +import os +import subprocess +import shutil +import re + +systemd_monitor_template = """ +[Unit] +Description=Ceph Monitor firstboot setup + +[Service] +ExecStart=/usr/bin/ceph-mon --cluster {cluster} --mkfs -c {conf} -i {hostname} {keyring} +ExecStartPost=/bin/rm /etc/systemd/system/multi-user.target.wants/ceph-{cluster}-mon-fboot.service + +[Install] +Wanted-By=multi-user.target +""" +systemd_monitor_fname_template = "ceph-{cluster}-mon-fboot.service" + +systemd_osd_template = """ +[Unit] +Description=Ceph osd firstboot setup + +[Service] +ExecStart=/usr/sbin/ceph-disk prepare --cluster {cluster} --fs-type btrfs {data} +ExecStartPost=/bin/rm /etc/systemd/system/multi-user.target.wants/ceph-{cluster}-osd-{osd_id}-fboot.service + +[Install] +Wanted-By=multi-user.target +""" +systemd_osd_fname_template = "ceph-{cluster}-osd-{osd_id}-fboot.service" + +class CephConfigurationExtension(cliapp.Application): + """ + Set up ceph server daemons. + + Must include the following environment variables: + + HOSTNAME - Must be defined it is used as the ID for + the monitor and metadata daemons. + CEPH_CONF - Provide a ceph configuration file. + + Optional environment variables: + + CEPH_CLUSTER - Cluster name, if not provided defaults to 'ceph'. + + CEPH_BOOTSTRAP_OSD - Registered key capable of generating OSD + keys. + CEPH_BOOTSTRAP_MDS - Registered key capable of generating MDS + keys. + + Bootstrap keys are required for creating OSD daemons on servers + that do not have a running monitor daemon. They are gathered + by 'ceph-deploy gatherkeys' but can be generated and registered + separately. + + CEPH_MON - (Blank) Create a ceph monitor daemon on the image. + CEPH_MON_KEYRING - Location of monitor keyring. Required by the + monitor if using cephx authentication. + + + CEPH_OSD_X_DATA_DIR - Location of data directory for OSD. + Create an OSD daemon on image. 'X' is an integer + id, many osd daemons may be run on same server. + + CEPH_MDS - (Blank) Create a metadata server daemon on server. + """ + + def process_args(self, args): + + if "HOSTNAME" not in os.environ: + print "ERROR: Need a hostname defined by 'HOSTNAME'" + sys.exit(1) + if "CEPH_CLUSTER" not in os.environ: + print "ERROR: Need a cluster name defined by 'CEPH_CLUSTER'" + sys.exit(1) + if "CEPH_CONF" not in os.environ: + print "ERROR: Need a ceph conf file defined by 'CEPH_CONF'" + sys.exit(1) + + self.dest_dir = args[0] + + self.cluster_name = os.environ["CEPH_CLUSTER"] + self.hostname = os.environ["HOSTNAME"] + + self.conf_file = "/etc/ceph/{}.conf".format(self.cluster_name) + self.mon_dir = "/var/lib/ceph/mon/" + self.osd_dir = "/var/lib/ceph/osd/" + self.mds_dir = "/var/lib/ceph/mds/" + self.tmp_dir = "/var/lib/ceph/tmp/" + self.bootstrap_mds_dir = "/var/lib/ceph/bootstrap-mds/" + self.bootstrap_osd_dir = "/var/lib/ceph/bootstrap-osd/" + self.systemd_dir = "/etc/systemd/system/" + self.systemd_multiuser_dir = "/etc/systemd/system/multi-user.target.wants/" + + self.copy_to_img(os.environ["CEPH_CONF"], self.conf_file) + + # Copy over bootstrap keyrings + if "CEPH_BOOTSTRAP_OSD" in os.environ: + self.copy_bootstrap_osd(os.environ["CEPH_BOOTSTRAP_OSD"]); + if "CEPH_BOOTSTRAP_MDS" in os.environ: + self.copy_bootstrap_mds(os.environ["CEPH_BOOTSTRAP_MDS"]); + + # Configure any monitor daemons + if "CEPH_MON" in os.environ: + self.create_mon_data_dir(os.environ.get("CEPH_MON_KEYRING")) + + # Configure any object storage daemons + osd_re = r"CEPH_OSD_(\d+)_DATA_DIR$" + + for env in os.environ.keys(): + match = re.match(osd_re, env) + if match: + osd_data_dir_env = match.group(0) + osd_id = match.group(1) + + self.create_osd_data_dir(osd_id, os.environ.get(osd_data_dir_env)) + + # Configure any mds daemons + if "CEPH_MDS" in os.environ: + self.create_mds_data_dir() + + def copy_to_img(self, src_file, dest_file): + shutil.copy(src_file, self.dest_dir + dest_file) + + def copy_bootstrap_osd(self, src_file): + self.copy_to_img(src_file, + os.path.join(self.bootstrap_osd_dir, "{}.keyring".format(self.cluster_name))) + + def copy_bootstrap_mds(self, src_file): + self.copy_to_img(src_file, + os.path.join(self.bootstrap_mds_dir, "{}.keyring".format(self.cluster_name))) + + def symlink_to_multiuser(self, fname): + print >> sys.stderr, os.path.join("../", fname) + print >> sys.stderr, self.dest_dir + os.path.join(self.systemd_multiuser_dir, fname) + os.symlink(os.path.join("../", fname), + self.dest_dir + os.path.join(self.systemd_multiuser_dir, fname)) + + def create_mon_data_dir(self, src_keyring): + + #Create the monitor data directory + mon_data_dir = os.path.join(self.mon_dir, "{}-{}".format(self.cluster_name, self.hostname)) + os.makedirs(self.dest_dir + mon_data_dir) + + #Create sysvinit file to start via sysvinit + sysvinit_file = os.path.join(mon_data_dir, "sysvinit") + open(self.dest_dir + sysvinit_file, 'a').close() + + #Create systemd file to initialize the monitor data directory + keyring = "" + if src_keyring: + #Copy the keyring from local to the image + dest_keyring = os.path.join(self.tmp_dir, + "{}-{}.mon.keyring".format(self.cluster_name, self.hostname)) + self.copy_to_img(src_keyring, dest_keyring) + + keyring = "--keyring " + dest_keyring + + mon_systemd_fname = systemd_monitor_fname_template.format(cluster=self.cluster_name) + mon_systemd = open(self.dest_dir + os.path.join(self.systemd_dir, mon_systemd_fname), "w") + mon_systemd.write(systemd_monitor_template.format(cluster=self.cluster_name, + conf=self.conf_file, + hostname=self.hostname, + keyring=keyring)) + mon_systemd.close() + + #Create a symlink to the multi user target + self.symlink_to_multiuser(mon_systemd_fname) + + def create_osd_data_dir(self, osd_id, data_dir): + if not data_dir: + data_dir = '/srv/osd' + osd_id + + #Create the osd data dir + os.makedirs(self.dest_dir + data_dir) + + osd_systemd_fname = systemd_osd_fname_template.format(cluster=self.cluster_name, osd_id=osd_id) + osd_systemd = open(self.dest_dir + os.path.join(self.systemd_dir, osd_systemd_fname), "w") + osd_systemd.write(systemd_osd_template.format(cluster=self.cluster_name, + data=data_dir, + osd_id=osd_id)) + osd_systemd.close() + + #Create a symlink to the multi user target + self.symlink_to_multiuser(osd_systemd_fname) + + def create_mds_data_dir(self): + + #Create the monitor data directory + mds_data_dir = os.path.join(self.mds_dir, "{}-{}".format(self.cluster_name, self.hostname)) + os.makedirs(self.dest_dir + mds_data_dir) + + #Create sysvinit file to start via sysvinit + sysvinit_file = os.path.join(mds_data_dir, "sysvinit") + open(self.dest_dir + sysvinit_file, 'a').close() + + +CephConfigurationExtension().run() diff --git a/connectivity.morph b/connectivity.morph index 89455fc6..e8f553c7 100644 --- a/connectivity.morph +++ b/connectivity.morph @@ -1,10 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi-foundation ref: master repo: baserock:baserock/morphs diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index eec28c1e..4507a187 100644 --- a/devel-system-armv7-highbank.morph +++ b/devel-system-armv7-highbank.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index ef79c9d2..8f47af78 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph index ff5e893d..4d983881 100644 --- a/devel-system-armv7-wandboard.morph +++ b/devel-system-armv7-wandboard.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph index 5dc74409..7faccbfa 100644 --- a/devel-system-armv7b-highbank.morph +++ b/devel-system-armv7b-highbank.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index bc057f5d..76bb56d9 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index b7300877..e6f32ac8 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph index de0601e1..33c65987 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph index f5a678b6..11bb9b8e 100644 --- a/genivi-baseline-system-x86_64-generic.morph +++ b/genivi-baseline-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/genivi-foundation.morph b/genivi-foundation.morph index 39b5efa8..15ae5407 100644 --- a/genivi-foundation.morph +++ b/genivi-foundation.morph @@ -1,7 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs - morph: foundation ref: master repo: baserock:baserock/morphs diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph index 34b52f7a..6743e766 100644 --- a/genivi-x-armv7-versatile.morph +++ b/genivi-x-armv7-versatile.morph @@ -1,13 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs -- morph: genivi-foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi ref: master repo: baserock:baserock/morphs diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph index b3f475ef..1daf1969 100644 --- a/genivi-x-x86_64-generic.morph +++ b/genivi-x-x86_64-generic.morph @@ -1,13 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs -- morph: genivi-foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi ref: master repo: baserock:baserock/morphs diff --git a/genivi.morph b/genivi.morph index 6b14901f..dd327eda 100644 --- a/genivi.morph +++ b/genivi.morph @@ -1,10 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi-foundation ref: master repo: baserock:baserock/morphs diff --git a/glanceclient.morph b/glanceclient.morph index 0ed5edb3..f69779be 100644 --- a/glanceclient.morph +++ b/glanceclient.morph @@ -1,19 +1,9 @@ build-depends: -- morph: build-essential - ref: master - repo: baserock:baserock/morphs -- morph: core - ref: master - repo: baserock:baserock/morphs - morph: tools ref: master repo: baserock:baserock/morphs chunks: - build-depends: [] - name: six - ref: baserock/morph - repo: upstream:six -- build-depends: [] name: jsonschema ref: baserock/morph repo: upstream:jsonschema @@ -26,7 +16,6 @@ chunks: ref: baserock/morph repo: upstream:python-json-patch - build-depends: - - six - jsonschema - python-json-pointer - python-json-patch @@ -80,7 +69,6 @@ chunks: - python-prettytable - python-requests - simplejson - - six - netaddr - babel name: python-keystoneclient diff --git a/multimedia.morph b/multimedia.morph index 5c83fa90..78e6a613 100644 --- a/multimedia.morph +++ b/multimedia.morph @@ -1,10 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: audio-bluetooth ref: master repo: baserock:baserock/morphs diff --git a/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph index 95c05ef6..9448d427 100644 --- a/openstack-client-base-system-x86_32-generic.morph +++ b/openstack-client-base-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph index ccfe30d2..39a51858 100644 --- a/openstack-client-base-system-x86_64-generic.morph +++ b/openstack-client-base-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph index 9075ae3f..b70947fd 100644 --- a/qt4-devel-system-x86_64-generic.morph +++ b/qt4-devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph index 3509ad50..7269c09a 100644 --- a/qt5-devel-system-x86_64-generic.morph +++ b/qt5-devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/release.morph b/release.morph index e94cbeb6..2a54f96d 100644 --- a/release.morph +++ b/release.morph @@ -3,63 +3,58 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: -- morph: base-system-armv7-versatile +- morph: base-system-armv7-highbank deploy: - release: + as-tar: type: tar - location: /src/release/baserock-11-base-system-armv7-versatile.tar -- morph: devel-system-armv7-versatile + location: /src/release/baserock-12-base-system-armv7-highbank.tar +- morph: devel-system-armv7-highbank deploy: as-tar: type: tar - location: /src/release/baserock-11-devel-system-armv7-versatile.tar - INSTALL_FILES: genivi-devel-system-armv7/manifest - as-disk: - type: rawdisk - location: /src/release/baserock-11-devel-system-armv7-versatile.img - DISK_SIZE: 30G - INSTALL_FILES: genivi-devel-system-armv7/manifest -- morph: devel-system-armv7-wandboard + location: /src/release/baserock-12-devel-system-armv7-highbank.tar +- morph: base-system-armv7b-highbank deploy: - release: + as-tar: type: tar - location: /src/release/baserock-11-devel-system-armv7-wandboard.tar -- morph: genivi-baseline-system-armv7-versatile + location: /src/release/baserock-12-base-system-armv7b-highbank.tar +- morph: devel-system-armv7b-highbank deploy: as-tar: type: tar - location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.tar - as-disk: - type: rawdisk - location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.img - DISK_SIZE: 4G + location: /src/release/baserock-12-devel-system-armv7b-highbank.tar +- morph: devel-system-armv7-wandboard + deploy: + release: + type: tar + location: /src/release/baserock-12-devel-system-armv7-wandboard.tar - morph: base-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-base-system-x86_32-generic.img + location: /src/release/baserock-12-base-system-x86_32-generic.img DISK_SIZE: 4G - morph: devel-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-devel-system-x86_32-generic.img + location: /src/release/baserock-12-devel-system-x86_32-generic.img DISK_SIZE: 4G - morph: base-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-base-system-x86_64-generic.img + location: /src/release/baserock-12-base-system-x86_64-generic.img DISK_SIZE: 4G - morph: devel-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-devel-system-x86_64-generic.img + location: /src/release/baserock-12-devel-system-x86_64-generic.img DISK_SIZE: 4G - morph: genivi-baseline-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-genivi-baseline-system-x86_64-generic.img + location: /src/release/baserock-12-genivi-baseline-system-x86_64-generic.img DISK_SIZE: 4G diff --git a/tools.morph b/tools.morph index e0fcc8ef..9f614b0d 100644 --- a/tools.morph +++ b/tools.morph @@ -4,6 +4,10 @@ build-depends: repo: baserock:baserock/morphs chunks: - build-depends: [] + name: six + ref: baserock/morph + repo: upstream:six +- build-depends: [] name: patch ref: baserock/morph repo: upstream:patch @@ -70,9 +74,15 @@ chunks: ref: baserock/morph repo: upstream:lsof - build-depends: + - six + name: pyfilesystem + ref: baserock/morph + repo: upstream:pyfilesystem +- build-depends: - cliapp - cmdtest - python-coverage-test-runner + - pyfilesystem name: morph ref: master repo: baserock:baserock/morph diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph index 555e01d8..aa320191 100644 --- a/x-armv7-versatile.morph +++ b/x-armv7-versatile.morph @@ -1,13 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs -- morph: genivi-foundation - ref: master - repo: baserock:baserock/morphs - morph: x-common ref: master repo: baserock:baserock/morphs diff --git a/x-common.morph b/x-common.morph index 657708fd..04b86af6 100644 --- a/x-common.morph +++ b/x-common.morph @@ -1,10 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs - morph: genivi-foundation ref: master repo: baserock:baserock/morphs diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph index 6ec5c724..b57effe7 100644 --- a/x-x86_64-generic.morph +++ b/x-x86_64-generic.morph @@ -1,13 +1,4 @@ build-depends: -- morph: core - ref: master - repo: baserock:baserock/morphs -- morph: foundation - ref: master - repo: baserock:baserock/morphs -- morph: genivi-foundation - ref: master - repo: baserock:baserock/morphs - morph: x-common ref: master repo: baserock:baserock/morphs diff --git a/xfce-system.morph b/xfce-system.morph index 63d34c95..45f72568 100644 --- a/xfce-system.morph +++ b/xfce-system.morph @@ -1,13 +1,11 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot - install-files description: A GENIVI devel with XFCE -disk-size: 2G kind: system name: xfce-system strata: |