From 5390c2a1ec9815c90177e41f796278d59ed44dea Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Fri, 23 Jan 2015 15:28:05 +0000 Subject: Morph build 3e7db1f16da7415d8881f5c58e7fa189 System branch: master --- ceph.configure | 90 +++++++-- chef-system-x86_64-container.morph | 32 +++ chef/manifest | 3 + clusters/cephclient.morph | 12 ++ strata/baserock-import.morph | 2 +- .../bsp-x86_64-generic/linux-x86-64-generic.morph | 1 + strata/build-essential.morph | 3 +- strata/build-essential/busybox.morph | 1 + strata/chef.morph | 216 +++++++++++++++++++++ strata/chef/chef-master.morph | 20 ++ strata/chef/chef-zero-2.2.morph | 13 ++ strata/chef/coderay-1.1.0.morph | 13 ++ strata/chef/diff-lcs-1.2.5.morph | 13 ++ strata/chef/erubis-master.morph | 16 ++ strata/chef/ffi-1.9.3.morph | 13 ++ strata/chef/ffi-yajl-master.morph | 13 ++ strata/chef/hashie-2.1.2.morph | 13 ++ strata/chef/highline-master.morph | 13 ++ strata/chef/hoe-master.morph | 12 ++ strata/chef/ipaddress-master.morph | 13 ++ strata/chef/json-1.8.1.morph | 13 ++ strata/chef/libyajl2-1.0.1.morph | 13 ++ strata/chef/method_source-0.8.2.morph | 13 ++ strata/chef/mime-types-1.25.1.morph | 13 ++ strata/chef/mixlib-authentication-1.3.0.morph | 13 ++ strata/chef/mixlib-cli-1.5.0.morph | 13 ++ strata/chef/mixlib-config-2.1.0.morph | 13 ++ strata/chef/mixlib-log-master.morph | 13 ++ strata/chef/mixlib-shellout-1.4.0.morph | 13 ++ strata/chef/net-dhcp-1.2.1.morph | 13 ++ strata/chef/net-ssh-2.9.1.morph | 15 ++ strata/chef/net-ssh-gateway-1.2.0.morph | 15 ++ strata/chef/net-ssh-multi-1.2.0.morph | 15 ++ strata/chef/ohai-master.morph | 13 ++ strata/chef/plist-master.morph | 12 ++ strata/chef/pry-master.morph | 13 ++ strata/chef/rack-1.5.2.morph | 13 ++ strata/chef/slop-3.6.0.morph | 13 ++ strata/chef/systemu-master.morph | 13 ++ strata/chef/wmi-lite-1.0.0.morph | 13 ++ strata/chef/yajl.morph | 5 + strata/core/libpopt.morph | 9 + strata/core/sgdisk.morph | 6 + strata/cross-bootstrap.morph | 6 +- strata/devtools.morph | 32 +++ strata/devtools/screen.morph | 11 ++ strata/devtools/vim.morph | 10 + strata/foundation/pciutils.morph | 12 +- strata/morph-utils.morph | 6 +- strata/ntpd.morph | 10 + strata/tools.morph | 24 +-- strata/tools/screen.morph | 11 -- strata/tools/vim.morph | 10 - strata/trove.morph | 2 +- systems/build-system-armv7lhf-highbank.morph | 2 + systems/build-system-armv7lhf-jetson.morph | 2 + systems/build-system-ppc64.morph | 2 + systems/build-system-x86_32-chroot.morph | 2 + systems/build-system-x86_32.morph | 2 + systems/build-system-x86_64-chroot.morph | 2 + systems/build-system-x86_64.morph | 2 + systems/ceph-service-x86_64-generic.morph | 23 +++ systems/devel-system-armv7-chroot.morph | 2 + systems/devel-system-armv7-highbank.morph | 2 + systems/devel-system-armv7-versatile.morph | 2 + systems/devel-system-armv7-wandboard.morph | 2 + systems/devel-system-armv7b-chroot.morph | 2 + systems/devel-system-armv7b-highbank.morph | 2 + systems/devel-system-armv7lhf-chroot.morph | 2 + systems/devel-system-armv7lhf-highbank.morph | 2 + systems/devel-system-armv7lhf-jetson.morph | 2 + systems/devel-system-armv7lhf-wandboard.morph | 2 + systems/devel-system-ppc64-chroot.morph | 2 + systems/devel-system-ppc64-generic.morph | 2 + systems/devel-system-x86_32-chroot.morph | 2 + systems/devel-system-x86_32-generic.morph | 2 + systems/devel-system-x86_64-chroot.morph | 2 + systems/devel-system-x86_64-generic.morph | 2 + systems/devel-system-x86_64-vagrant.morph | 2 + systems/trove-system-x86_64.morph | 2 + systems/zookeeper-client-x86_64.morph | 2 + systems/zookeeper-server-x86_64.morph | 2 + 82 files changed, 928 insertions(+), 80 deletions(-) create mode 100644 chef-system-x86_64-container.morph create mode 100644 chef/manifest create mode 100644 clusters/cephclient.morph create mode 100644 strata/chef.morph create mode 100644 strata/chef/chef-master.morph create mode 100644 strata/chef/chef-zero-2.2.morph create mode 100644 strata/chef/coderay-1.1.0.morph create mode 100644 strata/chef/diff-lcs-1.2.5.morph create mode 100644 strata/chef/erubis-master.morph create mode 100644 strata/chef/ffi-1.9.3.morph create mode 100644 strata/chef/ffi-yajl-master.morph create mode 100644 strata/chef/hashie-2.1.2.morph create mode 100644 strata/chef/highline-master.morph create mode 100644 strata/chef/hoe-master.morph create mode 100644 strata/chef/ipaddress-master.morph create mode 100644 strata/chef/json-1.8.1.morph create mode 100644 strata/chef/libyajl2-1.0.1.morph create mode 100644 strata/chef/method_source-0.8.2.morph create mode 100644 strata/chef/mime-types-1.25.1.morph create mode 100644 strata/chef/mixlib-authentication-1.3.0.morph create mode 100644 strata/chef/mixlib-cli-1.5.0.morph create mode 100644 strata/chef/mixlib-config-2.1.0.morph create mode 100644 strata/chef/mixlib-log-master.morph create mode 100644 strata/chef/mixlib-shellout-1.4.0.morph create mode 100644 strata/chef/net-dhcp-1.2.1.morph create mode 100644 strata/chef/net-ssh-2.9.1.morph create mode 100644 strata/chef/net-ssh-gateway-1.2.0.morph create mode 100644 strata/chef/net-ssh-multi-1.2.0.morph create mode 100644 strata/chef/ohai-master.morph create mode 100644 strata/chef/plist-master.morph create mode 100644 strata/chef/pry-master.morph create mode 100644 strata/chef/rack-1.5.2.morph create mode 100644 strata/chef/slop-3.6.0.morph create mode 100644 strata/chef/systemu-master.morph create mode 100644 strata/chef/wmi-lite-1.0.0.morph create mode 100644 strata/chef/yajl.morph create mode 100644 strata/core/libpopt.morph create mode 100644 strata/core/sgdisk.morph create mode 100644 strata/devtools.morph create mode 100644 strata/devtools/screen.morph create mode 100644 strata/devtools/vim.morph create mode 100644 strata/ntpd.morph delete mode 100644 strata/tools/screen.morph delete mode 100644 strata/tools/vim.morph diff --git a/ceph.configure b/ceph.configure index 14fa6f6b..c3cd92d1 100644 --- a/ceph.configure +++ b/ceph.configure @@ -20,32 +20,60 @@ import os import subprocess import shutil import re +import stat systemd_monitor_template = """ [Unit] Description=Ceph Monitor firstboot setup +After=network-online.target [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 +ExecStart=/bin/bash -c "/root/setup-ceph-head | tee /root/monitor-setuplog" +ExecStartPost=/bin/rm /etc/systemd/system/multi-user.target.wants/ceph-monitor-fboot.service [Install] Wanted-By=multi-user.target """ -systemd_monitor_fname_template = "ceph-{cluster}-mon-fboot.service" + +systemd_monitor_fname_template = "ceph-monitor-fboot.service" systemd_osd_template = """ [Unit] Description=Ceph osd firstboot setup +After=network-online.target [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 +ExecStart=/bin/bash -c "/root/setup-ceph-node | tee /root/storage-setuplog" +ExecStartPost=/bin/rm /etc/systemd/system/multi-user.target.wants/ceph-storage-fboot.service [Install] Wanted-By=multi-user.target """ -systemd_osd_fname_template = "ceph-{cluster}-osd-{osd_id}-fboot.service" +systemd_osd_fname_template = "ceph-storage-fboot.service" + +ceph_monitor_config_template = """#!/bin/bash +ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *' +ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' +ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring +monmaptool --create --add 0 10.0.100.2 --fsid 9ceb9257-7541-4de4-b34b-586079986700 /tmp/monmap +mkdir /var/lib/ceph/mon/ceph-0 +ceph-mon --mkfs -i 0 --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring +/etc/init.d/ceph start mon.0 +touch ~/monitor-configured +""" + +ceph_storage_config_template = """#!/bin/bash +scp 10.0.100.2:/var/lib/ceph/bootstrap-osd/ceph.keyring /var/lib/ceph/bootstrap-osd/ +echo -e "n\np\n1\n\n\nw\n" | fdisk /dev/sdb +ceph-disk prepare --cluster ceph --cluster-uuid 9ceb9257-7541-4de4-b34b-586079986700 --fs-type ext4 /dev/sdb1 +sudo ceph-disk activate /dev/sdb1 +/etc/init.d/ceph start osd.0 +touch ~/storage-configured +""" + +executable_file_permissions = stat.S_IRUSR | stat.S_IXUSR | stat.S_IWUSR | \ + stat.S_IXGRP | stat.S_IRGRP | \ + stat.S_IXOTH | stat.S_IROTH class CephConfigurationExtension(cliapp.Application): """ @@ -75,7 +103,6 @@ class CephConfigurationExtension(cliapp.Application): 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. @@ -121,6 +148,8 @@ class CephConfigurationExtension(cliapp.Application): # Configure any monitor daemons if "CEPH_MON" in os.environ: self.create_mon_data_dir(os.environ.get("CEPH_MON_KEYRING")) + else: + self.create_osd_startup_script("None", "None") # Configure any object storage daemons osd_re = r"CEPH_OSD_(\d+)_DATA_DIR$" @@ -137,6 +166,14 @@ class CephConfigurationExtension(cliapp.Application): if "CEPH_MDS" in os.environ: self.create_mds_data_dir() + # Create a fake 'partprobe' + fake_partprobe_filename = self.dest_dir + "/sbin/partprobe" + fake_partprobe = open(fake_partprobe_filename, 'w') + fake_partprobe.write("#!/bin/bash\nexit 0;\n") + fake_partprobe.close() + os.chmod(fake_partprobe_filename, executable_file_permissions) + self.create_startup_scripts() + def copy_to_img(self, src_file, dest_file): shutil.copy(src_file, self.dest_dir + dest_file) @@ -171,17 +208,13 @@ class CephConfigurationExtension(cliapp.Application): 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_fname = systemd_monitor_fname_template + systemd_script_name = self.dest_dir + os.path.join(self.systemd_dir, mon_systemd_fname) + mon_systemd = open(systemd_script_name, 'w') + mon_systemd.write(systemd_monitor_template) mon_systemd.close() - #Create a symlink to the multi user target self.symlink_to_multiuser(mon_systemd_fname) @@ -192,11 +225,13 @@ class CephConfigurationExtension(cliapp.Application): #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)) + def create_osd_startup_script(self, osd_id, data_dir): + osd_systemd_fname = systemd_osd_fname_template + osd_full_name = self.dest_dir + os.path.join(self.systemd_dir, osd_systemd_fname) + + osd_systemd = open(osd_full_name, 'w') + + osd_systemd.write(systemd_osd_template) osd_systemd.close() #Create a symlink to the multi user target @@ -213,4 +248,19 @@ class CephConfigurationExtension(cliapp.Application): open(self.dest_dir + sysvinit_file, 'a').close() + def create_startup_scripts(self): + head_setup_file = os.path.join(self.dest_dir, "root", "setup-ceph-head") + + ceph_head_setup = open(head_setup_file, "w") + ceph_head_setup.write(ceph_monitor_config_template) + ceph_head_setup.close() + os.chmod(head_setup_file, executable_file_permissions) + + osd_setup_file = os.path.join(self.dest_dir, "root", "setup-ceph-node") + ceph_node_setup = open(osd_setup_file, "w") + ceph_node_setup.write(ceph_storage_config_template) + ceph_node_setup.close() + os.chmod(osd_setup_file, executable_file_permissions) + + CephConfigurationExtension().run() diff --git a/chef-system-x86_64-container.morph b/chef-system-x86_64-container.morph new file mode 100644 index 00000000..6e3f7073 --- /dev/null +++ b/chef-system-x86_64-container.morph @@ -0,0 +1,32 @@ +name: chef-system-x86_64-container +kind: system +description: Minimal chef system suitable for running in a container +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph + artifacts: + - build-essential-minimal +- name: core + morph: strata/core.morph + artifacts: + - core-openssl +- name: foundation + morph: strata/foundation.morph + artifacts: + - foundation-runtime +- name: ruby + morph: strata/ruby.morph + artifacts: + - ruby-runtime +- name: chef + morph: strata/chef.morph + artifacts: + - chef-runtime +configuration-extensions: +- set-hostname +- simple-network +- nfsboot +- install-files +- busybox-init +- remove-gcc diff --git a/chef/manifest b/chef/manifest new file mode 100644 index 00000000..de6cc542 --- /dev/null +++ b/chef/manifest @@ -0,0 +1,3 @@ +0040755 0 0 /root +0040700 1000 1000 /root/.ssh +0100600 1000 1000 /root/.ssh/authorized_keys diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph new file mode 100644 index 00000000..e199c308 --- /dev/null +++ b/clusters/cephclient.morph @@ -0,0 +1,12 @@ +name: ceph-cluster +kind: cluster +systems: +- morph: systems/ceph-service-x86_64-generic.morph + deploy: + ceph-node-virtualbox-image: + type: virtualbox-ssh + location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi + DISK_SIZE: 8G + HOSTNAME: CephNode4 + INSTALL_FILES: chef/manifest + SYSTEM: systems/ceph-service-x86_64-generic.morph diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index 4f0d66da..7ca5e7ce 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -26,7 +26,7 @@ chunks: build-depends: [] - name: baserock-import repo: baserock:baserock/import - ref: b092a66c21cb977a872d2b45d8edec31d96eeb28 + ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 unpetrify-ref: master build-depends: - ansicolor diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index fe0721cc..cbf637b4 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -45,6 +45,7 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -d BLK_DEV_CRYPTOLOOP - scripts/config -e CEPH_FS +- scripts/config -e OVERLAYFS_FS - scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 - scripts/config -e VIRTIO - scripts/config -e VIRTIO_RING diff --git a/strata/build-essential.morph b/strata/build-essential.morph index d7b86648..b6f3ae6a 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -126,8 +126,7 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: - - stage2-busybox + build-depends: [] build-mode: bootstrap prefix: /tools - name: stage2-fhs-dirs diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index 77fc265f..3e1fbad1 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -31,6 +31,7 @@ configure-commands: - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config - sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config - sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config +- sed -e 's/CONFIG_LSPCI=y.*/# CONFIG_LSPCI is not set/' -i .config - sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config - sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config - sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config diff --git a/strata/chef.morph b/strata/chef.morph new file mode 100644 index 00000000..cd969cda --- /dev/null +++ b/strata/chef.morph @@ -0,0 +1,216 @@ +name: chef +kind: stratum +description: Autogenerated by Baserock import tool +build-depends: +- morph: strata/ruby.morph +- morph: strata/core.morph +chunks: +- name: yajl + morph: strata/chef/yajl.morph + repo: upstream:yajl + ref: a0ecdde0c042b9256170f2f8890dd9451a4240aa + unpetrify-ref: 2.1.0 + build-depends: [] +- name: libyajl2-1.0.1 + morph: strata/chef/libyajl2-1.0.1.morph + repo: upstream:ruby-gems/libyajl2-gem + ref: 98aef032f536d13775bc7b3b69a25ebac9bdee0a + unpetrify-ref: 1.0.1 + build-depends: + - yajl +- name: chef-12.0.0.alpha.0 + morph: strata/chef/chef-master.morph + repo: upstream:ruby-gems/chef + ref: 9841bc9c6271c6d9add3aff0c2e11239cfb129ca + unpetrify-ref: 12.0.3 + build-depends: [] +- name: chef-zero-2.2 + morph: strata/chef/chef-zero-2.2.morph + repo: upstream:ruby-gems/chef-zero + ref: 231c3abd052e606820297a97e4bc32bdab656a02 + unpetrify-ref: v2.2 + build-depends: [] +- name: coderay-1.1.0.rc1 + morph: strata/chef/coderay-1.1.0.morph + repo: upstream:ruby-gems/coderay + ref: a48037b85a12228431b32103786456f36beb355f + unpetrify-ref: v1.1.0 + build-depends: [] +- name: erubis-master + morph: strata/chef/erubis-master.morph + repo: upstream:ruby-gems/erubis + ref: 14d3eab57fbc361312c8f3af350cbf9a5bafce17 + unpetrify-ref: master + build-depends: [] +- name: ffi-1.9.3 + morph: strata/chef/ffi-1.9.3.morph + repo: upstream:ruby-gems/ffi + ref: d982b7049336106c04f7721045dc5613b16d3545 + unpetrify-ref: 1.9.3 + build-depends: [] +- name: ffi-yajl-1.0.2 + morph: strata/chef/ffi-yajl-master.morph + repo: upstream:ruby-gems/ffi-yajl + ref: 3a4bc4259fd67af0ff4a8c1d3d71cfbaed9c112f + unpetrify-ref: master + build-depends: + - libyajl2-1.0.1 +- name: hashie-2.1.2 + morph: strata/chef/hashie-2.1.2.morph + repo: upstream:ruby-gems/hashie + ref: 95b97fbff2cac643d56ec718cb708665500682e5 + unpetrify-ref: v2.1.2 + build-depends: [] +- name: highline-1.6.21 + morph: strata/chef/highline-master.morph + repo: upstream:ruby-gems/highline + ref: 51de22e436e6d45696759d673d7b9ceba16cae39 + unpetrify-ref: master + build-depends: [] +- name: hoe-master + morph: strata/chef/hoe-master.morph + repo: upstream:ruby-gems/hoe + ref: d94b26b4687be0a24d04b7cb582753fbec33d7e4 + unpetrify-ref: master + build-depends: [] +- name: diff-lcs-1.2.5 + morph: strata/chef/diff-lcs-1.2.5.morph + repo: upstream:diff-lcs + ref: d53e92242b9dd6745e56a0ff4ba15d2f62052b91 + unpetrify-ref: v1.2.5 + build-depends: + - hoe-master +- name: ipaddress-master + morph: strata/chef/ipaddress-master.morph + repo: upstream:ruby-gems/ipaddress + ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845 + unpetrify-ref: master + build-depends: [] +- name: json-1.8.1 + morph: strata/chef/json-1.8.1.morph + repo: upstream:ruby-gems/json + ref: 92a96dea2b24b9c68856004d69491f46aedd0925 + unpetrify-ref: v1.8.1 + build-depends: [] +- name: method_source-0.8.1 + morph: strata/chef/method_source-0.8.2.morph + repo: upstream:ruby-gems/method_source + ref: 1b1f8323a7c25f29331fe32511f50697e5405dbd + unpetrify-ref: v0.8.2 + build-depends: [] +- name: mime-types-1.25.1 + morph: strata/chef/mime-types-1.25.1.morph + repo: upstream:ruby-gems/mime-types + ref: 6be836f59a041893cfc1c25668b3aa3552a7e334 + unpetrify-ref: v1.25.1 + build-depends: + - hoe-master +- name: mixlib-authentication-1.3.0 + morph: strata/chef/mixlib-authentication-1.3.0.morph + repo: upstream:ruby-gems/mixlib-authentication + ref: db24a56c6f5b99114998a50942220a7023060229 + unpetrify-ref: 1.3.0 + build-depends: [] +- name: mixlib-cli-1.5.0 + morph: strata/chef/mixlib-cli-1.5.0.morph + repo: upstream:ruby-gems/mixlib-cli + ref: b3b3c12141b5380ec61945770690fc1ae31d92b0 + unpetrify-ref: 1.5.0 + build-depends: [] +- name: mixlib-config-2.1.0 + morph: strata/chef/mixlib-config-2.1.0.morph + repo: upstream:ruby-gems/mixlib-config + ref: c5e2dee2beb5fdd17442ff92e520f2ef01d17ee5 + unpetrify-ref: v2.1.0 + build-depends: [] +- name: mixlib-log-1.6.0 + morph: strata/chef/mixlib-log-master.morph + repo: upstream:ruby-gems/mixlib-log + ref: 50ec55964ce19d3a8a14050be9a23c4b8990e2f0 + unpetrify-ref: master + build-depends: [] +- name: mixlib-shellout-1.4.0 + morph: strata/chef/mixlib-shellout-1.4.0.morph + repo: upstream:ruby-gems/mixlib-shellout + ref: a04ce6db22edf0575c50e18ae2db09adced7dedc + unpetrify-ref: 1.4.0 + build-depends: [] +- name: net-dhcp-1.2.1 + morph: strata/chef/net-dhcp-1.2.1.morph + repo: upstream:net-dhcp-ruby + ref: b644922a08aa09e2ce75f8f9f9fa1f0b8cecb2e9 + unpetrify-ref: v1.2.1 + build-depends: [] +- name: net-ssh-2.9.1 + morph: strata/chef/net-ssh-2.9.1.morph + repo: upstream:ruby-gems/net-ssh + ref: 9f8607984d8e904f211cc5edb39ab2a2ca94008e + unpetrify-ref: v2.9.1 + build-depends: [] +- name: net-ssh-gateway-1.2.0 + morph: strata/chef/net-ssh-gateway-1.2.0.morph + repo: upstream:ruby-gems/net-ssh-gateway + ref: 1de7611a7f7cedbe7a4c6cf3798c88d00637582d + unpetrify-ref: v1.2.0 + build-depends: [] +- name: net-ssh-multi-1.2.0 + morph: strata/chef/net-ssh-multi-1.2.0.morph + repo: upstream:ruby-gems/net-ssh-multi + ref: b659f2884b2c9abdbe3bbf3c844937a0799ed5ac + unpetrify-ref: v1.2.0 + build-depends: [] +- name: ohai-7.4.0.dev + morph: strata/chef/ohai-master.morph + repo: upstream:ruby-gems/ohai + ref: 0bf2ed32744445a253082910ee4e07b2b38023a7 + unpetrify-ref: master + build-depends: [] +- name: plist-master + morph: strata/chef/plist-master.morph + repo: upstream:ruby-gems/plist + ref: 12eb82d283cab148183c37c07e3f75a309969dec + unpetrify-ref: master + build-depends: [] +- name: pry-0.10.1 + morph: strata/chef/pry-master.morph + repo: upstream:ruby-gems/pry + ref: 6d5eb0831b50ec729d2dc3356255b49535535e37 + unpetrify-ref: master + build-depends: [] +- name: rack-1.5.2 + morph: strata/chef/rack-1.5.2.morph + repo: upstream:ruby-gems/rack + ref: ac590d055c936bb9a618e955a690dc836c625211 + unpetrify-ref: 1.5.2 + build-depends: [] +- name: slop-3.6.0 + morph: strata/chef/slop-3.6.0.morph + repo: upstream:ruby-gems/slop + ref: c3f84e7e794004f9ae6958c13ef3dd3038c2c0eb + unpetrify-ref: v3.6.0 + build-depends: [] +- name: systemu-2.6.4 + morph: strata/chef/systemu-master.morph + repo: upstream:ruby-gems/systemu + ref: 35340f1e91941af47988b1b9d77705493b96d3db + unpetrify-ref: master + build-depends: [] +- name: wmi-lite-1.0.0 + morph: strata/chef/wmi-lite-1.0.0.morph + repo: upstream:ruby-gems/wmi-lite + ref: 9377836dc0a5487474038ec727f02f9b33facfa6 + unpetrify-ref: 1.0.0 + build-depends: [] +- name: libpopt + morph: strata/core/libpopt.morph + repo: upstream:libpopt + ref: c224abf28f4ff9bbf292908324359cb5905addf8 + unpetrify-ref: master + build-depends: [] +- name: sgdisk + morph: strata/core/sgdisk.morph + repo: upstream:sgdisk + ref: a920398fa393f9d6301b32b191bc01e086ab8bc8 + unpetrify-ref: master + build-depends: + - libpopt diff --git a/strata/chef/chef-master.morph b/strata/chef/chef-master.morph new file mode 100644 index 00000000..61c12ca0 --- /dev/null +++ b/strata/chef/chef-master.morph @@ -0,0 +1,20 @@ +name: chef-12.0.0.alpha.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: chef-12.0.0.alpha.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build chef.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./chef-12.0.0.alpha.0.gem +- mkdir -p "$DESTDIR"/etc +- | + cat << EOF > "$DESTDIR/etc/lsb-release" + DISTRIB_ID=Baserock + DISTRIB_CODENAME=baserock + DISTRIB_DESCRIPTION="Baserock" + EOF diff --git a/strata/chef/chef-zero-2.2.morph b/strata/chef/chef-zero-2.2.morph new file mode 100644 index 00000000..11407ae3 --- /dev/null +++ b/strata/chef/chef-zero-2.2.morph @@ -0,0 +1,13 @@ +name: chef-zero-2.2 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: chef-zero-2.2-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build chef-zero.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./chef-zero-2.2.gem diff --git a/strata/chef/coderay-1.1.0.morph b/strata/chef/coderay-1.1.0.morph new file mode 100644 index 00000000..a380b911 --- /dev/null +++ b/strata/chef/coderay-1.1.0.morph @@ -0,0 +1,13 @@ +name: coderay-1.1.0.rc1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: coderay-1.1.0.rc1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build coderay.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./coderay-1.1.0.rc1.gem diff --git a/strata/chef/diff-lcs-1.2.5.morph b/strata/chef/diff-lcs-1.2.5.morph new file mode 100644 index 00000000..3585467f --- /dev/null +++ b/strata/chef/diff-lcs-1.2.5.morph @@ -0,0 +1,13 @@ +name: diff-lcs-1.2.5 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: diff-lcs-1.2.5-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build diff-lcs.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./diff-lcs-1.2.5.gem diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph new file mode 100644 index 00000000..48d47588 --- /dev/null +++ b/strata/chef/erubis-master.morph @@ -0,0 +1,16 @@ +name: erubis-master +kind: chunk +products: +- artifact: erubis-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +configure-commands: +- find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \; +- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com + all rights reserved./g' -i \{} \; +build-commands: +- gem build erubis.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./erubis-2.7.0.gem diff --git a/strata/chef/ffi-1.9.3.morph b/strata/chef/ffi-1.9.3.morph new file mode 100644 index 00000000..672f0bd7 --- /dev/null +++ b/strata/chef/ffi-1.9.3.morph @@ -0,0 +1,13 @@ +name: ffi-1.9.3 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: ffi-1.9.3-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build ffi.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./ffi-1.9.3.gem diff --git a/strata/chef/ffi-yajl-master.morph b/strata/chef/ffi-yajl-master.morph new file mode 100644 index 00000000..5d3c0792 --- /dev/null +++ b/strata/chef/ffi-yajl-master.morph @@ -0,0 +1,13 @@ +name: ffi-yajl-1.0.2 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: ffi-yajl-1.0.2-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build ffi-yajl.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./ffi-yajl-1.0.2.gem diff --git a/strata/chef/hashie-2.1.2.morph b/strata/chef/hashie-2.1.2.morph new file mode 100644 index 00000000..a4fb46f6 --- /dev/null +++ b/strata/chef/hashie-2.1.2.morph @@ -0,0 +1,13 @@ +name: hashie-2.1.2 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: hashie-2.1.2-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build hashie.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./hashie-2.1.2.gem diff --git a/strata/chef/highline-master.morph b/strata/chef/highline-master.morph new file mode 100644 index 00000000..5615f6b2 --- /dev/null +++ b/strata/chef/highline-master.morph @@ -0,0 +1,13 @@ +name: highline-1.6.21 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: highline-1.6.21-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build highline.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./highline-1.6.21.gem diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph new file mode 100644 index 00000000..29c065a6 --- /dev/null +++ b/strata/chef/hoe-master.morph @@ -0,0 +1,12 @@ +name: hoe-master +kind: chunk +products: +- artifact: hoe-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- rake gem +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./pkg/hoe-3.12.0.gem diff --git a/strata/chef/ipaddress-master.morph b/strata/chef/ipaddress-master.morph new file mode 100644 index 00000000..fdaa5de6 --- /dev/null +++ b/strata/chef/ipaddress-master.morph @@ -0,0 +1,13 @@ +name: ipaddress-0.8.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: ipaddress-0.8.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build ipaddress.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./ipaddress-0.8.0.gem diff --git a/strata/chef/json-1.8.1.morph b/strata/chef/json-1.8.1.morph new file mode 100644 index 00000000..cf25abca --- /dev/null +++ b/strata/chef/json-1.8.1.morph @@ -0,0 +1,13 @@ +name: json-1.8.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: json-1.8.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build json.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./json-1.8.1.gem diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph new file mode 100644 index 00000000..7a21831d --- /dev/null +++ b/strata/chef/libyajl2-1.0.1.morph @@ -0,0 +1,13 @@ +name: libyajl2-1.0.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: libyajl2-1.0.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" + --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem diff --git a/strata/chef/method_source-0.8.2.morph b/strata/chef/method_source-0.8.2.morph new file mode 100644 index 00000000..5ba20da6 --- /dev/null +++ b/strata/chef/method_source-0.8.2.morph @@ -0,0 +1,13 @@ +name: method_source-0.8.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: method_source-0.8.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build method_source.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./method_source-0.8.1.gem diff --git a/strata/chef/mime-types-1.25.1.morph b/strata/chef/mime-types-1.25.1.morph new file mode 100644 index 00000000..453c42d5 --- /dev/null +++ b/strata/chef/mime-types-1.25.1.morph @@ -0,0 +1,13 @@ +name: mime-types-1.25.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mime-types-1.25.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mime-types.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mime-types-1.25.1.gem diff --git a/strata/chef/mixlib-authentication-1.3.0.morph b/strata/chef/mixlib-authentication-1.3.0.morph new file mode 100644 index 00000000..8792ff2c --- /dev/null +++ b/strata/chef/mixlib-authentication-1.3.0.morph @@ -0,0 +1,13 @@ +name: mixlib-authentication-1.3.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mixlib-authentication-1.3.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mixlib-authentication.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mixlib-authentication-1.3.0.gem diff --git a/strata/chef/mixlib-cli-1.5.0.morph b/strata/chef/mixlib-cli-1.5.0.morph new file mode 100644 index 00000000..84f3a4b7 --- /dev/null +++ b/strata/chef/mixlib-cli-1.5.0.morph @@ -0,0 +1,13 @@ +name: mixlib-cli-1.5.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mixlib-cli-1.5.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mixlib-cli.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mixlib-cli-1.5.0.gem diff --git a/strata/chef/mixlib-config-2.1.0.morph b/strata/chef/mixlib-config-2.1.0.morph new file mode 100644 index 00000000..cc6077a5 --- /dev/null +++ b/strata/chef/mixlib-config-2.1.0.morph @@ -0,0 +1,13 @@ +name: mixlib-config-2.1.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mixlib-config-2.1.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mixlib-config.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mixlib-config-2.1.0.gem diff --git a/strata/chef/mixlib-log-master.morph b/strata/chef/mixlib-log-master.morph new file mode 100644 index 00000000..ddd956c1 --- /dev/null +++ b/strata/chef/mixlib-log-master.morph @@ -0,0 +1,13 @@ +name: mixlib-log-1.6.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mixlib-log-1.6.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mixlib-log.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mixlib-log-1.6.0.gem diff --git a/strata/chef/mixlib-shellout-1.4.0.morph b/strata/chef/mixlib-shellout-1.4.0.morph new file mode 100644 index 00000000..7087c1c6 --- /dev/null +++ b/strata/chef/mixlib-shellout-1.4.0.morph @@ -0,0 +1,13 @@ +name: mixlib-shellout-1.4.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: mixlib-shellout-1.4.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build mixlib-shellout.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./mixlib-shellout-1.4.0.gem diff --git a/strata/chef/net-dhcp-1.2.1.morph b/strata/chef/net-dhcp-1.2.1.morph new file mode 100644 index 00000000..88eb4963 --- /dev/null +++ b/strata/chef/net-dhcp-1.2.1.morph @@ -0,0 +1,13 @@ +name: net-dhcp-1.2.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: net-dhcp-1.2.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build net-dhcp.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./net-dhcp-1.2.1.gem diff --git a/strata/chef/net-ssh-2.9.1.morph b/strata/chef/net-ssh-2.9.1.morph new file mode 100644 index 00000000..c06495d5 --- /dev/null +++ b/strata/chef/net-ssh-2.9.1.morph @@ -0,0 +1,15 @@ +name: net-ssh-2.9.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: net-ssh-2.9.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +configure-commands: +- sed -e '/cert_chain\s*=/d' -e '/signing_key\s*=/d' -i net-ssh.gemspec +build-commands: +- gem build net-ssh.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./net-ssh-2.9.1.gem diff --git a/strata/chef/net-ssh-gateway-1.2.0.morph b/strata/chef/net-ssh-gateway-1.2.0.morph new file mode 100644 index 00000000..c0425002 --- /dev/null +++ b/strata/chef/net-ssh-gateway-1.2.0.morph @@ -0,0 +1,15 @@ +name: net-ssh-gateway-1.2.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: net-ssh-gateway-1.2.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +configure-commands: +- sed -e '/cert_chain\s*=/d' -e '/signing_key\s*=/d' -i net-ssh-gateway.gemspec +build-commands: +- gem build net-ssh-gateway.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./net-ssh-gateway-1.2.0.gem diff --git a/strata/chef/net-ssh-multi-1.2.0.morph b/strata/chef/net-ssh-multi-1.2.0.morph new file mode 100644 index 00000000..fc433a37 --- /dev/null +++ b/strata/chef/net-ssh-multi-1.2.0.morph @@ -0,0 +1,15 @@ +name: net-ssh-multi-1.2.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: net-ssh-multi-1.2.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +configure-commands: +- sed -e '/cert_chain\s*=/d' -e '/signing_key\s*=/d' -i net-ssh-multi.gemspec +build-commands: +- gem build net-ssh-multi.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./net-ssh-multi-1.2.0.gem diff --git a/strata/chef/ohai-master.morph b/strata/chef/ohai-master.morph new file mode 100644 index 00000000..f47dda35 --- /dev/null +++ b/strata/chef/ohai-master.morph @@ -0,0 +1,13 @@ +name: ohai-7.4.0.dev +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: ohai-7.4.0.dev-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build ohai.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./ohai-7.4.0.dev.gem diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph new file mode 100644 index 00000000..ce6f2987 --- /dev/null +++ b/strata/chef/plist-master.morph @@ -0,0 +1,12 @@ +name: plist-master +kind: chunk +products: +- artifact: plist-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- rake gem +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./pkg/plist-3.1.0.gem diff --git a/strata/chef/pry-master.morph b/strata/chef/pry-master.morph new file mode 100644 index 00000000..07ebca7a --- /dev/null +++ b/strata/chef/pry-master.morph @@ -0,0 +1,13 @@ +name: pry-0.10.1 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: pry-0.10.1-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build pry.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./pry-0.10.1.gem diff --git a/strata/chef/rack-1.5.2.morph b/strata/chef/rack-1.5.2.morph new file mode 100644 index 00000000..50fd960c --- /dev/null +++ b/strata/chef/rack-1.5.2.morph @@ -0,0 +1,13 @@ +name: rack-1.5.2 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: rack-1.5.2-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build rack.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./rack-1.5.2.gem diff --git a/strata/chef/slop-3.6.0.morph b/strata/chef/slop-3.6.0.morph new file mode 100644 index 00000000..32101078 --- /dev/null +++ b/strata/chef/slop-3.6.0.morph @@ -0,0 +1,13 @@ +name: slop-3.6.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: slop-3.6.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build slop.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./slop-3.6.0.gem diff --git a/strata/chef/systemu-master.morph b/strata/chef/systemu-master.morph new file mode 100644 index 00000000..3cc0a5e2 --- /dev/null +++ b/strata/chef/systemu-master.morph @@ -0,0 +1,13 @@ +name: systemu-2.6.4 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: systemu-2.6.4-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build systemu.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./systemu-2.6.4.gem diff --git a/strata/chef/wmi-lite-1.0.0.morph b/strata/chef/wmi-lite-1.0.0.morph new file mode 100644 index 00000000..bb4b4127 --- /dev/null +++ b/strata/chef/wmi-lite-1.0.0.morph @@ -0,0 +1,13 @@ +name: wmi-lite-1.0.0 +kind: chunk +description: Automatically generated by rubygems.to_chunk +products: +- artifact: wmi-lite-1.0.0-doc + include: + - usr/lib/ruby/gems/\d[\w.]*/doc/.* +build-commands: +- gem build wmi-lite.gemspec +install-commands: +- mkdir -p "$DESTDIR/$(gem environment home)" +- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" + --ignore-dependencies --local ./wmi-lite-1.0.0.gem diff --git a/strata/chef/yajl.morph b/strata/chef/yajl.morph new file mode 100644 index 00000000..4167b44c --- /dev/null +++ b/strata/chef/yajl.morph @@ -0,0 +1,5 @@ +name: yajl +kind: chunk +description: YAJL JSON parsing library +max-jobs: 1 +build-system: cmake diff --git a/strata/core/libpopt.morph b/strata/core/libpopt.morph new file mode 100644 index 00000000..f876d5a3 --- /dev/null +++ b/strata/core/libpopt.morph @@ -0,0 +1,9 @@ +name: libpopt +kind: chunk +configure-commands: +- autoreconf -if +- ./configure +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/core/sgdisk.morph b/strata/core/sgdisk.morph new file mode 100644 index 00000000..aaf3807c --- /dev/null +++ b/strata/core/sgdisk.morph @@ -0,0 +1,6 @@ +name: sgdisk +kind: chunk +build-commands: +- make +install-commands: +- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk" diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 149445c1..9687ac7e 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -73,9 +73,9 @@ chunks: build-depends: - six - name: morph - repo: file:///home/adam/testing-workspace/master/baserock/baserock/morph - ref: refs/heads/baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e - unpetrify-ref: 67afd098cd297b769b1341a460d160a2902ba4e4 + repo: baserock:baserock/morph + ref: 67afd098cd297b769b1341a460d160a2902ba4e4 + unpetrify-ref: master build-depends: - cliapp - cmdtest diff --git a/strata/devtools.morph b/strata/devtools.morph new file mode 100644 index 00000000..73ebd783 --- /dev/null +++ b/strata/devtools.morph @@ -0,0 +1,32 @@ +name: devtools +kind: stratum +description: | + Extra development tools included in the devel system, this stratum + is here to help reduce unnecessary building, chunks added to this + stratum should not have any dependants (please don't build-depend on this + stratum) +build-depends: +- morph: strata/foundation.morph +chunks: +- name: vim + morph: strata/devtools/vim.morph + repo: upstream:vim + ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 + unpetrify-ref: baserock/morph + build-depends: [] +- name: pv + repo: upstream:pv + ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a + unpetrify-ref: baserock/morph + build-depends: [] +- name: screen + morph: strata/devtools/screen.morph + repo: upstream:screen + ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 + unpetrify-ref: baserock/morph + build-depends: [] +- name: less + repo: upstream:less + ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 + unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/devtools/screen.morph b/strata/devtools/screen.morph new file mode 100644 index 00000000..0b23c5d4 --- /dev/null +++ b/strata/devtools/screen.morph @@ -0,0 +1,11 @@ +name: screen +kind: chunk +description: A terminal multiplexer and sanity tool for many +max-jobs: 1 +configure-commands: +- cd ./src && sh autogen.sh +- cd ./src && ./configure --prefix="$PREFIX" +build-commands: +- cd ./src && make +install-commands: +- cd ./src && make DESTDIR="$DESTDIR" install diff --git a/strata/devtools/vim.morph b/strata/devtools/vim.morph new file mode 100644 index 00000000..58e1403f --- /dev/null +++ b/strata/devtools/vim.morph @@ -0,0 +1,10 @@ +name: vim +kind: chunk +build-system: autotools +configure-commands: +- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h +- ./configure --prefix="$PREFIX" --enable-multibyte +install-commands: +- make DESTDIR="$DESTDIR" install +- mkdir -p "$DESTDIR"/etc +- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph index 8ca13bad..eb8f11c0 100644 --- a/strata/foundation/pciutils.morph +++ b/strata/foundation/pciutils.morph @@ -1,11 +1,11 @@ name: pciutils kind: chunk configure-commands: -- make ZLIB=no lib/config.mk -- echo PREFIX=$PREFIX >>lib/config.mk -- echo MANDIR=$PREFIX/share/man >>lib/config.mk +- make PREFIX="$PREFIX" ZLIB=no lib/config.mk +- echo PREFIX="$PREFIX" >>lib/config.mk +- echo MANDIR="$PREFIX/share/man" >>lib/config.mk build-commands: -- make +- make PREFIX="$PREFIX" install-commands: -- make DESTDIR="$DESTDIR" install -- make DESTDIR="$DESTDIR" install-lib +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install-lib diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 9d9d0db3..4d38c735 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -70,9 +70,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: [] - name: morph - repo: file:///home/adam/testing-workspace/master/baserock/baserock/morph - ref: refs/heads/baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e - unpetrify-ref: 30aaa46e250a1bd8081283839abd7d5aab97fb1e + repo: baserock:baserock/morph + ref: f2f3e4e5f3d5162890d03494f405cff5177aaad8 + unpetrify-ref: master build-depends: - cliapp - cmdtest diff --git a/strata/ntpd.morph b/strata/ntpd.morph new file mode 100644 index 00000000..e45e6424 --- /dev/null +++ b/strata/ntpd.morph @@ -0,0 +1,10 @@ +name: ntpd +kind: stratum +build-depends: +- morph: strata/core.morph +chunks: +- name: ntpd + repo: upstream:ntp + ref: d4b7cd9723cce9561fa15f74b90b85a3a61b5ef8 + unpetrify-ref: ntp-dev-4.2.7p482 + build-depends: [] diff --git a/strata/tools.morph b/strata/tools.morph index 20bc1d27..0c4771dc 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -1,6 +1,6 @@ name: tools kind: stratum -description: Extra development tools included in the devel system +description: Various tools build-depends: - morph: strata/foundation.morph chunks: @@ -26,11 +26,6 @@ chunks: ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8 unpetrify-ref: baserock/morph build-depends: [] -- name: less - repo: upstream:less - ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 - unpetrify-ref: baserock/morph - build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b @@ -42,11 +37,6 @@ chunks: ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph build-depends: [] -- name: pv - repo: upstream:pv - ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a - unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync @@ -64,18 +54,6 @@ chunks: ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap build-depends: [] -- name: vim - morph: strata/tools/vim.morph - repo: upstream:vim - ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e - unpetrify-ref: baserock/morph - build-depends: [] -- name: screen - morph: strata/tools/screen.morph - repo: upstream:screen - ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 - unpetrify-ref: baserock/morph - build-depends: [] - name: u-boot morph: strata/tools/u-boot.morph repo: upstream:u-boot diff --git a/strata/tools/screen.morph b/strata/tools/screen.morph deleted file mode 100644 index 0b23c5d4..00000000 --- a/strata/tools/screen.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: screen -kind: chunk -description: A terminal multiplexer and sanity tool for many -max-jobs: 1 -configure-commands: -- cd ./src && sh autogen.sh -- cd ./src && ./configure --prefix="$PREFIX" -build-commands: -- cd ./src && make -install-commands: -- cd ./src && make DESTDIR="$DESTDIR" install diff --git a/strata/tools/vim.morph b/strata/tools/vim.morph deleted file mode 100644 index 58e1403f..00000000 --- a/strata/tools/vim.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: vim -kind: chunk -build-system: autotools -configure-commands: -- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h -- ./configure --prefix="$PREFIX" --enable-multibyte -install-commands: -- make DESTDIR="$DESTDIR" install -- mkdir -p "$DESTDIR"/etc -- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc diff --git a/strata/trove.morph b/strata/trove.morph index 7eaa204a..3b5ca528 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -72,7 +72,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 5f2dab59ff6e70edf6ffbcd65fe64b487c4380c2 + ref: 98cf2ab9c80c8efd0df9086353972e7dc73f40b8 unpetrify-ref: master build-depends: [] - name: lorry-controller diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 980b084b..bd51f8d8 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -24,6 +24,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 04245de5..4c474959 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -24,6 +24,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 2c7126c3..174cd8ce 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -24,6 +24,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index c090e908..8636d510 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -22,6 +22,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 4d3b8fa9..78d5b7ad 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -24,6 +24,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 6ea02dd3..1c8efb33 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -22,6 +22,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 962c1a28..969ee125 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -24,6 +24,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index f54af0f7..509bd383 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -18,9 +18,32 @@ strata: morph: strata/ceph-service.morph - name: tools morph: strata/tools.morph +- name: ruby + morph: strata/ruby.morph +- name: ntpd + morph: strata/ntpd.morph +- name: morph-utils + morph: strata/morph-utils.morph +- name: openstack-clients + morph: strata/openstack-clients.morph +- name: cloudinit-support + morph: strata/cloudinit-support.morph +- name: nodejs + morph: strata/nodejs.morph +- name: lorry + morph: strata/lorry.morph +- name: baserock-import + morph: strata/baserock-import.morph +- name: nfs + morph: strata/nfs.morph +- name: python-tools + morph: strata/python-tools.morph +- name: chef + morph: strata/chef.morph configuration-extensions: - set-hostname - add-config-files - nfsboot - install-files - ceph +- cloud-init diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 466df31f..305f7a22 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index ed111387..427dbb3f 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 6b24e603..1529522c 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 70c6f1cc..0f6aef58 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 1f5bf1cf..2b43bf65 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -23,6 +23,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 7e703134..2e342fc3 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -26,6 +26,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 02358014..c50468a9 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 8fe3737b..4bae3ac8 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -33,6 +33,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 550c361a..e542f067 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -33,6 +33,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 9e8f0bc6..cda52c36 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -33,6 +33,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index a60f35fc..c4918572 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -27,6 +27,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 6f7fd319..a53a6a56 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -30,6 +30,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 52e64847..83e55316 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 8d484e81..3ad441ca 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -34,6 +34,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index e77aa5d1..569a00d8 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 143ceb82..32ddfc56 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -34,6 +34,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.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 a7731cad..7ffddc02 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -32,6 +32,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index e305c723..0d633f41 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -29,6 +29,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - trove diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph index c8ac7784..a2d64a63 100644 --- a/systems/zookeeper-client-x86_64.morph +++ b/systems/zookeeper-client-x86_64.morph @@ -13,6 +13,8 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: zookeeper + morph: strata/zookeeper.morph - name: zookeeper-client morph: strata/zookeeper-client.morph configuration-extensions: diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph index ad022a91..be0a8791 100644 --- a/systems/zookeeper-server-x86_64.morph +++ b/systems/zookeeper-server-x86_64.morph @@ -13,6 +13,8 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: zookeeper + morph: strata/zookeeper.morph - name: zookeeper-server morph: strata/zookeeper-server.morph configuration-extensions: -- cgit v1.2.1