summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/audio-bluetooth.morph4
-rw-r--r--strata/bsp-x86_both-tools.morph4
-rw-r--r--strata/coreutils-common/coreutils.morph5
-rw-r--r--strata/cross-bootstrap.morph9
-rw-r--r--strata/databases.morph16
-rw-r--r--strata/databases/memcached.morph8
-rw-r--r--strata/django.morph35
-rw-r--r--strata/erlang.morph15
-rw-r--r--strata/erlang/erlang-sd_notify.morph8
-rw-r--r--strata/erlang/rebar.morph6
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/gtk-deps.morph16
-rw-r--r--strata/gtk3.morph4
-rw-r--r--strata/morph-utils.morph10
-rw-r--r--strata/networking-utils.morph29
-rw-r--r--strata/networking-utils/iproute2.morph10
-rw-r--r--strata/networking-utils/ipset.morph6
-rw-r--r--strata/nfs.morph4
-rw-r--r--strata/python-core.morph5
-rw-r--r--strata/trove.morph2
-rw-r--r--strata/virtualization.morph42
-rw-r--r--strata/virtualization/dmidecode.morph7
-rw-r--r--strata/virtualization/ebtables.morph7
-rw-r--r--strata/virtualization/libvirt.morph27
-rw-r--r--strata/virtualization/openvswitch.morph11
-rw-r--r--strata/xstatic.morph108
-rw-r--r--systems/installer-system-x86_64.morph2
-rw-r--r--systems/xfce-system.morph2
28 files changed, 360 insertions, 46 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index e4dc0e68..829cf6f8 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -89,8 +89,8 @@ chunks:
- name: pulseaudio
morph: strata/audio-bluetooth/pulseaudio.morph
repo: upstream:pulseaudio
- ref: 34862dbd43079d19faff31fa9ba996acc874d586
- unpetrify-ref: v5.99.3
+ ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7
+ unpetrify-ref: v6.0
build-depends:
- libsndfile
- libatomic_ops
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index 008ddf3f..b5bee9cb 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -14,7 +14,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_both-tools/syslinux.morph
repo: upstream:syslinux
- ref: baserock/morph
- unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+ ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
+ unpetrify-ref: baserock/morph
build-depends:
- nasm
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 08808333..cc1ae683 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -9,3 +9,8 @@ build-commands:
- make WERROR_CFLAGS=
install-commands:
- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
+# This hack is for supporting "fdatasync" argument in "dd" command
+# which busybox "dd" does not support.
+# This hack should dissappear when we merge /usr/bin and /bin.
+- mkdir -p "$DESTDIR"/bin/
+- ln -sf ../usr/bin/dd "$DESTDIR"/bin/
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index b40eaa5c..be4f4db8 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -3,12 +3,8 @@ kind: stratum
description: The minimal development tools to build a baserock devel system
build-depends:
- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- unpetrify-ref: baserock/morph
- build-depends: []
- name: groff
morph: strata/cross-bootstrap/groff.morph
repo: upstream:groff-git
@@ -70,8 +66,7 @@ chunks:
repo: upstream:pyfilesystem
ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
unpetrify-ref: baserock/morph
- build-depends:
- - six
+ build-depends: []
- name: morph
repo: baserock:baserock/morph
ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c
diff --git a/strata/databases.morph b/strata/databases.morph
index cb09c5a3..4b06edf3 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -1,6 +1,6 @@
name: databases
kind: stratum
-description: some popular databases
+description: some popular databases and some utils related to databases
build-depends:
- morph: strata/tools.morph
- morph: strata/nfs.morph
@@ -17,7 +17,19 @@ chunks:
unpetrify-ref: baserock/3.0
build-depends: []
- name: memcached
+ morph: strata/databases/memcached.morph
repo: upstream:memcached
- ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
+ ref: c5530027c8ea28674358327ab8212ebaf014c848
+ unpetrify-ref: 1.4.22
+ build-depends: []
+- name: psycopg2
+ repo: upstream:python-packages/psycopg2
+ ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8
+ unpetrify-ref: 2.5.4
+ build-depends:
+ - postgresql
+- name: python-memcached
+ 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
new file mode 100644
index 00000000..28e01362
--- /dev/null
+++ b/strata/databases/memcached.morph
@@ -0,0 +1,8 @@
+name: memcached
+kind: chunk
+build-system: autotools
+configure-commands:
+- perl version.pl
+- touch README
+- autoreconf -fvi
+- ./configure --prefix="$PREFIX"
diff --git a/strata/django.morph b/strata/django.morph
new file mode 100644
index 00000000..7659593c
--- /dev/null
+++ b/strata/django.morph
@@ -0,0 +1,35 @@
+name: django
+kind: stratum
+description: Stratum with Django and its plugins and dependencies.
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/python-core.morph
+chunks:
+- name: django
+ 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
+ unpetrify-ref: 1.4
+ build-depends:
+ - django-appconf
+- name: pyscss
+ 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
+ unpetrify-ref: v1.0.6
+ build-depends:
+ - django
+ - pyscss
diff --git a/strata/erlang.morph b/strata/erlang.morph
index 657b07be..bea09d61 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.morph
@@ -10,3 +10,18 @@ chunks:
ref: 9417f044ee3c291c2ea343c203aebdcc40597226
unpetrify-ref: OTP-17.3.4
build-depends: []
+- name: rebar
+ morph: strata/erlang/rebar.morph
+ repo: upstream:erlang-modules/rebar
+ ref: d42ed4683576d995f60e3222f076e99f0b081f79
+ unpretrify-ref: master
+ build-depends:
+ - erlang
+- name: erlang-sd_notify
+ morph: strata/erlang/erlang-sd_notify.morph
+ repo: upstream:erlang-modules/erlang-sd_notify
+ ref: 99f4689c2c18570680329f822591f95f9341ca10
+ unpretrify-ref: master
+ build-depends:
+ - erlang
+ - rebar
diff --git a/strata/erlang/erlang-sd_notify.morph b/strata/erlang/erlang-sd_notify.morph
new file mode 100644
index 00000000..32bf92d2
--- /dev/null
+++ b/strata/erlang/erlang-sd_notify.morph
@@ -0,0 +1,8 @@
+name: erlang
+kind: chunk
+build-commands:
+- LDFLAGS=-lsystemd REBAR_FLAGS="--verbose 2" make
+install-commands:
+- install -D -m 644 -p ebin/sd_notify.app "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.app
+- install -D -m 644 -p ebin/sd_notify.beam "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/ebin/sd_notify.beam
+- install -D -m 755 -p priv/sd_notify_drv.so "$DESTDIR$PREFIX"/lib/erlang/lib/sd_notify-0.1/priv/sd_notify_drv.so
diff --git a/strata/erlang/rebar.morph b/strata/erlang/rebar.morph
new file mode 100644
index 00000000..3a6134c0
--- /dev/null
+++ b/strata/erlang/rebar.morph
@@ -0,0 +1,6 @@
+name: erlang
+kind: chunk
+build-commands:
+- ./bootstrap
+install-commands:
+- install -D -m 755 rebar "$DESTDIR$PREFIX"/bin/rebar
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 23398639..533ac9ee 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -82,8 +82,8 @@ chunks:
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88
- unpetrify-ref: v217
+ ref: df0082ede6d0ca4db6773747eaf1c36d97458744
+ unpetrify-ref: baserock/v218-with-canonical-hostname-fix
build-depends:
- dbus-pre
- gobject-introspection
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 799ba87a..f1141fcd 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -14,8 +14,8 @@ chunks:
- name: shared-mime-info
morph: strata/gtk-deps/shared-mime-info.morph
repo: upstream:shared-mime-info
- ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
- unpetrify-ref: baserock/morph
+ ref: c136fc2578aa8f7c0e098008da18d324033eb991
+ unpetrify-ref: Release-1-4
build-depends: []
- name: gnome-common
repo: upstream:gnome-common
@@ -30,19 +30,19 @@ chunks:
build-depends: []
- name: atk
repo: upstream:atk
- ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
- unpetrify-ref: ATK_2_12_0
+ ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253
+ unpetrify-ref: ATK_2_15_4
build-depends:
- gnome-common
- name: at-spi2-core
repo: upstream:at-spi2-core
- ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
- unpetrify-ref: AT_SPI2_CORE_2_12_0
+ ref: 96c2842088008670e72739ea7921d654487a57fb
+ unpetrify-ref: AT_SPI2_CORE_2_14_1
build-depends: []
- name: at-spi2-atk
repo: upstream:at-spi2-atk
- ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
- unpetrify-ref: AT_SPI2_ATK_2_12_1
+ ref: 2c220ff6565c4f02428a0c80267616a677e81ac9
+ unpetrify-ref: AT_SPI2_ATK_2_14_1
build-depends:
- at-spi2-core
- atk
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index f471bf6e..851cb3dd 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -13,7 +13,7 @@ chunks:
- name: gtk3
morph: strata/gtk3/gtk3.morph
repo: upstream:gtk+
- ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
- unpetrify-ref: 3.15.0
+ ref: 9e96461aa59cdb5454a48200b8b80caaf04c4147
+ unpetrify-ref: 3.15.5
build-depends:
- libepoxy
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 1645bfed..6e1ad289 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -21,18 +21,12 @@ chunks:
ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
unpetrify-ref: baserock/morph
build-depends: []
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- 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:
- - six
+ build-depends: []
- name: python-coveragepy
morph: strata/morph-utils/python-coveragepy.morph
repo: upstream:python-coveragepy
@@ -72,7 +66,7 @@ chunks:
build-depends: []
- name: morph
repo: baserock:baserock/morph
- ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c
+ ref: d9ad77ea43f99f3f6d58f66cb1bfe261d966c730
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
new file mode 100644
index 00000000..5af03abb
--- /dev/null
+++ b/strata/networking-utils.morph
@@ -0,0 +1,29 @@
+name: networking-utils
+kind: stratum
+description: |
+ Stratum which contains utils to works with networks: create, enable, filter...
+
+ This stratum requires kernel config flags which are not enabled in the default
+ Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get
+ an idea of what is needed.
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: iproute2
+ morph: strata/networking-utils/iproute2.morph
+ 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
+ ref: cf25c4c50e9996af30499e5b1c3354ab53be7237
+ unpetrify-ref: v6.24
+ build-depends:
+ - libmnl
diff --git a/strata/networking-utils/iproute2.morph b/strata/networking-utils/iproute2.morph
new file mode 100644
index 00000000..7ba04db6
--- /dev/null
+++ b/strata/networking-utils/iproute2.morph
@@ -0,0 +1,10 @@
+name: iproute2
+kind: chunk
+build-commands:
+# arpd binary is dependent on Berkeley DB, which is licensed by Oracle
+# as arpd is not needed for Openstack systems, arpd will not be compiled
+# or installed.
+- sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
+- make
+install-commands:
+- DESTDIR="$DESTDIR" PREFIX="$PREFIX" make install
diff --git a/strata/networking-utils/ipset.morph b/strata/networking-utils/ipset.morph
new file mode 100644
index 00000000..7fe8c6dc
--- /dev/null
+++ b/strata/networking-utils/ipset.morph
@@ -0,0 +1,6 @@
+name: ipset
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --enable-static=no --with-kmod=no
diff --git a/strata/nfs.morph b/strata/nfs.morph
index 68988d54..3dbead9d 100644
--- a/strata/nfs.morph
+++ b/strata/nfs.morph
@@ -6,8 +6,8 @@ build-depends:
chunks:
- name: libevent
repo: upstream:libevent
- ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
- unpetrify-ref: baserock/release-2.0.21-stable
+ ref: 0b49ae34594533daa82c06a506078de9e336a013
+ unpetrify-ref: release-2.1.5-beta
build-depends: []
- name: ti-rpc
morph: strata/nfs/ti-rpc.morph
diff --git a/strata/python-core.morph b/strata/python-core.morph
index ca07449f..409d6f17 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -20,3 +20,8 @@ chunks:
ref: b83131779c701720a9ae9efae78996277d416269
unpetrify-ref: v2.5.1
build-depends: []
+- name: six
+ repo: upstream:six
+ ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
+ unpetrify-ref: 1.9.0
+ build-depends: []
diff --git a/strata/trove.morph b/strata/trove.morph
index b71a79c2..fcd34636 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -73,7 +73,7 @@ chunks:
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
- ref: 7134fb36f7a1c62111d2eaea5c5b32cf2169cec6
+ ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2
unpetrify-ref: master
build-depends: []
- name: lorry-controller
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 7aa8f6af..881b53de 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -1,8 +1,13 @@
name: virtualization
kind: stratum
-description: virtualization for baserock
+description: |
+ Virtualization for baserock
+ NOTE: this stratum requires kernel support, please see openstack bsp
+ kernel history to check which config are needed for openvswitch, libvirt,
+ or ebtables, for example.
build-depends:
- morph: strata/connman-common.morph
+- morph: strata/lvm.morph
chunks:
- name: yajl
morph: strata/virtualization/yajl.morph
@@ -25,8 +30,8 @@ chunks:
- name: qemu
morph: strata/virtualization/qemu.morph
repo: upstream:qemu
- ref: f8d1fb61e65575011a67d7ba97b690feb5630c91
- unpetrify-ref: baserock/morph
+ ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d
+ unpetrify-ref: baserock/v2.2.0
build-depends: []
- name: xorg-util-macros
repo: upstream:xorg-util-macros
@@ -39,17 +44,24 @@ chunks:
unpetrify-ref: master
build-depends:
- xorg-util-macros
+- name: dmidecode
+ morph: strata/virtualization/dmidecode.morph
+ repo: upstream:dmidecode
+ ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5
+ unpetrify-ref: master
+ build-depends: []
- name: libvirt
morph: strata/virtualization/libvirt.morph
repo: upstream:libvirt
- ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
- unpetrify-ref: baserock/morph
+ ref: 7b1ceec1e2f141d36ed9b7ef3a660ff8bb34fc53
+ unpetrify-ref: baserock/v1.2.10
build-depends:
- libpciaccess
- dnsmasq
- qemu
- xml-catalog
- yajl
+ - dmidecode
- name: pycurl
repo: upstream:pycurl
ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
@@ -74,16 +86,16 @@ chunks:
- cython
- name: libvirt-python
repo: upstream:libvirt-python
- ref: 4382fc518cbd11d9af5727fb403e175818c25db5
- unpetrify-ref: v1.2.2
+ ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500
+ unpetrify-ref: v1.2.10
build-depends:
- libvirt
- python-lxml
- urlgrabber
- name: gnome-common
repo: upstream:gnome-common
- ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8
- unpetrify-ref: 3.7.4
+ ref: d213283fcb5228d05eb2c796579f18240e8467e8
+ unpetrify-ref: 3.12.0
build-depends: []
- name: pygobject
morph: strata/virtualization/pygobject.morph
@@ -114,3 +126,15 @@ chunks:
build-depends:
- libvirt-python
- libosinfo
+- name: ebtables
+ morph: strata/virtualization/ebtables.morph
+ repo: upstream:ebtables
+ ref: 09792f0107a9318da809908db31f0b826017de7b
+ 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/dmidecode.morph b/strata/virtualization/dmidecode.morph
new file mode 100644
index 00000000..d9ab0fa3
--- /dev/null
+++ b/strata/virtualization/dmidecode.morph
@@ -0,0 +1,7 @@
+name: dmidecode
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" prefix="$PREFIX"
diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph
new file mode 100644
index 00000000..8be1b4f2
--- /dev/null
+++ b/strata/virtualization/ebtables.morph
@@ -0,0 +1,7 @@
+name: ebtables
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph
index 63b5d768..e6d348bb 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.morph
@@ -3,4 +3,29 @@ kind: chunk
build-system: autotools
configure-commands:
- |
- GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX"
+ GNULIB_SRCDIR=.gnulib \
+ ./autogen.sh \
+ --without-apparmor --with-attr --without-audit --without-avahi --with-blkid \
+ --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs \
+ --without-hal --without-netcf --without-numactl --without-openwsman \
+ --with-pciaccess --without-readline --without-sanlock --without-sasl \
+ --without-selinux --without-ssh2 --with-systemd-daemon --with-udev \
+ --with-yajl --without-xen --with-qemu --without-uml --without-openvz \
+ --without-vmware --without-phyp --without-xenapi --without-libxl \
+ --without-vbox --without-lxc --without-esx --without-hyperv \
+ --without-parallels --with-test --with-remote --with-libvirtd \
+ --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit \
+ --without-firewalld --without-dtrace --without-numad --with-network \
+ --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm \
+ --without-storage-iscsi --without-storage-scsi --without-storage-mpath \
+ --without-storage-disk --with-storage-rbd --without-storage-sheepdog \
+ --without-storage-gluster --without-wireshark-dissector \
+ --prefix="$PREFIX"
+system-integration:
+ libvirt-misc:
+ 01-addgroup:
+ - groupadd libvirt
+ 02-setup_libvirtconf:
+ - sed -i 's/#unix_sock_group = "libvirt"/unix_sock_group = "libvirt"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_rw_perms = "0770"/unix_sock_rw_perms = "0770"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_ro_perms = "0777"/unix_sock_ro_perms = "0777"/' /etc/libvirt/libvirtd.conf
diff --git a/strata/virtualization/openvswitch.morph b/strata/virtualization/openvswitch.morph
new file mode 100644
index 00000000..1b5cdd86
--- /dev/null
+++ b/strata/virtualization/openvswitch.morph
@@ -0,0 +1,11 @@
+name: openvswitch
+kind: chunk
+build-system: manual
+pre-configure-commands:
+- ./boot.sh
+configure-commands:
+- ./configure --enable-ssl
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" prefix="$PREFIX"
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
new file mode 100644
index 00000000..a632d4df
--- /dev/null
+++ b/strata/xstatic.morph
@@ -0,0 +1,108 @@
+name: xstatic
+kind: stratum
+description: |
+ Stratum with Xstatic and some xstatic libraries.
+
+ XStatic is a packaging standard to package external static files as
+ a python package, so they are easily usable on all OSes.
+
+ This conflicts with the 'everything from Git' policy of Baserock,
+ but it is required right now for the Openstack system to work.
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: xstatic
+ 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-cookies
+ repo: upstream:xstatic-packages/xstatic-angular-cookies
+ ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5
+ unpetrify-ref: 1.2.1.1
+ 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-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-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/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 0b5e4709..8798182b 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 152bf16b..697ea52d 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic