diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
commit | 50f602fe6b12943a3847fb1925b1e5cb554bed97 (patch) | |
tree | 2a2ff973dafefa91abcf3295fbca155de6414127 | |
parent | 655a27dd00b54302978076523f784fe98e5a684f (diff) | |
parent | fe37ca6dfc32f13e89975f916abb0d95b9b4f09b (diff) | |
download | infrastructure-50f602fe6b12943a3847fb1925b1e5cb554bed97.tar.gz |
Merge remote-tracking branch 'baserock/master'
Conflicts:
scripts/licensecheck.sh
strata/lorry-controller.morph
strata/trove.morph
172 files changed, 933 insertions, 630 deletions
diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..b8255184 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +version: 1 diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph new file mode 100644 index 00000000..3286c72e --- /dev/null +++ b/clusters/moonshot-pxe-armv8l64.morph @@ -0,0 +1,22 @@ +name: moonshot-m400-armv8l64-netboot +kind: cluster +description: | + Deploy an armv8l64 devel system into a HP Moonshot node + + The system will be configured to boot through PXE from existing DHCP, + TFTP and NFS servers. +systems: +- morph: systems/devel-system-armv8l64.morph + deploy: + netboot: + type: pxeboot + location: 14:58:d0:57:7f:42 + PXEBOOT_MODE: existing-server + PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/ + PXEBOOT_ROOTFS_RSYNC_ADDRESS: rsync://192.168.0.1/srv/nfsboot/ + KERNEL_ARGS: console=ttyS0,9600n8r rw + DTB_PATH: boot/m400-1003.dtb + HOSTNAME: baserock-m400-node31 + MOONSHOT_KERNEL: yes + INSTALL_FILES: moonshot/manifest + PXE_INSTALLER: no diff --git a/moonshot-kernel.configure b/moonshot-kernel.configure new file mode 100644 index 00000000..11d01751 --- /dev/null +++ b/moonshot-kernel.configure @@ -0,0 +1,33 @@ +#!/bin/sh +# +# Copyright (C) 2014 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. +# +# 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. +# +# This is a "morph deploy" configuration extension to convert a plain +# kernel Image to uImage, for an HP Moonshot m400 cartridge + +set -eu + +case "$MOONSHOT_KERNEL" in + True|yes) + echo "Converting kernel image for Moonshot" + mkimage -A arm -O linux -C none -T kernel -a 0x00080000 \ + -e 0x00080000 -n Linux -d "$1/boot/vmlinux" "$1/boot/uImage" + ;; + *) + echo Unrecognised option "$MOONSHOT_KERNEL" to MOONSHOT_KERNEL + exit 1 + ;; +esac diff --git a/moonshot/boot/m400-1003.dtb b/moonshot/boot/m400-1003.dtb Binary files differnew file mode 100644 index 00000000..d6fd83ee --- /dev/null +++ b/moonshot/boot/m400-1003.dtb diff --git a/moonshot/manifest b/moonshot/manifest new file mode 100644 index 00000000..dd80fe49 --- /dev/null +++ b/moonshot/manifest @@ -0,0 +1,2 @@ +0040755 0 0 /boot +0100744 0 0 /boot/m400-1003.dtb diff --git a/pxeboot.write b/pxeboot.write index e33da527..399914f5 100755 --- a/pxeboot.write +++ b/pxeboot.write @@ -223,11 +223,13 @@ class PXEBoot(morphlib.writeexts.WriteExtension): @contextlib.contextmanager def _remote_tempdir(self, hostname, template): + persist = os.environ.get('PXE_INSTALLER') in ('no', 'False') td = cliapp.ssh_runcmd(hostname, ['mktemp', '-d', template]).strip() try: yield td finally: - cliapp.ssh_runcmd(hostname, ['find', td, '-delete']) + if not persist: + cliapp.ssh_runcmd(hostname, ['find', td, '-delete']) def _serve_tftpd(self, sock, host, port, interface, tftproot): self.settings.progname = 'tftp server' @@ -321,6 +323,7 @@ class PXEBoot(morphlib.writeexts.WriteExtension): @contextlib.contextmanager def _remote_copy(self, hostname, src, dst): + persist = os.environ.get('PXE_INSTALLER') in ('no', 'False') with open(src, 'r') as f: cliapp.ssh_runcmd(hostname, ['install', '-D', '-m644', '/proc/self/fd/0', @@ -328,7 +331,20 @@ class PXEBoot(morphlib.writeexts.WriteExtension): try: yield finally: - cliapp.ssh_runcmd(hostname, ['rm', dst]) + if not persist: + cliapp.ssh_runcmd(hostname, ['rm', dst]) + + @contextlib.contextmanager + def _remote_symlink(self, hostname, src, dst): + persist = os.environ.get('PXE_INSTALLER') in ('no', 'False') + cliapp.ssh_runcmd(hostname, + ['ln', '-s', '-f', src, dst], + stdin=None, stdout=None, stderr=None) + try: + yield + finally: + if not persist: + cliapp.ssh_runcmd(hostname, ['rm', '-f', dst]) @contextlib.contextmanager def remote_kernel(self, rootfs, tftp_url, macaddr): @@ -346,6 +362,21 @@ class PXEBoot(morphlib.writeexts.WriteExtension): yield basename @contextlib.contextmanager + def remote_fdt(self, rootfs, tftp_url, macaddr): + fdt_rel_path = os.environ.get('DTB_PATH', '') + if fdt_rel_path == '': + yield + fdt_abs_path = os.path.join(rootfs, fdt_rel_path) + if not fdt_abs_path: + raise cliapp.AppException('Failed to locate Flattened Device Tree') + url = urlparse.urlsplit(tftp_url) + basename = '{}-fdt'.format(_normalise_macaddr(macaddr)) + target_path = os.path.join(url.path, basename) + with self._remote_copy(hostname=url.hostname, src=fdt_abs_path, + dst=target_path): + yield basename + + @contextlib.contextmanager def local_nfsroot(self, rootfs, target_ip): nfsroot = target_ip + ':' + rootfs self.status(msg='Exporting %(nfsroot)s as local nfsroot', @@ -362,17 +393,21 @@ class PXEBoot(morphlib.writeexts.WriteExtension): @contextlib.contextmanager def remote_nfsroot(self, rootfs, rsync_url, macaddr): url = urlparse.urlsplit(rsync_url) - template = os.path.join(url.path, 'nfsroot.XXXXXXXXXX') + template = os.path.join(url.path, + _normalise_macaddr(macaddr) + '.XXXXXXXXXX') with self._remote_tempdir(hostname=url.hostname, template=template) \ as tempdir: - nfsroot = urlparse.urlunsplit(url.scheme, url.netloc, tempdir, - url.query, url.fragment) - cliapp.runcmd(['rsync', '-asXSPH', '--delete', rootfs, nfsroot], - stdin=None, stdout=None, stderr=None) - yield basename + nfsroot = urlparse.urlunsplit((url.scheme, url.netloc, tempdir, + url.query, url.fragment)) + cliapp.runcmd(['rsync', '-asSPH', '--delete', rootfs, nfsroot], + stdin=None, stdout=open(os.devnull, 'w'), + stderr=None) + yield os.path.join(os.path.basename(tempdir), + os.path.basename(rootfs)) @staticmethod - def _write_pxe_config(fh, kernel_tftp_url, rootfs_nfs_url, extra_args=''): + def _write_pxe_config(fh, kernel_tftp_url, rootfs_nfs_url, + fdt_subpath=None, extra_args=''): fh.write(textwrap.dedent('''\ DEFAULT default LABEL default @@ -380,6 +415,8 @@ class PXEBoot(morphlib.writeexts.WriteExtension): APPEND root=/dev/nfs ip=dhcp nfsroot={rootfs_nfs_url} {extra_args} ''').format(kernel_url=kernel_tftp_url, rootfs_nfs_url=rootfs_nfs_url, extra_args=extra_args)) + if fdt_subpath is not None: + fh.write("FDT {}\n".format(fdt_subpath)) fh.flush() @contextlib.contextmanager @@ -401,19 +438,29 @@ class PXEBoot(morphlib.writeexts.WriteExtension): @contextlib.contextmanager def remote_pxeboot_config(self, tftproot, kernel_tftproot, kernel_subpath, - rootfs_nfsroot, rootfs_subpath, macaddr): - rootfs_nfs_url = '{}:{}/{}'.format(ip, rootfs_nfsroot, rootfs_subpath) - kernel_tftp_url = '{}/{}'.format(kernel_tftproot, kernel_subpath) + fdt_subpath, rootfs_nfsroot, rootfs_subpath, + macaddr): + rootfs_nfs_url = '{}/{}'.format(rootfs_nfsroot, rootfs_subpath) + url = urlparse.urlsplit(kernel_tftproot) + kernel_tftp_url = '{}:{}'.format(url.netloc, kernel_subpath) pxe_cfg_filename = _normalise_macaddr(macaddr) url = urlparse.urlsplit(tftproot) - inst_cfg_path = os.path.join(url.path, 'pxelinux.cfg', - pxe_cfg_filename) + inst_cfg_path = os.path.join(url.path, 'pxelinux.cfg') with tempfile.NamedTemporaryFile() as f: - self._write_pxe_config(fh=f, kernel_tftp_url=kernel_tftp_url, - rootfs_nfs_url=rootfs_nfs_url, - extra_args=os.environ.get('KERNEL_ARGS','')) - with self._remote_copy(hostname=url.hostname, src=f.name, - dst=inst_cfg_path): + self._write_pxe_config( + fh=f, kernel_tftp_url=kernel_tftp_url, + fdt_subpath=fdt_subpath, + rootfs_nfs_url=rootfs_nfs_url, + extra_args=os.environ.get('KERNEL_ARGS','')) + with self._remote_copy( + hostname=url.hostname, src=f.name, + dst=os.path.join(inst_cfg_path, + pxe_cfg_filename)), \ + self._remote_symlink( + hostname=url.hostname, + src=pxe_cfg_filename, + dst=os.path.join(inst_cfg_path, + '01-' + pxe_cfg_filename)): yield @contextlib.contextmanager @@ -660,19 +707,24 @@ class PXEBoot(morphlib.writeexts.WriteExtension): url = urlparse.urlsplit(rootfs_rsync) nfsroot = os.environ.get('PXEBOOT_ROOTFS_NFSROOT', '%s:%s' % (url.hostname, url.path)) - with self.remote_kernel(rootfs=temp_root, url=kernel_tftpaddr, + with self.remote_kernel(rootfs=temp_root, tftp_url=kernel_tftpaddr, macaddr=macaddr) as kernel_subpath, \ - self.remote_nfsroot(rootfs=temp_root, rsync_url=rootfs_rsync)\ - as rootfs_subpath, \ + self.remote_fdt(rootfs=temp_root, tftp_url=kernel_tftpaddr, + macaddr=macaddr) as fdt_subpath, \ + self.remote_nfsroot(rootfs=temp_root, rsync_url=rootfs_rsync, \ + macaddr=macaddr) as rootfs_subpath, \ self.remote_pxeboot_config(tftproot=config_tftpaddr, kernel_tftproot=kernel_tftproot, kernel_subpath=kernel_subpath, + fdt_subpath=fdt_subpath, rootfs_nfsroot=nfsroot, rootfs_subpath=rootfs_subpath, macaddr=macaddr): - self.ipmi_pxe_reboot_target() - self.wait_for_target_to_install() - self.ipmi_reboot_target() + persist = os.environ.get('PXE_INSTALLER') in ('no', 'False') + if not persist: + self.ipmi_pxe_reboot_target() + self.wait_for_target_to_install() + self.ipmi_reboot_target() else: cliapp.AppException('Invalid PXEBOOT_MODE: %s' % mode) diff --git a/pxeboot.write.help b/pxeboot.write.help index 58a86957..3aefe75e 100644 --- a/pxeboot.write.help +++ b/pxeboot.write.help @@ -121,3 +121,34 @@ help: > If it is possible for the target to notify you that it has finished installing, you can put a command in here to wait for the event. + + + # Misc + + + ## KERNEL_ARGS + + + Additional kernel command line options. Note that the following + options + + root=/dev/nfs ip=dhcp nfsroot=$NFSROOT` + + are implicitly added by the extension. + + + ## DTB_PATH + + + Location in the deployed root filesystem of the Flattened Device + Tree blob (FDT) to use. + + + ## PXE_INSTALLER + + + If set to `no`, `False` or any other YAML value for false, the + remotely installed rootfs, kernel, bootloader config file and + device tree blob if specified, will not be removed after the + deployment finishes. This variable is only meanful on the + `existing-server` mode. diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 8115c309..93b94dff 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:libndp ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 unpetrify-ref: v1.4 - build-depends: [] - name: readline6 repo: upstream:readline ref: 7628b745a813aac53586b640da056a975f1c443e unpetrify-ref: readline-6.3 - build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph repo: upstream:NetworkManager diff --git a/strata/ansible.morph b/strata/ansible.morph index 29ea73e6..33a23750 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -3,29 +3,10 @@ kind: stratum description: A stratum with ansible and its dependencies build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python-common.morph chunks: -- name: paramiko - repo: upstream:paramiko - ref: 951faed80b017e553a27c4cb98f210df44341f8f - unpetrify-ref: baserock/morph - build-depends: [] -- name: markupsafe - repo: upstream:markupsafe - ref: 58cde05bdcb0a53d87213b4a5bb605937f178171 - unpetrify-ref: baserock/morph - build-depends: [] -- name: jinja2 - repo: upstream:jinja2 - ref: 91fa138077d9ed5cf73a7903479077498e695492 - unpetrify-ref: baserock/morph - build-depends: - - markupsafe - name: ansible morph: strata/ansible/ansible.morph repo: upstream:ansible - ref: aa56db7e28d4fe256471043b05120c2f41a840e5 - unpetrify-ref: baserock/morph - build-depends: - - paramiko - - jinja2 + ref: ebc8d48d34296fe010096f044e2b7591df37a622 + unpetrify-ref: baserock/v1.8.4 diff --git a/strata/ansible/ansible.morph b/strata/ansible/ansible.morph index da434f03..dbc6ec4b 100644 --- a/strata/ansible/ansible.morph +++ b/strata/ansible/ansible.morph @@ -2,4 +2,8 @@ name: ansible kind: chunk build-system: python-distutils post-install-commands: -- install -D -m644 ansible.cfg "$DESTDIR/etc/ansible/ansible.cfg" +- | + install -D -m644 /proc/self/fd/0 "$DESTDIR/etc/ansible/ansible.cfg" <<EOF + [defaults] + log_path=/var/log/ansible + EOF diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 065ec155..7a403535 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk - build-depends: [] - name: httpd morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd @@ -23,7 +22,6 @@ chunks: repo: upstream:python-packages/psutil ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 unpetrify-ref: release-2.2.0 - build-depends: [] - name: mod_wsgi-metrics repo: upstream:python-packages/mod_wsgi-metrics ref: ec715eb593255229f9f45f3f323edbb845c691d8 diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index a3539d65..f153e0c3 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -9,14 +9,12 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] - name: armv7lhf-cross-linux-api-headers morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph repo: upstream:linux ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa unpetrify-ref: baserock/v3.8 - build-depends: [] - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 829cf6f8..00a614c9 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -8,12 +8,10 @@ chunks: repo: upstream:libatomic_ops ref: 0a58f5d63969c10d2141af89cb7a53df786909ab unpetrify-ref: baserock/morph - build-depends: [] - name: alsa-lib repo: upstream:alsa-lib ref: 9cfd1faa27511edbb8bebbab85030125f33590ae unpetrify-ref: v1.0.28 - build-depends: [] - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils @@ -26,7 +24,6 @@ chunks: repo: upstream:libical ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 unpetrify-ref: baserock/morph - build-depends: [] - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez @@ -40,7 +37,6 @@ chunks: repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph - build-depends: [] - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc @@ -52,7 +48,6 @@ chunks: repo: upstream:speex ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa unpetrify-ref: baserock/morph - build-depends: [] - name: nohands morph: strata/audio-bluetooth/nohands.morph repo: upstream:nohands @@ -65,7 +60,6 @@ chunks: repo: upstream:mobile-broadband-provider-info ref: 4ed19e11c2975105b71b956440acdb25d46a347d unpetrify-ref: baserock/morph - build-depends: [] - name: ofono morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono @@ -79,13 +73,11 @@ chunks: repo: upstream:json-c ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch - build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph repo: upstream:libsndfile ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 unpetrify-ref: baserock/morph - build-depends: [] - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index 7ca5e7ce..2b18d02d 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -2,28 +2,25 @@ name: baserock-import kind: stratum description: Tools for importing software into Baserock definitions. build-depends: -- morph: strata/morph-utils.morph +- morph: strata/python-common.morph +- morph: strata/python-cliapp.morph chunks: - name: ansicolor repo: upstream:python-packages/ansicolor ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef unpetrify-ref: 0.2.4 - build-depends: [] - name: python-decorator repo: upstream:python-packages/python-decorator ref: b02f7a254c3679dfac57a824e08dd02ced850636 unpetrify-ref: decorator-3.4.0 - build-depends: [] - name: networkx repo: upstream:python-packages/networkx ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c unpetrify-ref: networkx-1.9.1 - build-depends: [] - name: requests-cache repo: upstream:python-packages/requests-cache ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf unpetrify-ref: 0.4.6 - build-depends: [] - name: baserock-import repo: baserock:baserock/import ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index bdf047cf..2cf541a7 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 529b563c..f8d19b9b 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 97ccfe3c..7b0f0fa0 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index f8a7ff00..616d564f 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index 702858de..a5edb9db 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -9,8 +9,7 @@ build-depends: - morph: strata/core.morph chunks: - name: linux-armv8l64-generic - morph: strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph + morph: strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph repo: upstream:linux ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge - build-depends: [] diff --git a/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph index 120239b9..4eb92de4 100644 --- a/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph @@ -102,3 +102,4 @@ build-commands: install-commands: - mkdir -p "$DESTDIR"/boot - make install dtbs_install INSTALL_PATH="$DESTDIR/boot" +- cp arch/arm64/boot/Image "$DESTDIR/boot/vmlinux" diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 111402a7..85ab5ecf 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -17,7 +17,6 @@ chunks: repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: u-boot@jetson morph: strata/bsp-jetson/u-boot@jetson.morph repo: upstream:u-boot @@ -30,13 +29,11 @@ chunks: repo: upstream:linux ref: 682c943b0159b1a4105f31020605bf8a0f155ffd unpetrify-ref: baserock/v3.18-with-cpufreq - build-depends: [] - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: [] - name: nouveau-drm morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau @@ -49,4 +46,3 @@ chunks: repo: upstream:linux-firmware ref: 9322ef5b14c78ec28163baa41bff240a0e098810 unpetrify-ref: baserock/jetson - build-depends: [] diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index 002c00be..58038d60 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4ffd2e0e..2ab095df 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: linux-armv7-wandboard morph: strata/bsp-wandboard/linux-armv7-wandboard.morph repo: upstream:linux diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 244745bf..10c4dbe5 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.morph index c0f15807..4570865b 100644 --- a/strata/bsp-x86_32-generic/syslinux.morph +++ b/strata/bsp-x86_32-generic/syslinux.morph @@ -1,8 +1,12 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean -- make -- make installer +- make NO_WERROR=1 +- make NO_WERROR=1 installer install-commands: - make INSTALLROOT="$DESTDIR" install diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 04be0dcd..749e3722 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph index 43356e36..4570865b 100644 --- a/strata/bsp-x86_64-generic/syslinux.morph +++ b/strata/bsp-x86_64-generic/syslinux.morph @@ -1,5 +1,9 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean - make NO_WERROR=1 diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index b5bee9cb..f7212054 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.morph index c0f15807..4570865b 100644 --- a/strata/bsp-x86_both-tools/syslinux.morph +++ b/strata/bsp-x86_both-tools/syslinux.morph @@ -1,8 +1,12 @@ name: syslinux kind: chunk +products: +- artifact: syslinux-devel + include: + - (usr/)?share/syslinux/com32.* build-commands: - make clean -- make -- make installer +- make NO_WERROR=1 +- make NO_WERROR=1 installer install-commands: - make INSTALLROOT="$DESTDIR" install diff --git a/strata/build-essential.morph b/strata/build-essential.morph index e7da1784..0758fee8 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -46,7 +46,6 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] build-mode: bootstrap prefix: /tools @@ -136,8 +135,8 @@ chunks: - name: stage2-busybox morph: strata/build-essential/stage2-busybox.morph repo: upstream:busybox - ref: 8a801e0f024f1385d8e989b80b90443546bceae7 - unpetrify-ref: baserock/build-essential + ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca + unpetrify-ref: 1_23_1 build-depends: - stage1-binutils - stage1-gcc @@ -150,7 +149,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] build-mode: bootstrap prefix: /tools @@ -159,7 +157,6 @@ chunks: repo: baserock:baserock/fhs-dirs ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4 unpetrify-ref: master - build-depends: [] build-mode: bootstrap prefix: /tools @@ -294,8 +291,8 @@ chunks: - name: busybox morph: strata/build-essential/busybox.morph repo: upstream:busybox - ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c - unpetrify-ref: baserock/build-essential + ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca + unpetrify-ref: 1_23_1 build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..f4a1b1e9 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -7,7 +7,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph index 02be4dda..345d3b00 100644 --- a/strata/build-essential/gcc.morph +++ b/strata/build-essential/gcc.morph @@ -1,6 +1,22 @@ name: gcc kind: chunk +products: +- artifact: gcc-libs + include: + - (usr/)lib/lib.*\.so(\.\d+)*$ +- artifact: gcc-doc + include: + - (usr/)?share/doc/.* + - (usr/)?share/man/.* + - (usr/)?share/info/.* +- artifact: gcc-devel + # devel includes everything which isn't documentation or libs, since + # everything else gcc produces is required for compiling + # this is the -devel artifact instead of -misc, since it goes in -devel + # stratum artifacts by default + include: [ .* ] + configure-commands: - mkdir o diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index 789283eb..e6f87fde 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -84,3 +84,17 @@ install-commands: netgroup: nis EOF - install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf" +- | + cat <<EOF > ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" +# Compatibility symlink to work around the ABI break GLIBC introduced for +# ARMv7 hard-float platforms in commit d3b36017d43. +- case "$MORPH_ARCH" in + armv7*hf*) + ln -s ld-2.20.so "$DESTDIR/lib/ld-linux.so.3" ;; + esac diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 14a6e253..64080217 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -9,7 +9,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph index ffa0970b..48ceb767 100644 --- a/strata/build-essential/stage2-glibc.morph +++ b/strata/build-essential/stage2-glibc.morph @@ -32,6 +32,15 @@ build-commands: install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install +- mkdir -p "$DESTDIR/etc" +- | + cat <<EOF > ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" - sh stage2-glibc-fix-specs # Install a symlink for the program interpreter (ld.so) so that binaries diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 1108ab4b..0fc987c4 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libaio ref: 08f50baec0e7731116d3f665c6155d7829edf5d7 unpetrify-ref: libaio-0.3.110-1 - build-depends: [] - name: keyutils morph: strata/ceph-service/keyutils.morph repo: upstream:keyutils ref: 9209a0c8fd63afc59f644e078b40cec531409c30 unpetrify-ref: v1.5.9 - build-depends: [] - name: libunwind repo: upstream:libunwind ref: d7322f0f64dab715c4feb5f08edef5660d8719c0 unpetrify-ref: v1.1 - build-depends: [] - name: gperftools repo: upstream:gperftools ref: 846b775dfadb77901202ae7ddbac30ad1de7df01 @@ -31,7 +28,6 @@ chunks: repo: upstream:snappy-git ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4 unpetrify-ref: master - build-depends: [] - name: leveldb morph: strata/ceph-service/leveldb.morph repo: upstream:leveldb @@ -44,13 +40,11 @@ chunks: repo: upstream:libeditline-tarball ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph - build-depends: [] - name: boost morph: strata/ceph-service/boost.morph repo: upstream:boost-tarball ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304 unpetrify-ref: boost_1_56_0 - build-depends: [] - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph diff --git a/strata/chef.morph b/strata/chef.morph index 9105a2e0..69b495aa 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -10,7 +10,6 @@ chunks: 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 @@ -23,31 +22,26 @@ chunks: 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 @@ -60,19 +54,16 @@ chunks: 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 @@ -85,19 +76,16 @@ chunks: 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 @@ -110,103 +98,86 @@ chunks: 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/chef/libpopt.morph repo: upstream:libpopt ref: c224abf28f4ff9bbf292908324359cb5905addf8 unpetrify-ref: master - build-depends: [] - name: sgdisk morph: strata/chef/sgdisk.morph repo: upstream:sgdisk diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 535beef6..1c752e58 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -4,40 +4,21 @@ description: A stratum with cloudinit to fit a system in the OpenStack cloud. build-depends: - morph: strata/build-essential.morph - morph: strata/python-core.morph +- morph: strata/python-common.morph - morph: strata/foundation.morph chunks: - name: configobj repo: upstream:configobj ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph - build-depends: [] -- name: python-prettytable - morph: strata/cloudinit-support/python-prettytable.morph - repo: upstream:python-prettytable - ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-patch - repo: upstream:python-json-patch - ref: 27c7032de25923593fa17cc14f535fb7abd52448 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-pointer - repo: upstream:python-json-pointer - ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53 - unpetrify-ref: baserock/morph - build-depends: - - python-json-patch - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed unpetrify-ref: baserock/morph - build-depends: [] - name: boto repo: upstream:boto ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf unpetrify-ref: baserock/morph - build-depends: [] - name: cloud-init morph: strata/cloudinit-support/cloud-init.morph repo: upstream:cloud-init @@ -46,6 +27,4 @@ chunks: build-depends: - boto - configobj - - python-prettytable - - python-json-pointer - python-cheetah diff --git a/strata/cloudinit-support/python-prettytable.morph b/strata/cloudinit-support/python-prettytable.morph deleted file mode 100644 index cf1ac6e1..00000000 --- a/strata/cloudinit-support/python-prettytable.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-prettytable -kind: chunk -build-commands: -- cd src && python setup.py build -install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/connectivity.morph b/strata/connectivity.morph index 2cc6bb69..dbd4a263 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:libnl ref: a2c4bd8f094a7247903578860a9c42049991860b unpetrify-ref: baserock/morph - build-depends: [] - name: wpa_supplicant morph: strata/connectivity/wpa_supplicant.morph repo: upstream:hostap @@ -19,4 +18,3 @@ chunks: repo: upstream:iptables ref: 482c6d3731e2681cb4baae835c294840300197e6 unpetrify-ref: v1.4.21 - build-depends: [] diff --git a/strata/connman-common.morph b/strata/connman-common.morph index f6f7ddb0..a22b7e90 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:connman ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 unpetrify-ref: baserock/1.24 - build-depends: [] diff --git a/strata/core.morph b/strata/core.morph index 5de96bd4..b424a023 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -9,37 +9,31 @@ chunks: repo: upstream:sqlite3 ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 - build-depends: [] - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake ref: 0b3781e4c497566acaa504d4106d11c02a642501 unpetrify-ref: v2.8.12.2 - build-depends: [] - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 unpetrify-ref: gdbm-1.11 - build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph repo: upstream:gettext-tarball ref: 482840e61f86ca321838a91e902c41d40c098bbb unpetrify-ref: gettext-0.19.4 - build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 unpetrify-ref: master - build-depends: [] - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 unpetrify-ref: ncurses-5.9-20150131 - build-depends: [] - name: perl morph: strata/core/perl.morph repo: upstream:perl @@ -76,7 +70,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] - name: flex morph: strata/core/flex.morph repo: upstream:flex @@ -97,7 +90,6 @@ chunks: repo: upstream:bzip2 ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 unpetrify-ref: baserock/morph - build-depends: [] - name: readline morph: strata/core/readline.morph repo: upstream:readline @@ -121,7 +113,6 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 - build-depends: [] - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 @@ -218,7 +209,6 @@ chunks: repo: upstream:gperf ref: 5094e4a539adf845111013f82c2c4fcaec637983 unpetrify-ref: baserock/morph - build-depends: [] - name: intltool repo: upstream:intltool ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4 diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2051cf50..f226f50b 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: [] - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index be4f4db8..ffed2e66 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph repo: upstream:openssh-git @@ -18,67 +17,12 @@ chunks: unpetrify-ref: baserock/morph build-depends: - groff -- name: python-ttystatus - morph: strata/cross-bootstrap/python-ttystatus.morph - repo: upstream:python-ttystatus - ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coveragepy - morph: strata/cross-bootstrap/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner -- name: python-markdown - repo: upstream:python-markdown - ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 - unpetrify-ref: baserock/morph - build-depends: [] -- name: cmdtest - morph: strata/cross-bootstrap/cmdtest.morph - repo: upstream:cmdtest - ref: ac91791842c6e7e6eda3213916af413255999c7b - unpetrify-ref: baserock/morph - build-depends: - - cliapp - - python-ttystatus - - python-markdown - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] -- name: pyfilesystem - morph: strata/cross-bootstrap/pyfilesystem.morph - repo: upstream:pyfilesystem - ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 - unpetrify-ref: baserock/morph - build-depends: [] -- name: morph - repo: baserock:baserock/morph - ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c - unpetrify-ref: master - build-depends: - - cliapp - - cmdtest - - python-coverage-test-runner - - pyfilesystem - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 - build-depends: [] diff --git a/strata/cross-bootstrap/cmdtest.morph b/strata/cross-bootstrap/cmdtest.morph deleted file mode 100644 index 3e1c71c6..00000000 --- a/strata/cross-bootstrap/cmdtest.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: cmdtest -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/cross-bootstrap/pyfilesystem.morph b/strata/cross-bootstrap/pyfilesystem.morph deleted file mode 100644 index a4931dfa..00000000 --- a/strata/cross-bootstrap/pyfilesystem.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyfilesystem -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/cross-bootstrap/python-ttystatus.morph b/strata/cross-bootstrap/python-ttystatus.morph deleted file mode 100644 index e45ef7a8..00000000 --- a/strata/cross-bootstrap/python-ttystatus.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-ttystatus -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph index c3e35e6d..36a82808 100644 --- a/strata/cross-tools.morph +++ b/strata/cross-tools.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:patchelf ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph index 057558b8..326f7a59 100644 --- a/strata/cxmanage.morph +++ b/strata/cxmanage.morph @@ -8,23 +8,19 @@ chunks: repo: upstream:ipmitool ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd unpetrify-ref: baserock/morph - build-depends: [] - name: pexpect morph: strata/cxmanage/pexpect.morph repo: upstream:pexpect ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c unpetrify-ref: baserock/morph - build-depends: [] - name: pyipmi repo: upstream:pyipmi ref: bb7dba84578c05ba87db3c4186a2989c89e4e519 unpetrify-ref: baserock/morph - build-depends: [] - name: tftpy repo: upstream:tftpy ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b unpetrify-ref: baserock/morph - build-depends: [] - name: cxmanage repo: upstream:cxmanage ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6 diff --git a/strata/databases.morph b/strata/databases.morph index 9171925c..89aa996e 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -10,19 +10,16 @@ chunks: repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 unpetrify-ref: REL9_3_4 - build-depends: [] - name: redis morph: strata/databases/redis.morph repo: upstream:redis ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 unpetrify-ref: baserock/3.0 - build-depends: [] - name: memcached morph: strata/databases/memcached.morph repo: upstream:memcached ref: c5530027c8ea28674358327ab8212ebaf014c848 unpetrify-ref: 1.4.22 - build-depends: [] - name: psycopg2 repo: upstream:python-packages/psycopg2 ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8 @@ -33,4 +30,3 @@ chunks: repo: upstream:python-packages/python-memcached ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db unpetrify-ref: master - build-depends: [] diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph index 28e01362..f1cb287e 100644 --- a/strata/databases/memcached.morph +++ b/strata/databases/memcached.morph @@ -6,3 +6,16 @@ configure-commands: - touch README - autoreconf -fvi - ./configure --prefix="$PREFIX" +install-commands: +- make install +- install -D -m 755 scripts/memcached.service "$DESTDIR$PREFIX"/lib/systemd/system/memcached.service +post-install-commands: +- mkdir -p "$DESTDIR"/etc/sysconfig +- | + cat <<EOF > "$DESTDIR"/etc/sysconfig/memcached + PORT="11211" + USER="nobody" + MAXCONN="1024" + CACHESIZE="64" + OPTIONS="" + EOF diff --git a/strata/devtools.morph b/strata/devtools.morph index 73ebd783..9a295db5 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -13,20 +13,16 @@ chunks: 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/django.morph b/strata/django.morph index 7659593c..8ae63801 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:python-packages/django ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb unpetrify-ref: 1.6.8 - build-depends: [] - name: django-appconf repo: upstream:python-packages/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 unpetrify-ref: 0.6 - build-depends: [] - name: django-compressor repo: upstream:python-packages/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 @@ -25,7 +23,6 @@ chunks: repo: upstream:python-packages/pyscss ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 unpetrify-ref: 1.2.1 - build-depends: [] - name: django-pyscss repo: upstream:python-packages/django-pyscss ref: 665270b54eea5de5aca379a78673b411ed6b1f04 diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 25eafce2..d1637f48 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -13,13 +13,11 @@ chunks: repo: upstream:fribidi ref: c9916f2ab289126a32febcc4754efc73a011fb0c unpetrify-ref: baserock/morph/0.19.6 - build-depends: [] - name: bullet3 morph: strata/enlightenment/bullet3.morph repo: upstream:bullet3 ref: 940059ddb3c4476bb9860f79f35b0b1230857f54 unpetrify-ref: baserock/morph - build-depends: [] - name: efl morph: strata/enlightenment/efl.morph repo: upstream:enlightenment/efl diff --git a/strata/erlang.morph b/strata/erlang.morph index bea09d61..d31e78cd 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:erlang ref: 9417f044ee3c291c2ea343c203aebdcc40597226 unpetrify-ref: OTP-17.3.4 - build-depends: [] - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/strata/foundation.morph b/strata/foundation.morph index 9a4a15ec..eea872a8 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -7,27 +7,23 @@ chunks: - name: attr morph: strata/foundation/attr.morph repo: upstream:attr - ref: bf32f1769e9895f8546570f0c841a945c93a5b22 + ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph - build-depends: [] - name: groff morph: strata/foundation/groff.morph repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 - build-depends: [] - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz ref: a0782484f101ac55c916568bc1c490d7761fc904 unpetrify-ref: 2015a - build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -40,13 +36,11 @@ chunks: repo: upstream:libffi ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph - build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph - build-depends: [] - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -67,7 +61,6 @@ chunks: - name: libgpg-error repo: upstream:libgpg-error ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 - build-depends: [] - name: libgcrypt repo: upstream:libgcrypt ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 @@ -78,7 +71,6 @@ chunks: repo: upstream:linux-pam ref: b1521c97e73b10469f7b34c0571d51c647eca83c unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -108,13 +100,11 @@ chunks: repo: upstream:lzo ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 unpetrify-ref: lzo-2.08 - build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 unpetrify-ref: baserock/morph - build-depends: [] - name: acl morph: strata/foundation/acl.morph repo: upstream:acl @@ -127,7 +117,6 @@ chunks: repo: upstream:e2fsprogs ref: 6a3741ad293031447b95b88431eafa77401a8987 unpetrify-ref: v1.42.12 - build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs @@ -150,7 +139,6 @@ chunks: repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e unpetrify-ref: baserock/morph - build-depends: [] - name: openssh morph: strata/foundation/openssh.morph repo: upstream:openssh-git @@ -172,3 +160,8 @@ chunks: build-depends: - dbus - glib +- name: rsync + morph: strata/foundation/rsync.morph + repo: upstream:rsync + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.morph index 59158a90..46d0b9c0 100644 --- a/strata/foundation/attr.morph +++ b/strata/foundation/attr.morph @@ -1,14 +1,18 @@ name: attr kind: chunk -description: -- 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch' +build-system: autotools configure-commands: -- sed -i -e 's,PKG_\(.*\)_DIR\t= ,PKG_\1_DIR\t= \$(DESTDIR),g' include/builddefs.in -- sed -i -e 's,\$\$LOCAL_CONFIGURE_OPTIONS,\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile -- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin - --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include - --mandir=/usr/share/man --datadir=/usr/share" configure -build-commands: -- make SHELL=/bin/bash +- make configure +- | + ./configure --prefix="$PREFIX" \ + --exec-prefix="$PREFIX" \ + --sbindir="$PREFIX"/sbin \ + --bindir="$PREFIX"/bin \ + --libdir="$PREFIX"/lib \ + --libexecdir="$PREFIX"/lib \ + --enable-lib64=yes \ + --includedir="$PREFIX"/include \ + --mandir="$PREFIX"/share/man \ + --datadir="$PREFIX"/share install-commands: -- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev +- make DESTDIR="$DESTDIR" install-lib install-dev diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph index a57eb15a..55ac486c 100644 --- a/strata/foundation/e2fsprogs.morph +++ b/strata/foundation/e2fsprogs.morph @@ -8,14 +8,15 @@ configure-commands: # install it. - | ./configure --prefix="$PREFIX" --sysconfdir=/etc \ - --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid + --disable-libuuid --disable-uuidd --disable-libblkid install-commands: # e2fsprogs also includes tools that are provided by util-linux, so we # need to selectively exclude them. Removing them directly from DESTDIR # causes problems, so we need to remove them beforehand. - | td="$(mktemp -d)" + make DESTDIR="$td" install make DESTDIR="$td" install-libs - find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete + find "$td" \( -name blkid -o -name findfs -o \) -delete find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete mv "$td"/* "$DESTDIR" diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph new file mode 100644 index 00000000..fb10f94e --- /dev/null +++ b/strata/foundation/rsync.morph @@ -0,0 +1,9 @@ +name: rsync +kind: chunk +build-system: autotools +build-commands: +- make proto +- make +install-commands: +- make install +- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service diff --git a/strata/genivi.morph b/strata/genivi.morph index 24050b4c..5294dc4e 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -3,18 +3,18 @@ kind: stratum description: Software components designed by genivi, for genivi. build-depends: - morph: strata/foundation.morph +- morph: strata/audio-bluetooth.morph chunks: - name: linuxquota morph: strata/genivi/linuxquota.morph repo: upstream:linuxquota ref: 0804c89a16736533e440771dc42a15e5d0223902 unpetrify-ref: baserock/genivi/morph - build-depends: [] - name: DLT-daemon + morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon ref: 8b48e73f79b4463393916e4c6696917e3dedd026 unpetrify-ref: v2.10.0 - build-depends: [] - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller @@ -27,7 +27,6 @@ chunks: repo: upstream:googletest ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08 unpetrify-ref: baserock/morph - build-depends: [] - name: googlemock morph: strata/genivi/googlemock.morph repo: upstream:googlemock @@ -36,11 +35,12 @@ chunks: build-depends: - googletest - name: genivi-common-api-runtime + morph: strata/genivi/genivi-common-api-runtime.morph repo: upstream:genivi-common-api-runtime ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 - build-depends: [] - name: genivi-common-api-dbus-runtime + morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f unpetrify-ref: 2.1.6-p1 @@ -61,12 +61,21 @@ chunks: repo: upstream:itzam-tarball ref: 4ebcf671416927b64475da7b810b6016c847bf73 unpetrify-ref: baserock/genivi/baseline - build-depends: [] +- name: persistence-common-object + morph: strata/genivi/persistence-common-object.morph + repo: upstream:genivi/persistence-common-object + ref: dc46126214022d068729f7ccd47415dc5f86f425 + unpetrify-ref: baserock/1.0.2 + build-depends: + - itzam-tarball + - DLT-daemon - name: persistence-client-library + morph: strata/genivi/persistence-client-library.morph repo: upstream:genivi/persistence-client-library - ref: 0934ba263e69be8453cc3150f997dad28489f0c7 - unpetrify-ref: baserock/genivi/baseline + ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80 + unpetrify-ref: baserock/v1.0.0 build-depends: + - persistence-common-object - DLT-daemon - itzam-tarball - name: node-state-manager @@ -76,3 +85,26 @@ chunks: build-depends: - DLT-daemon - persistence-client-library +- name: libarchive + morph: strata/genivi/libarchive.morph + repo: upstream:libarchive + ref: 19f23e191f9d3e1dd2a518735046100419965804 + unpetrify-ref: v3.1.2 +- name: persistence-administrator + morph: strata/genivi/persistence-administrator.morph + repo: upstream:genivi/persistence-administrator + ref: f9d62e70237c05323cbd60f1d5c7b574fbc2de43 + unpetrify-ref: baserock/1.0.5 + build-depends: + - persistence-common-object + - DLT-daemon + - libarchive + - node-state-manager +- name: node-health-monitor + repo: upstream:genivi/node-health-monitor + ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0 + unpetrify-ref: baserock/1.3.3 + build-depends: + - node-state-manager + - persistence-client-library + - DLT-daemon diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph new file mode 100644 index 00000000..e22e31e3 --- /dev/null +++ b/strata/genivi/DLT-daemon.morph @@ -0,0 +1,5 @@ +name: DLT-deamon +kind: chunk +build-system: cmake +configure-commands: +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_SYSTEMD=ON diff --git a/strata/genivi/genivi-common-api-dbus-runtime.morph b/strata/genivi/genivi-common-api-dbus-runtime.morph new file mode 100644 index 00000000..8d6cb134 --- /dev/null +++ b/strata/genivi/genivi-common-api-dbus-runtime.morph @@ -0,0 +1,5 @@ +name: genivi-common-api-dbus-runtime +kind: chunk +build-system: autotools +pre-configure-commands: +- ln -s . build-aux diff --git a/strata/genivi/genivi-common-api-runtime.morph b/strata/genivi/genivi-common-api-runtime.morph new file mode 100644 index 00000000..7439331a --- /dev/null +++ b/strata/genivi/genivi-common-api-runtime.morph @@ -0,0 +1,5 @@ +name: genivi-common-api-runtime +kind: chunk +build-system: autotools +pre-configure-commands: +- ln -s . build-aux diff --git a/strata/genivi/libarchive.morph b/strata/genivi/libarchive.morph new file mode 100644 index 00000000..bf840f58 --- /dev/null +++ b/strata/genivi/libarchive.morph @@ -0,0 +1,6 @@ +name: libarchive +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-acl diff --git a/strata/genivi/persistence-administrator.morph b/strata/genivi/persistence-administrator.morph new file mode 100644 index 00000000..f4fd07a5 --- /dev/null +++ b/strata/genivi/persistence-administrator.morph @@ -0,0 +1,5 @@ +name: persistence-administrator +kind: chunk +build-system: autotools +pre-configure-commands: +- chmod +x autogen.sh diff --git a/strata/genivi/persistence-client-library.morph b/strata/genivi/persistence-client-library.morph new file mode 100644 index 00000000..6ea6aef2 --- /dev/null +++ b/strata/genivi/persistence-client-library.morph @@ -0,0 +1,6 @@ +name: persistence-client-library +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-werror diff --git a/strata/genivi/persistence-common-object.morph b/strata/genivi/persistence-common-object.morph new file mode 100644 index 00000000..179a6031 --- /dev/null +++ b/strata/genivi/persistence-common-object.morph @@ -0,0 +1,5 @@ +name: persistence-common-object +kind: chunk +build-system: autotools +pre-configure-commands: +- chmod +x autogen.sh diff --git a/strata/gitlab.morph b/strata/gitlab.morph index 0a1c35bb..ab77e7bb 100644 --- a/strata/gitlab.morph +++ b/strata/gitlab.morph @@ -9,16 +9,13 @@ chunks: repo: upstream:gitlab/gitlab-ce ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425 unpetrify-ref: baserock/v7.0.0 - build-depends: [] - name: gitlab-ci morph: strata/gitlab/gitlab-ci.morph repo: upstream:gitlab/gitlab-ci ref: c74044d65dec2ba8311e242c84e07a67abd52d37 unpetrify-ref: baserock/morph - build-depends: [] - name: gitlab-shell morph: strata/gitlab/gitlab-shell.morph repo: upstream:gitlab/gitlab-shell ref: 0b4106d57223c666d9360339fd3790174aa43800 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index baa935f5..d885ff72 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 - build-depends: [] - name: freetype2 repo: upstream:freetype2 ref: ec8853cd18e1a0c275372769bdad37a79550ed66 unpetrify-ref: VER-2-5-3 - build-depends: [] - name: fontconfig repo: upstream:fontconfig ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a @@ -26,22 +24,18 @@ chunks: repo: upstream:freefont-otf ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 unpetrify-ref: baserock/morph - build-depends: [] - name: libpng repo: upstream:libpng ref: 259fb7761d747655c607efcec7a12ff1f3c24561 unpetrify-ref: libpng-1.6.13-signed - build-depends: [] - name: libjpeg repo: upstream:libjpeg ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a unpetrify-ref: baserock/morph - build-depends: [] - name: libtiff repo: upstream:libtiff ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd unpetrify-ref: Release-v4-0-3 - build-depends: [] - name: cairo morph: strata/graphics-common/cairo.morph repo: upstream:cairo diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index f1141fcd..0493245f 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -10,24 +10,20 @@ chunks: repo: upstream:pango ref: e0a21abf52a0b7588b1aa3357818948816ed9103 unpetrify-ref: 1.36.8 - build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info ref: c136fc2578aa8f7c0e098008da18d324033eb991 unpetrify-ref: Release-1-4 - build-depends: [] - name: gnome-common repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: gdk-pixbuf morph: strata/gtk-deps/gdk-pixbuf.morph repo: upstream:gdk-pixbuf ref: b86959aa16e9d49ec6e286bc57d36c5249578c59 unpetrify-ref: 2.30.8 - build-depends: [] - name: atk repo: upstream:atk ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 @@ -38,7 +34,6 @@ chunks: repo: upstream:at-spi2-core ref: 96c2842088008670e72739ea7921d654487a57fb unpetrify-ref: AT_SPI2_CORE_2_14_1 - build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 8ac31eaa..4a19606a 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -9,4 +9,3 @@ chunks: morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ ref: fbf38d16bcc26630f0f721d266509f5bc292f606 - build-depends: [] diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 8af030bb..826555a0 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph index b6076cde..35bc78cd 100644 --- a/strata/initramfs-utils.morph +++ b/strata/initramfs-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/initramfs-scripts ref: a97dea93d28ba272613029e46a8a0b1f699729d8 unpetrify-ref: master - build-depends: [] diff --git a/strata/input-common.morph b/strata/input-common.morph index dab05826..e6ebad9a 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -8,18 +8,15 @@ chunks: repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: v1.1.5 - build-depends: [] - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf unpetrify-ref: xkeyboard-config-2.13 - build-depends: [] - name: libevdev repo: upstream:libevdev ref: 7ac00d7e920c56bb8617403699030a5300bfae1c unpetrify-ref: libevdev-1.3.2 - build-depends: [] - name: libinput repo: upstream:libinput ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 diff --git a/strata/installer-utils.morph b/strata/installer-utils.morph index b97a7c09..fe6c65fe 100644 --- a/strata/installer-utils.morph +++ b/strata/installer-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/installer-scripts ref: master unpetrify-ref: master - build-depends: [] diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 316bf483..0efac1e3 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-lib-libpciaccess ref: f99c2e4199ce37f6f94428df504427f67c3ec543 unpetrify-ref: libpciaccess-0.13.3 - build-depends: [] - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph index cf3dec19..9aa166fd 100644 --- a/strata/lighttpd-server.morph +++ b/strata/lighttpd-server.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 243461d6..1291e062 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:llvm ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f unpetrify-ref: release_33 - build-depends: [] diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 2090787e..00ae5752 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -6,11 +6,11 @@ description: | This is a component of Trove, but can also be used with other Git servers. build-depends: -- morph: strata/foundation.morph +- morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: lorry-controller - morph: strata/trove/lorry-controller.morph + morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: 4b1fcab140d940470c342c6857cdc8682406f0b7 + ref: f3f59d1415bfdb18f17bd910b829a8d128c1562a unpetrify-ref: master - build-depends: [] diff --git a/strata/trove/lorry-controller.morph b/strata/lorry-controller/lorry-controller.morph index 2f90a9a1..2f90a9a1 100644 --- a/strata/trove/lorry-controller.morph +++ b/strata/lorry-controller/lorry-controller.morph diff --git a/strata/lorry.morph b/strata/lorry.morph index 8a813d58..b3a0c779 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -10,21 +10,17 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. build-depends: -# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at -# build-time to generate its man page. Otherwise we could simply depend on -# the 'foundation' stratum. -- morph: strata/morph-utils.morph +- morph: strata/foundation.morph +- morph: strata/python-cliapp.morph chunks: - name: bzr-tarball repo: upstream:bzr-tarball ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52 unpetrify-ref: baserock/morph - build-depends: [] - name: python-fastimport repo: upstream:python-fastimport ref: 6500a5e7d82651ade9002d44e3ecc71a50302616 unpetrify-ref: baserock/morph - build-depends: [] - name: bzr-fastimport repo: upstream:bzr-fastimport ref: b3cda9967f857127bd4dab5eb72223a95916f5ea @@ -37,13 +33,11 @@ chunks: repo: upstream:cvs-tarball ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph - build-depends: [] - name: libapr morph: strata/lorry/libapr.morph repo: upstream:libapr ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 unpetrify-ref: 1.5.1 - build-depends: [] - name: libapr-util morph: strata/lorry/libapr-util.morph repo: upstream:libapr-util @@ -56,7 +50,6 @@ chunks: repo: upstream:perl-dbi-tarball ref: 09e269cff811f0c1881ea0d6b7571173bab8377b unpetrify-ref: baserock/morph - build-depends: [] - name: perl-dbd-sqlite-tarball repo: upstream:perl-dbd-sqlite-tarball ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02 @@ -76,13 +69,11 @@ chunks: repo: upstream:swig-tarball ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b unpetrify-ref: baserock/morph - build-depends: [] - name: neon morph: strata/lorry/neon.morph repo: upstream:neon ref: 837374e9d797e216f1de684595cefe791f67c0e4 unpetrify-ref: baserock/morph - build-depends: [] - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball @@ -99,7 +90,6 @@ chunks: repo: upstream:mercurial-tarball ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a unpetrify-ref: baserock/morph - build-depends: [] - name: hg-fast-export morph: strata/lorry/hg-fast-export.morph repo: upstream:hg-fast-export @@ -112,7 +102,6 @@ chunks: repo: upstream:cvsps ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49 unpetrify-ref: baserock/morph - build-depends: [] - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry diff --git a/strata/lua.morph b/strata/lua.morph index 75ccad86..dcdd8801 100644 --- a/strata/lua.morph +++ b/strata/lua.morph @@ -9,10 +9,8 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: luajit2 morph: strata/lua/luajit2.morph repo: upstream:luajit2 ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d unpetrify-ref: v2.0.3 - build-depends: [] diff --git a/strata/lvm.morph b/strata/lvm.morph index 8c1c3f67..92a06f41 100644 --- a/strata/lvm.morph +++ b/strata/lvm.morph @@ -13,4 +13,3 @@ chunks: repo: upstream:lvm2 ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 unpetrify-ref: v2_02_115 - build-depends: [] diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index efae2449..8967446c 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:mesa ref: 1a9cc5f50db5d27530a3449743b43aac389d781f unpetrify-ref: mesa-10.3.3 - build-depends: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index d70a39ea..62649723 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,82 +2,45 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph - build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph - build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coveragepy - morph: strata/morph-utils/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner - name: cmdtest morph: strata/morph-utils/cmdtest.morph repo: upstream:cmdtest ref: ac91791842c6e7e6eda3213916af413255999c7b unpetrify-ref: baserock/morph build-depends: - - cliapp - python-ttystatus - python-markdown -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph - build-depends: [] -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph - ref: f5163dd418e342fe6e5fb18625828076130a5e57 + ref: 68395a12c79c22e266b4a06095533e38da6e29d0 unpetrify-ref: master build-depends: - - cliapp - cmdtest - - python-coverage-test-runner - pyfilesystem - - bottle - - flup - pylru diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph deleted file mode 100644 index ed5e3d87..00000000 --- a/strata/morph-utils/python-coveragepy.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-coveragepy -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index f10dd2b3..69f3ccad 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:ogg ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f unpetrify-ref: master - build-depends: [] - name: libvorbis repo: upstream:libvorbis ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index e87c4050..51230de2 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:orc ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a unpetrify-ref: baserock/morph - build-depends: [] - name: gstreamer@0.10 repo: upstream:gstreamer ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 2df8a0ce..f91e5173 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:orc ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 unpetrify-ref: orc-0.4.22 - build-depends: [] - name: gstreamer repo: upstream:gstreamer ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86 diff --git a/strata/network-security.morph b/strata/network-security.morph index 3d0c7814..d88d2f43 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:nspr-hg ref: a6ee84946475c1fb7624973af28163f6da247c0d unpetrify-ref: baserock/morph - build-depends: [] - name: nss morph: strata/network-security/nss.morph repo: upstream:nss diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index 5af03abb..689bec87 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -14,12 +14,10 @@ chunks: repo: upstream:iproute2 ref: 50231ad2a554fcb02462bed6405c970833c1baee unpetrify-ref: v3.17.0 - build-depends: [] - name: libmnl repo: upstream:libmnl ref: c9f19b98cd8e108617e825e071091df14f78c53a unpetrify-ref: master - build-depends: [] - name: ipset morph: strata/networking-utils/ipset.morph repo: upstream:ipset diff --git a/strata/nfs.morph b/strata/nfs.morph index 3dbead9d..0d04812b 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -8,13 +8,11 @@ chunks: repo: upstream:libevent ref: 0b49ae34594533daa82c06a506078de9e336a013 unpetrify-ref: release-2.1.5-beta - build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph repo: upstream:ti-rpc ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f unpetrify-ref: baserock/master - build-depends: [] - name: rpcbind morph: strata/nfs/rpcbind.morph repo: upstream:rpcbind diff --git a/strata/nodejs.morph b/strata/nodejs.morph index f8955a01..58dbdd0b 100644 --- a/strata/nodejs.morph +++ b/strata/nodejs.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:node ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e unpetrify-ref: v0.10.26 - build-depends: [] diff --git a/strata/ntpd.morph b/strata/ntpd.morph index e45e6424..e2ccc84a 100644 --- a/strata/ntpd.morph +++ b/strata/ntpd.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:ntp ref: d4b7cd9723cce9561fa15f74b90b85a3a61b5ef8 unpetrify-ref: ntp-dev-4.2.7p482 - build-depends: [] diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 1b348630..91559113 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -1,103 +1,98 @@ name: openstack-clients kind: stratum -description: A stratum with OpenStack clients, for OpenStack deployments. +description: Stratum with all the OpenStack clients and their dependencies. build-depends: -- morph: strata/python-core.morph -- morph: strata/tools.morph +- morph: strata/openstack-common.morph chunks: -- name: jsonschema - repo: upstream:jsonschema - ref: 292a256b918af1e567982bb801c427cf4ca5b9fe - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-pointer - repo: upstream:python-json-pointer - ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-patch - repo: upstream:python-json-patch - ref: 27c7032de25923593fa17cc14f535fb7abd52448 - unpetrify-ref: baserock/morph - build-depends: [] - name: warlock repo: upstream:warlock - ref: 1a0de8a67df8282c42f71014cc871684e8d7c0cf - unpetrify-ref: baserock/morph - build-depends: - - jsonschema - - python-json-pointer - - python-json-patch -- name: python-prettytable - morph: strata/openstack-clients/python-prettytable.morph - repo: upstream:python-prettytable - ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 - unpetrify-ref: baserock/morph - build-depends: [] -- name: argparse - repo: upstream:argparse - ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1 - unpetrify-ref: baserock/morph - build-depends: [] -- name: pyopenssl - repo: upstream:pyopenssl - ref: 6bbf44a00b35fb28df1f66aa194b2fe95eab1ab2 - unpetrify-ref: baserock/morph - build-depends: [] -- name: pyiso8601 - repo: upstream:pyiso8601 - ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6 - unpetrify-ref: baserock/morph - build-depends: [] -- name: simplejson - repo: upstream:simplejson - ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2 - unpetrify-ref: baserock/morph - build-depends: [] -- name: netaddr - repo: upstream:netaddr - ref: f64ae19e533ffa5522dcba1fc833975cb2ee88a5 - unpetrify-ref: baserock/morph - build-depends: [] -- name: pytz - morph: strata/openstack-clients/pytz.morph - repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph - build-depends: [] -- name: babel - repo: upstream:babel - ref: d764b35bc3910b8f67ff811752df615afa7667f6 - unpetrify-ref: baserock/morph - build-depends: - - pytz + ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 + unpetrify-ref: 1.1.0 - name: python-keystoneclient - repo: upstream:python-keystoneclient - ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b - unpetrify-ref: baserock/morph - build-depends: - - pyiso8601 - - python-prettytable - - simplejson - - netaddr - - babel + repo: upstream:openstack/python-keystoneclient + ref: 79d1eec35aad874a7c08ff22c39260884a5524ba + unpetrify-ref: 0.11.1 - name: python-glanceclient - repo: upstream:python-glanceclient - ref: 721660612df4454726b723daf902abd23ba0109c - unpetrify-ref: baserock/morph + repo: upstream:openstack/python-glanceclient + ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b + unpetrify-ref: 0.14.1 build-depends: - - python-prettytable - - argparse - - pyopenssl - python-keystoneclient - warlock - name: python-novaclient - repo: upstream:python-novaclient - ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6 - unpetrify-ref: baserock/morph + repo: upstream:openstack/python-novaclient + ref: 5ecfdac6b34769e200ff5c4c7429c20518c5b24f + unpetrify-ref: 2.20.0 + build-depends: + - python-keystoneclient +- name: python-swiftclient + repo: upstream:openstack/python-swiftclient + ref: bb4d2ab59c4de9389667eeed255642f51e276f1e + unpetrify-ref: 2.3.1 +- name: python-troveclient + repo: upstream:openstack/python-troveclient + ref: e010a919750f07493afd42a4db867853b925bcbf + unpetrify-ref: 1.0.7 +- name: python-cinderclient + repo: upstream:openstack/python-cinderclient + ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab + unpetrify-ref: 1.1.1 + build-depends: + - python-keystoneclient +- name: pyparsing + morph: strata/openstack-clients/pyparsing.morph + repo: upstream:python-packages/pyparsing.git + ref: 8062c76ab3958a570052124f17e71f3dd3ec2257 + unpetrify-ref: pyparsing_2.0.3 +- name: cmd2 + repo: upstream:python-packages/cmd2.git + ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a + unpetrify-ref: master + build-depends: + - pyparsing +- name: cliff + repo: upstream:openstack/cliff + ref: 42675b2d7ad93f4bba9c4216874c68b8e5834147 + unpetrify-ref: 1.7.0 + build-depends: + - cmd2 + - pyparsing +- name: python-neutronclient + repo: upstream:openstack/python-neutronclient + ref: fa5642f1550bc8f818c1686c40edbaf3672d356a + unpetrify-ref: 2.3.9 + build-depends: + - cliff + - python-keystoneclient +- name: python-ceilometerclient + repo: upstream:openstack/python-ceilometerclient + ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1 + unpetrify-ref: 1.0.12 + build-depends: + - python-keystoneclient +- name: python-heatclient + repo: upstream:openstack/python-heatclient + ref: 6089d31e302d80910cc15132f99a1bf358bbb64f + unpetrify-ref: 0.2.12 + build-depends: + - python-keystoneclient +- name: python-designateclient + repo: upstream:openstack/python-designateclient + ref: a900b41e4d8a9eb40e1812295ba16d773e2b9618 + unpetrify-ref: 1.1.0 build-depends: - - python-prettytable - - argparse - - pyiso8601 - - simplejson - - babel + - cliff + - python-keystoneclient +- name: python-barbicanclient + repo: upstream:openstack/python-barbicanclient.git + ref: ac30643631b6bc1c40116061f8eb280a7881e422 + unpetrify-ref: 2.2.1 + build-depends: + - python-keystoneclient + - cliff +- name: python-saharaclient + repo: upstream:openstack/python-saharaclient + ref: eadb40ccb62566f02cb93ec03aa232e48835dec3 + unpetrify-ref: 0.7.6 + build-depends: + - python-keystoneclient diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pyparsing.morph index f5557946..60088544 100644 --- a/strata/openstack-clients/pytz.morph +++ b/strata/openstack-clients/pyparsing.morph @@ -1,4 +1,4 @@ -name: pytz +name: pyparsing kind: chunk build-commands: - cd src && python setup.py build diff --git a/strata/openstack-clients/python-prettytable.morph b/strata/openstack-clients/python-prettytable.morph deleted file mode 100644 index cf1ac6e1..00000000 --- a/strata/openstack-clients/python-prettytable.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-prettytable -kind: chunk -build-commands: -- cd src && python setup.py build -install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph new file mode 100644 index 00000000..f59f6705 --- /dev/null +++ b/strata/openstack-common.morph @@ -0,0 +1,98 @@ +name: openstack-common +kind: stratum +description: | + Stratum with the python packages needed to compile openstack + clients and services. +build-depends: +- morph: strata/python-common.morph +- morph: strata/foundation.morph +chunks: +- name: pycparser + repo: upstream:python-packages/pycparser + ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 + unpetrify-ref: master +- name: cffi + repo: upstream:python-packages/cffi + ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 + unpretrify-ref: master + build-depends: + - pycparser +- name: pytz + repo: upstream:pytz-tarball + ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c + unpetrify-ref: pytz-2014.10 +- name: babel + repo: upstream:babel + ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c + unpetrify-ref: master + build-depends: + - pytz +- name: enum34 + repo: upstream:python-packages/enum34.git + ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55 + unpetrify-ref: enum34-1.0 +- name: pyasn1 + repo: upstream:python-packages/pyasn1 + ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f + unpetrify-ref: release_0_1_7_tag +- name: cryptography + repo: upstream:python-packages/cryptography + ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f + unpetrify-ref: 0.7.2 + build-depends: + - pyasn1 + - enum34 + - cffi +- name: pyiso8601 + repo: upstream:pyiso8601 + ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab + unpetrify-ref: 0.1.10 +- name: netaddr + repo: upstream:netaddr + ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b + unpetrify-ref: release-0.7.12 +- name: stevedore + ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2 + unpetrify-ref: 1.0.0.0a2 + repo: upstream:openstack/stevedore +- name: oslo-config + repo: upstream:openstack/oslo-config + ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 + unpetrify-ref: 1.4.0.0a5 + build-depends: + - netaddr + - stevedore +- name: pyopenssl + repo: upstream:python-packages/pyopenssl + ref: 0146d447e63a737b4f05a1164d5950eff68543e7 + unpetrify-ref: 0.14 +- name: oslo-i18n + repo: upstream:openstack/oslo-i18n + ref: 040f1d6afa733527385d2309e485bf37e9843b0e + unpetrify-ref: 0.4.0 + build-depends: + - babel +- name: oslo-utils + repo: upstream:openstack/oslo-utils + ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41 + unpetrify-ref: 0.3.0 + build-depends: + - babel + - pyiso8601 + - oslo-i18n +- name: futures + repo: upstream:python-packages/futures + ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597 + unpetrify-ref: 2.2.0 +- name: oslo-serialization + repo: upstream:openstack/oslo-serialization.git + ref: 80fec894a54253d9b4c80dd8a563957966ca0b88 + unpetrify-ref: 0.3.0 +- name: jsonschema + repo: upstream:jsonschema + ref: 35b60f390098d3306c03eee27ceec8cf8a493579 + unpetrify-ref: v2.3.0 +- name: simplejson + repo: upstream:simplejson + ref: 54d5ff15d508c51366986cc4f77f2f287f036582 + unpetrify-ref: v3.6.4 diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph index bcc03c86..60e6d6cd 100644 --- a/strata/patch-manager-gerrit.morph +++ b/strata/patch-manager-gerrit.morph @@ -8,4 +8,3 @@ chunks: repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph index 44d0bab2..8d0c2489 100644 --- a/strata/pcre-utils.morph +++ b/strata/pcre-utils.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:pcre ref: 2720152c58e13e7cc7403642ec33127101b9971b unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph new file mode 100644 index 00000000..ff6fda3e --- /dev/null +++ b/strata/python-cliapp.morph @@ -0,0 +1,24 @@ +name: python-cliapp +kind: stratum +description: | + Cliapp command line application framework. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: python-coveragepy + morph: strata/morph-utils/python-coveragepy.morph + repo: upstream:python-coveragepy + ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 + unpetrify-ref: baserock/morph +- name: python-coverage-test-runner + repo: upstream:python-coverage-test-runner + ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 + unpetrify-ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp + repo: upstream:cliapp + ref: cec20cedd062a3aef1b04f997e77b45090c07806 + unpetrify-ref: baserock/morph + build-depends: + - python-coverage-test-runner diff --git a/strata/cross-bootstrap/python-coveragepy.morph b/strata/python-cliapp/python-coveragepy.morph index ed5e3d87..ed5e3d87 100644 --- a/strata/cross-bootstrap/python-coveragepy.morph +++ b/strata/python-cliapp/python-coveragepy.morph diff --git a/strata/python-common.morph b/strata/python-common.morph new file mode 100644 index 00000000..5879febd --- /dev/null +++ b/strata/python-common.morph @@ -0,0 +1,46 @@ +name: python-common +kind: stratum +description: Common dependencies of some python chunks +build-depends: +- morph: strata/python-core.morph +chunks: +- name: pycrypto + morph: strata/python-common/pycrypto.morph + repo: upstream:python-packages/pycrypto + ref: af058ee6f5da391a05275470ab4a4a96aa22b350 + unpetrify-ref: v2.7a1 +- name: ecdsa + repo: upstream:python-packages/ecdsa + ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c + unpetrify-ref: python-ecdsa-0.11 +- name: paramiko + repo: upstream:paramiko + ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22 + unpetrify-ref: v1.15.2 + build-depends: + - pycrypto + - ecdsa +- name: markupsafe + repo: upstream:markupsafe + ref: feb1d70c16df62f60dcb521d127fdad8819fc036 + unpetrify-ref: 0.23 +- name: jinja2 + repo: upstream:jinja2 + ref: 762c612e7276889aac265645da00e62e33d1573c + unpetrify-ref: 2.7.3 + build-depends: + - markupsafe +- name: python-json-pointer + repo: upstream:python-json-pointer + ref: 34073e561261cb413b9bdff5beac31b070d98ea2 + unpetrify-ref: v1.4 +- name: python-json-patch + repo: upstream:python-json-patch + ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3 + unpetrify-ref: v1.8 + build-depends: + - python-json-pointer +- name: python-prettytable + repo: upstream:python-prettytable + ref: 7a48f1e84049577370cf28632a75d2fd01e4142d + unpetrify-ref: master diff --git a/strata/python-common/pycrypto.morph b/strata/python-common/pycrypto.morph new file mode 100644 index 00000000..51cc00f0 --- /dev/null +++ b/strata/python-common/pycrypto.morph @@ -0,0 +1,3 @@ +name: pycrypto +kind: chunk +build-system: python-distutils diff --git a/strata/python-core.morph b/strata/python-core.morph index 2daf78b0..342e8c68 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master - build-depends: [] - name: pip repo: upstream:pip ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 @@ -26,12 +25,10 @@ chunks: repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 - build-depends: [] - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 - build-depends: [] - name: pyyaml morph: strata/python-core/pyyaml.morph repo: upstream:pyyaml diff --git a/strata/python-tools.morph b/strata/python-tools.morph index d1ce912d..0acc1c0c 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:python-packages/virtualenv ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c unpetrify-ref: 12.0.5 - build-depends: [] diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph new file mode 100644 index 00000000..289d27ba --- /dev/null +++ b/strata/python-wsgi.morph @@ -0,0 +1,15 @@ +name: python-wsgi +kind: stratum +description: | + Python modules for web applications using Web Server Gateway Interface. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: bottle + repo: upstream:bottle + ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f + unpetrify-ref: baserock/morph +- name: flup + repo: upstream:flup + ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 + unpetrify-ref: baserock/morph diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 2dc41438..192e9201 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:cpython ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c unpetrify-ref: v3.4.2 - build-depends: [] diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index b260c9d9..0533ea58 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 - build-depends: [] diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 18d2cc5f..698dc5ce 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -11,13 +11,11 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: ruby-1.9 morph: strata/qt4-tools/ruby-1.9.morph repo: upstream:ruby diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 066f62a0..d4c76ee8 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt-creator ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 unpetrify-ref: baserock/3.3.0 - build-depends: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index df36ccad..92bfcde9 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt5/qtmultimedia ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f unpetrify-ref: v5.3.2 - build-depends: [] diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 4441e46b..e5338d7a 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:qt5/qtwebkit ref: 13f80d34ae84c3231118c8013beee55badab8929 unpetrify-ref: v5.3.2 - build-depends: [] - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 34e57bc4..dbda3a2e 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase diff --git a/strata/ruby.morph b/strata/ruby.morph index c5bd9993..eba231be 100644 --- a/strata/ruby.morph +++ b/strata/ruby.morph @@ -15,12 +15,10 @@ chunks: repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: libyaml repo: upstream:libyaml-hg ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e unpetrify-ref: master - build-depends: [] - name: ruby morph: strata/ruby/ruby.morph repo: upstream:ruby diff --git a/strata/tools.morph b/strata/tools.morph index 9dcc2c7b..2bbf7bfa 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -9,46 +9,33 @@ chunks: repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph - build-depends: [] - name: file repo: upstream:file ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 unpetrify-ref: file-5.22 - build-depends: [] - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch - build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph - build-depends: [] -- name: rsync - morph: strata/tools/rsync.morph - repo: upstream:rsync - ref: 7cb0de6326c915a72253fd103dae93308031ec3f - unpetrify-ref: v3.1.1 - build-depends: [] - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 unpetrify-ref: v4.8 - build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap - build-depends: [] - name: vala repo: upstream:vala ref: 682eba5880fbd76402dec10118883da913a7b255 @@ -60,29 +47,24 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools ref: f4d1d2ad474e882df13418239aa3050673a844d7 unpetrify-ref: baserock/morph - build-depends: [] - name: device-tree-compiler morph: strata/tools/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: sudo repo: upstream:sudo ref: a4769dc7999b53260325fb89945bef85714fb338 unpetrify-ref: baserock/morph - build-depends: [] - name: procps-ng repo: upstream:procps-ng ref: 85fff468fa263cdd2ff1c0144579527c32333695 unpetrify-ref: v3.3.9 - build-depends: [] prefix: / - name: ipmitool morph: strata/tools/ipmitool.morph diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph deleted file mode 100644 index 9a92878d..00000000 --- a/strata/tools/rsync.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: rsync -kind: chunk -build-system: autotools -build-commands: -- make proto -- make diff --git a/strata/trove.morph b/strata/trove.morph index 665f7d9a..40588c05 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: lace morph: strata/trove/lace.morph repo: upstream:gitano/lace @@ -69,13 +68,11 @@ chunks: repo: upstream:cgit ref: acbf4a15e260c711094455dbef7c024f2553fd32 unpetrify-ref: baserock/morph - build-depends: [] - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master - build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph index 7ac14158..fadcec92 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph @@ -13,7 +13,6 @@ chunks: repo: upstream:yasm ref: fefefe262eb29081f0bcb4d48f2d476ce5730562 unpetrify-ref: baserock/morph - build-depends: [] - name: vboxguest morph: strata/virtualbox-guest-x86_64/vboxguest.morph repo: upstream:VirtualBox diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 881b53de..84eefdaf 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -14,30 +14,25 @@ chunks: repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph - build-depends: [] - name: xml-catalog morph: strata/virtualization/xml-catalog.morph repo: baserock:baserock/xml-catalog ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b unpetrify-ref: master - build-depends: [] - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954 unpetrify-ref: baserock/morph - build-depends: [] - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 - build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros ref: c98b41de5596c675c603ef43ae9570133f1a9921 unpetrify-ref: baserock/morph - build-depends: [] - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -49,7 +44,6 @@ chunks: repo: upstream:dmidecode ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 unpetrify-ref: master - build-depends: [] - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt @@ -66,7 +60,6 @@ chunks: repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e unpetrify-ref: baserock/morph - build-depends: [] - name: urlgrabber repo: upstream:urlgrabber ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04 @@ -77,7 +70,6 @@ chunks: repo: upstream:cython ref: 005d38d5921a603d5f4d413aae72f98a6d33192f unpetrify-ref: master - build-depends: [] - name: python-lxml repo: upstream:python-lxml ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92 @@ -96,7 +88,6 @@ chunks: repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph repo: upstream:pygobject @@ -129,12 +120,10 @@ chunks: - name: ebtables morph: strata/virtualization/ebtables.morph repo: upstream:ebtables - ref: 09792f0107a9318da809908db31f0b826017de7b + ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 unpetrify-ref: master - build-depends: [] - name: openvswitch morph: strata/virtualization/openvswitch.morph repo: upstream:openvswitch ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f unpretrify-ref: master - build-depends: [] diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph index 8be1b4f2..a4d9fc76 100644 --- a/strata/virtualization/ebtables.morph +++ b/strata/virtualization/ebtables.morph @@ -4,4 +4,4 @@ build-system: manual build-commands: - make install-commands: -- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin +- make install DESTDIR="$DESTDIR" BINDIR="$PREFIX/sbin" diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 58eefbbd..f65fa63e 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 unpetrify-ref: xkbcommon-0.5.0 - build-depends: [] - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland diff --git a/strata/webtools.morph b/strata/webtools.morph index 39175747..68ce80d5 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -10,21 +10,17 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb unpetrify-ref: master - build-depends: [] - name: tar morph: strata/webtools/tar.morph repo: upstream:tar ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 - build-depends: [] diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 13106ea5..2925d72c 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -12,4 +12,3 @@ chunks: repo: upstream:weston ref: 322383ed469d69401b502618718a97a4e85c97d8 unpetrify-ref: baserock/weston-1.7.0/tegra - build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ce403b6b..ea619821 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index 8191b30f..9836961f 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -7,125 +7,100 @@ chunks: repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-damageproto repo: upstream:xorg-proto-damageproto ref: 015b980e5091492dbe681af59569768ba89fbfe0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dmxproto repo: upstream:xorg-proto-dmxproto ref: 395f6fcc0a5635907b5e45829e86b29431316184 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fixesproto repo: upstream:xorg-proto-fixesproto ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fontsproto repo: upstream:xorg-proto-fontsproto ref: df8c05f7c0253a36589d96efa52938215eff9d4d unpetrify-ref: fontsproto-2.1.3 - build-depends: [] - name: xorg-proto-glproto repo: upstream:xorg-proto-glproto ref: f84853d97d5749308992412a215fa518b6536eb3 unpetrify-ref: glproto-1.4.17 - build-depends: [] - name: xorg-proto-inputproto repo: upstream:xorg-proto-inputproto ref: 343ff0938f592876b9d82c966f166bf45a78c3c8 unpetrify-ref: inputproto-2.3.1 - build-depends: [] - name: xorg-proto-kbproto repo: upstream:xorg-proto-kbproto ref: f7022f5775350dce3348b7151845a32390e98791 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xineramaproto repo: upstream:xorg-proto-xineramaproto ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-randrproto repo: upstream:xorg-proto-randrproto ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-recordproto repo: upstream:xorg-proto-recordproto ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-renderproto repo: upstream:xorg-proto-renderproto ref: 935f5ec95a3718c184ff685f5b79b467483b7844 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-resourceproto repo: upstream:xorg-proto-resourceproto ref: ada91f54c98b5a61d3e116fca6bf239a8604730f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-scrnsaverproto repo: upstream:xorg-proto-scrnsaverproto ref: 614532026e8ec7496216316fb584d6f2af6a7f7b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-videoproto repo: upstream:xorg-proto-videoproto ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xcmiscproto repo: upstream:xorg-proto-xcmiscproto ref: 83549077a3c2140b9862709004cd873f1c55e395 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xextproto repo: upstream:xorg-proto-xextproto ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 unpetrify-ref: xextproto-7.3.0 - build-depends: [] - name: xorg-proto-xf86bigfontproto repo: upstream:xorg-proto-xf86bigfontproto ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155 unpetrify-ref: xproto-7.0.26 - build-depends: [] - name: xorg-proto-dri2proto repo: upstream:xorg-proto-dri2proto ref: ead89ad84877551cc15d26b95cb19a3e205df71f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dri3proto repo: upstream:xorg-proto-dri3proto ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 - build-depends: [] - name: xorg-proto-presentproto repo: upstream:xorg-proto-presentproto ref: ef84007fc4a23d3897b4776906139de9d0698c2a - build-depends: [] - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 unpetrify-ref: "1.11" - build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 @@ -148,7 +123,6 @@ chunks: repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 unpetrify-ref: xtrans-1.3.5 - build-depends: [] - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 ref: cb107760df33ffc8630677e66e2e50aa37950a5c diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 644d47c2..665d4c5f 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -11,17 +11,14 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile ref: 7381c2f9013ef7784c78091fa671e652a62ca706 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-font-util repo: upstream:xorg-font-util ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 @@ -54,18 +51,15 @@ chunks: repo: upstream:xcb-util ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-wm repo: upstream:util-wm ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-keysyms morph: strata/x-generic/util-keysyms.morph repo: upstream:util-keysyms ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab unpetrify-ref: baserock/morph - build-depends: [] - name: util-image repo: upstream:util-image ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 diff --git a/strata/xfce.morph b/strata/xfce.morph index 5678c1fc..295abfe1 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libcroco ref: 611f624a6e15065792b41eb5ce14811293f3fb0a unpetrify-ref: baserock/morph - build-depends: [] - name: librsvg morph: strata/xfce/librsvg.morph repo: upstream:librsvg ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb unpetrify-ref: baserock/morph - build-depends: [] - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools ref: 9244250ac0c15ba160688758c5dccf97f3f160ef unpetrify-ref: baserock/morph - build-depends: [] - name: libxfce4util morph: strata/xfce/libxfce4util.morph repo: upstream:xfce/libxfce4util @@ -56,7 +53,6 @@ chunks: repo: upstream:libwww-perl/uri ref: 3dd72ded7f043a4f6973781fe594722e2e95f491 unpetrify-ref: baserock/morph - build-depends: [] - name: exo morph: strata/xfce/exo.morph repo: upstream:xfce/exo @@ -71,7 +67,6 @@ chunks: repo: upstream:libwnck ref: 6792abcdf27aceba1012406d51606e84b065a526 unpetrify-ref: baserock/xfce-build - build-depends: [] - name: xfce4-panel morph: strata/xfce/xfce4-panel.morph repo: upstream:xfce/xfce4-panel @@ -107,7 +102,6 @@ chunks: repo: upstream:iceauth ref: c07d443d43e53cfe21b53a9a0eafcd6189432867 unpetrify-ref: baserock/morph - build-depends: [] - name: xfce4-session morph: strata/xfce/xfce4-session.morph repo: upstream:xfce/xfce4-session @@ -168,4 +162,3 @@ chunks: repo: upstream:elementary-xfce ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph index b8e67888..909c9420 100644 --- a/strata/xorg-util-macros-common.morph +++ b/strata/xorg-util-macros-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 unpetrify-ref: util-macros-1.19.0 - build-depends: [] - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 7b40ee60..bf21a296 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -16,124 +16,99 @@ chunks: repo: upstream:xstatic ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 unpetrify-ref: 1.0.1 - build-depends: [] - name: xstatic-angular repo: upstream:xstatic-packages/xstatic-angular ref: dac047df05da5bb20de4e78876bc03820d0c6671 unpetrify-ref: 1.3.7.0 - build-depends: [] - name: xstatic-angular-animate repo: upstream:xstatic-packages/xstatic-angular-animate ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-bootstrap repo: upstream:xstatic-packages/xstatic-angular-bootstrap ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-cookies repo: upstream:xstatic-packages/xstatic-angular-cookies ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-fileupload repo: upstream:xstatic-packages/xstatic-angular-fileupload ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae unpetrify-ref: master - build-depends: [] - name: xstatic-angular-mock repo: upstream:xstatic-packages/xstatic-angular-mock ref: 20fdada109b167bcdcacec22986b43fdb42866f3 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-sanitize repo: upstream:xstatic-packages/xstatic-angular-sanitize ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-smart-table repo: upstream:xstatic-packages/xstatic-angular-smart-table ref: e0fbf69fb156b995547471d71c5c6a7f88989d47 unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-datepicker repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-scss repo: upstream:xstatic-packages/xstatic-bootstrap-scss ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e unpetrify-ref: master - build-depends: [] - name: xstatic-d3 repo: upstream:xstatic-packages/xstatic-d3 ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf unpetrify-ref: master - build-depends: [] - name: xstatic-hogan repo: upstream:xstatic-packages/xstatic-hogan ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 unpetrify-ref: master - build-depends: [] - name: xstatic-font-awesome repo: upstream:xstatic-packages/xstatic-font-awesome ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 unpetrify-ref: 4.2.0.0 - build-depends: [] - name: xstatic-jasmine repo: upstream:xstatic-packages/xstatic-jasmine ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 unpetrify-ref: 2.1.2.0 - build-depends: [] - name: xstatic-jquery repo: upstream:xstatic-packages/xstatic-jquery ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-bootstrap-wizard repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-migrate repo: upstream:xstatic-packages/xstatic-jquery-migrate ref: 989b3b31106727542dd83810c3b952f90d8cdb8f unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-quicksearch repo: upstream:xstatic-packages/xstatic-jquery-quicksearch ref: f5221c8c30507340846d97d6db41a782e7c63316 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-tablesorter repo: upstream:xstatic-packages/xstatic-jquery-tablesorter ref: eb78328391f44a9a88033e1aede1a605902c5551 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-ui repo: upstream:xstatic-packages/xstatic-jquery-ui ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 unpetrify-ref: 1.11.0.1 - build-depends: [] - name: xstatic-jsencrypt repo: upstream:xstatic-packages/xstatic-jsencrypt ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 unpetrify-ref: master - build-depends: [] - name: xstatic-qunit repo: upstream:xstatic-packages/xstatic-qunit ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f unpetrify-ref: master - build-depends: [] - name: xstatic-rickshaw repo: upstream:xstatic-packages/xstatic-rickshaw ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 unpetrify-ref: master - build-depends: [] - name: xstatic-spin repo: upstream:xstatic-packages/xstatic-spin ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f unpetrify-ref: master - build-depends: [] diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index d4502ea1..83ce2e05 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -14,4 +14,3 @@ chunks: morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 6ad4269e..97acd2ca 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -8,4 +8,3 @@ chunks: morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index 3bcd5cca..6328d327 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -8,13 +8,11 @@ chunks: - name: cppunit repo: upstream:cppunit ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf - build-depends: [] - name: java-binary morph: strata/zookeeper/java-binary.morph repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] - name: java-ant morph: strata/zookeeper/java-ant.morph repo: upstream:java/ant diff --git a/strip-gplv3.configure b/strip-gplv3.configure index 75143d08..c08061ad 100755 --- a/strip-gplv3.configure +++ b/strip-gplv3.configure @@ -47,6 +47,7 @@ class StripGPLv3ConfigureExtension(cliapp.Application): ['make', ''], ['nano', ''], ['patch', ''], + ['rsync', ''], ['texinfo-tarball', ''], ] diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index cf37f5e6..b9ee8e79 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -15,14 +15,22 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 846681a2..6c59cb28 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -15,14 +15,22 @@ strata: morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 15b0a52c..63dcb432 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -12,18 +12,28 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-armv8l64-generic morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools @@ -37,3 +47,4 @@ configuration-extensions: - fstab - mason - cloud-init +- moonshot-kernel diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 8be51f90..600eb683 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -15,14 +15,22 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index f74ce07d..61bf4eaf 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -13,14 +13,22 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 5bbe38f8..f485287e 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -15,14 +15,22 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 1ca20c00..e8cd7b87 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -13,14 +13,22 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 2bf25493..b9433409 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -15,14 +15,22 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index b03d1653..95b17dc0 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -22,8 +22,14 @@ strata: morph: strata/ruby.morph - name: ntpd morph: strata/ntpd.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -38,6 +44,8 @@ strata: morph: strata/nfs.morph - name: python-core morph: strata/python-core.morph +- name: python-common + morph: strata/python-common.morph - name: chef morph: strata/chef.morph configuration-extensions: diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph index 4eecf7fe..f0a2780b 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -7,5 +7,9 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: morph-utils + morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph index 30094e74..2bf192d3 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -7,5 +7,9 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: morph-utils + morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph index 8b274e80..9d736f94 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -7,5 +7,9 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: morph-utils + morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph index bdd42cf3..ac919d66 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -7,5 +7,9 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: morph-utils + morph: strata/morph-utils.morph - name: cross-bootstrap morph: strata/cross-bootstrap.morph diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index de474c87..e32db851 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -15,8 +15,14 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -31,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 2cce69d3..9ae051d1 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients @@ -34,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 38806421..12a2b2b6 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7-versatile.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients @@ -34,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 c47be836..ec6fea5e 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients @@ -34,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 64d75350..2023ac21 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients @@ -25,8 +29,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 3a84d178..2c7f8ed2 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-armv7b-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: baserock-import @@ -28,8 +34,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 2e4b83bd..1e2a8f8e 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -15,8 +15,14 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -31,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 17f8bcbb..3ef00c34 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -17,8 +17,14 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -35,8 +41,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 c09caf96..dfc28c45 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -15,8 +15,14 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nfs @@ -35,8 +41,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 ffa9edd4..631692e7 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -17,8 +17,14 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -35,8 +41,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 27080535..bad6d6a9 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -30,10 +36,16 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files @@ -41,3 +53,4 @@ configuration-extensions: - nfsboot - install-files - cloud-init +- moonshot-kernel diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 9e575d5d..1ec03145 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -15,8 +15,14 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: ruby @@ -29,8 +35,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 d92da0fd..bfbf3fbb 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: ruby @@ -32,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 3578c221..e83b1a55 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients @@ -33,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 b53d6d93..c707125c 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -36,8 +42,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 aa8d6a1c..00e72c84 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -15,8 +15,14 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: bsp-x86_both-tools @@ -33,8 +39,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 c071b3ea..e0bb1a21 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -36,8 +42,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.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 c104b29b..fc40e1f5 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: virtualbox-guest-x86_64 @@ -34,8 +40,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 50581561..512248e2 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -33,6 +33,8 @@ strata: morph: strata/input-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 16bed197..ee089536 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -31,6 +31,8 @@ strata: morph: strata/graphics-common.morph - name: input-common morph: strata/input-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f4828688..d50068e9 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -35,6 +35,8 @@ strata: morph: strata/llvm-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 979b73b0..8f89ec74 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -31,10 +31,16 @@ strata: morph: strata/tools.morph - name: lvm morph: strata/lvm.morph +- name: python-core + morph: strata/python-core.morph - name: virtualization morph: strata/virtualization.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: python-common + morph: strata/python-common.morph - name: databases morph: strata/databases.morph - name: pcre-utils diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 8798182b..cea09c09 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -13,6 +13,10 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 82ea8db0..ab50f7f6 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,6 +15,10 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: pcre-utils @@ -29,6 +33,8 @@ strata: morph: strata/lighttpd-server.morph - name: nfs morph: strata/nfs.morph +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph - name: cloudinit-support diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 5aea4f7b..dad3d3dc 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -33,6 +33,10 @@ strata: morph: strata/gtk2.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: xfce |