summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/ansible.morph25
-rw-r--r--strata/ansible/ansible.morph6
-rw-r--r--strata/apache-httpd-server.morph1
-rw-r--r--strata/chef.morph4
-rw-r--r--strata/chef/libpopt.morph (renamed from strata/core/libpopt.morph)6
-rw-r--r--strata/chef/sgdisk.morph (renamed from strata/core/sgdisk.morph)0
-rw-r--r--strata/cloudinit-support.morph2
-rw-r--r--strata/core.morph14
-rw-r--r--strata/core/bison.morph11
-rw-r--r--strata/core/help2man.morph9
-rw-r--r--strata/core/patch.morph10
-rw-r--r--strata/coreutils-common/coreutils.morph2
-rw-r--r--strata/databases.morph1
-rw-r--r--strata/databases/memcached.morph13
-rw-r--r--strata/foundation/e2fsprogs.morph5
-rw-r--r--strata/morph-utils.morph2
-rw-r--r--strata/multimedia-gstreamer.morph4
-rw-r--r--strata/python-common.morph35
-rw-r--r--strata/tools/rsync.morph3
-rw-r--r--strata/xstatic.morph1
-rw-r--r--systems/build-system-armv7lhf-highbank.morph2
-rw-r--r--systems/build-system-armv7lhf-jetson.morph2
-rw-r--r--systems/build-system-armv8l64.morph2
-rw-r--r--systems/build-system-ppc64.morph2
-rw-r--r--systems/build-system-x86_32-chroot.morph2
-rw-r--r--systems/build-system-x86_32.morph2
-rw-r--r--systems/build-system-x86_64-chroot.morph2
-rw-r--r--systems/build-system-x86_64.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
29 files changed, 102 insertions, 70 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph
index e0cb8581..5903017a 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -3,28 +3,11 @@ kind: stratum
description: A stratum with ansible and its dependencies
build-depends:
- morph: strata/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
+ build-depends: []
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 1692c61c..065ec155 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -4,6 +4,7 @@ description: apache http web server and some utilities related to it
build-depends:
- morph: strata/tools.morph
- morph: strata/pcre-utils.morph
+- morph: strata/python-core.morph
chunks:
- name: apr
morph: strata/apache-httpd-server/apr.morph
diff --git a/strata/chef.morph b/strata/chef.morph
index cd969cda..9105a2e0 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -202,13 +202,13 @@ chunks:
unpetrify-ref: 1.0.0
build-depends: []
- name: libpopt
- morph: strata/core/libpopt.morph
+ morph: strata/chef/libpopt.morph
repo: upstream:libpopt
ref: c224abf28f4ff9bbf292908324359cb5905addf8
unpetrify-ref: master
build-depends: []
- name: sgdisk
- morph: strata/core/sgdisk.morph
+ morph: strata/chef/sgdisk.morph
repo: upstream:sgdisk
ref: a920398fa393f9d6301b32b191bc01e086ab8bc8
unpetrify-ref: master
diff --git a/strata/core/libpopt.morph b/strata/chef/libpopt.morph
index ae27432c..6adde30c 100644
--- a/strata/core/libpopt.morph
+++ b/strata/chef/libpopt.morph
@@ -1,10 +1,6 @@
name: libpopt
kind: chunk
+build-system: autotools
configure-commands:
- autoreconf -if
- ./configure
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-
diff --git a/strata/core/sgdisk.morph b/strata/chef/sgdisk.morph
index e792f9d9..e792f9d9 100644
--- a/strata/core/sgdisk.morph
+++ b/strata/chef/sgdisk.morph
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 14786dde..535beef6 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -3,7 +3,7 @@ kind: stratum
description: A stratum with cloudinit to fit a system in the OpenStack cloud.
build-depends:
- morph: strata/build-essential.morph
-- morph: strata/core.morph
+- morph: strata/python-core.morph
- morph: strata/foundation.morph
chunks:
- name: configobj
diff --git a/strata/core.morph b/strata/core.morph
index a5ec5204..5de96bd4 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -121,16 +121,13 @@ chunks:
repo: upstream:libtool-tarball
ref: c026ca36e37d2643623a75d0d3e9e451023139f3
unpetrify-ref: libtool-2.4.6
- build-depends:
- - bash
+ build-depends: []
- name: gtk-doc-stub
repo: upstream:gtk-doc-stub
ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
unpetrify-ref: baserock/morph
build-depends:
- - autoconf-tarball
- - automake
- - libtool-tarball
+ - bash
- name: xz
repo: upstream:xz
ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
@@ -197,10 +194,9 @@ chunks:
- libexpat
- openssl-new
- name: help2man
- morph: strata/core/help2man.morph
repo: upstream:help2man
- ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
- unpetrify-ref: baserock/morph
+ ref: 83bab7e2e8e24a380266a9a247c029c49b0de666
+ unpetrify-ref: baserock/v1.46.5
build-depends:
- autoconf-tarball
- automake
@@ -212,7 +208,6 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - bash
- flex
- gettext-tarball
- git
@@ -287,5 +282,4 @@ chunks:
ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
unpetrify-ref: baserock/v2.7.1
build-depends:
- - bash
- shadow
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index a9497d4e..5f50fe89 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -1,10 +1,5 @@
name: bison
kind: chunk
-configure-commands:
-- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
-- bash bootstrap --skip-po
-- ./configure --prefix=/usr --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph
deleted file mode 100644
index e25a8d8e..00000000
--- a/strata/core/help2man.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: help2man
-kind: chunk
-configure-commands:
-- autoreconf -i
-- ./configure --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 01d977c4..b7f146ef 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -1,9 +1,5 @@
name: patch
kind: chunk
-configure-commands:
-- bash bootstrap --skip-po
-- ./configure --prefix="$PREFIX" --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index cc1ae683..19542d79 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -3,7 +3,7 @@ kind: chunk
build-system: autotools
configure-commands:
- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- bash bootstrap --skip-po
+- bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
build-commands:
- make WERROR_CFLAGS=
diff --git a/strata/databases.morph b/strata/databases.morph
index 4b06edf3..9171925c 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -4,6 +4,7 @@ description: some popular databases and some utils related to databases
build-depends:
- morph: strata/tools.morph
- morph: strata/nfs.morph
+- morph: strata/python-core.morph
chunks:
- name: postgresql
repo: upstream:postgresql
diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph
index 28e01362..5d55b727 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"/etc/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/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/morph-utils.morph b/strata/morph-utils.morph
index aecf2a1d..f8db539b 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
build-depends: []
- name: morph
repo: baserock:baserock/morph
- ref: 74f60a7ed286dd88e24539d46b9a86147a8e78b5
+ ref: bc3e042560424b433a408f01725f36cc2d47859c
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index cee7df71..2df8a0ce 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -13,8 +13,8 @@ chunks:
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558
- unpetrify-ref: baserock/1.4
+ ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86
+ unpetrify-ref: baserock/1.4.4+bison_fix
build-depends:
- orc
- name: gstreamer-plugins-base
diff --git a/strata/python-common.morph b/strata/python-common.morph
new file mode 100644
index 00000000..5536e13c
--- /dev/null
+++ b/strata/python-common.morph
@@ -0,0 +1,35 @@
+name: python-common
+kind: stratum
+description: Common dependencies of some python chunks
+build-depends:
+- morph: strata/python-core.morph
+chunks:
+- name: pycrypto
+ morph: strata/openstack-services/pycrypto.morph
+ repo: upstream:python-packages/pycrypto
+ ref: af058ee6f5da391a05275470ab4a4a96aa22b350
+ unpetrify-ref: v2.7a1
+ build-depends: []
+- name: ecdsa
+ repo: upstream:python-packages/ecdsa
+ ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c
+ unpetrify-ref: python-ecdsa-0.11
+ build-depends: []
+- 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
+ build-depends: []
+- name: jinja2
+ repo: upstream:jinja2
+ ref: 762c612e7276889aac265645da00e62e33d1573c
+ unpetrify-ref: 2.7.3
+ build-depends:
+ - markupsafe
diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph
index 9a92878d..7b99bdd9 100644
--- a/strata/tools/rsync.morph
+++ b/strata/tools/rsync.morph
@@ -4,3 +4,6 @@ build-system: autotools
build-commands:
- make proto
- make
+install-commands:
+- make install
+- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR"/etc/systemd/system/rsync.service
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index d3a4228f..7b40ee60 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -10,6 +10,7 @@ description: |
but it is required right now for the Openstack system to work.
build-depends:
- morph: strata/foundation.morph
+- morph: strata/python-core.morph
chunks:
- name: xstatic
repo: upstream:xstatic
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index cf37f5e6..50c98a1b 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 846681a2..cc4c9bf9 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 15b0a52c..7715ecb7 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -20,6 +20,8 @@ strata:
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
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 8be51f90..fb95e303 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index f74ce07d..de63e327 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -17,6 +17,8 @@ strata:
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
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 5bbe38f8..e1ebf4e3 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 1ca20c00..29580d96 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -17,6 +17,8 @@ strata:
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
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 2bf25493..59ccc23d 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 580f53f7..93710a51 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -27,6 +27,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