diff options
Diffstat (limited to 'strata')
26 files changed, 134 insertions, 58 deletions
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph index cf0907de..3d61e537 100644 --- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph @@ -8,6 +8,7 @@ configure-commands: - scripts/config -e CONFIG_POSIX_MQUEUE - scripts/config -e CPU_IDLE - scripts/config -e EXT4_FS +- scripts/config -e FUSE_FS - scripts/config -e EXT4_USE_FOR_EXT23 - scripts/config -e PACKET - scripts/config -e UNIX diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph index 9125ee51..7e66ce73 100644 --- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph @@ -7,6 +7,8 @@ configure-commands: - scripts/config -d BTRFS_FS_CHECK_INTEGRITY - scripts/config -e DEVTMPFS - scripts/config -e DEVTMPFS_MOUNT +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e CONFIG_FHANDLE - scripts/config -e CGROUPS - scripts/config -e AUTOFS4_FS diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph index a4de8d6a..e98b304e 100644 --- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph @@ -21,6 +21,7 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -e BTRFS_FS - scripts/config -e TMPFS +- scripts/config -e FUSE_FS - scripts/config -e IKCONFIG - scripts/config -e IKCONFIG_PROC - scripts/config -e CGROUPS diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph index a6c0242d..c232c493 100644 --- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph @@ -20,6 +20,8 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -e BTRFS_FS - scripts/config -e TMPFS +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e IKCONFIG - scripts/config -e IKCONFIG_PROC - scripts/config -e CGROUPS diff --git a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph index 35fb8f95..2429cf5e 100644 --- a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph +++ b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph @@ -32,6 +32,8 @@ configure-commands: - scripts/config -d EXT4_DEBUG - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP diff --git a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph index 0399ef66..6a5e99b7 100644 --- a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph @@ -30,6 +30,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 4559f2ba..43972811 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -33,6 +33,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph index cd68c872..b8b189c7 100644 --- a/strata/bsp-ppc64-generic/linux-ppc64.morph +++ b/strata/bsp-ppc64-generic/linux-ppc64.morph @@ -31,6 +31,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph index a3a79254..bf337725 100644 --- a/strata/bsp-wandboard/linux-armv7-wandboard.morph +++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph @@ -33,6 +33,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index a8da9549..3d936150 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -40,6 +40,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index eb4204f6..31aec686 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -40,6 +40,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/foundation.morph b/strata/foundation.morph index cc58de5a..3de24fee 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -80,8 +80,8 @@ chunks: - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: d736e4f3e76daca4ab1b1fc444737e5ee20a27cd - unpetrify-ref: baserock/v219-314-gd736e4f-network_fixes + ref: 163ab2961268232e1cb49e990a8ccefe24b7649f + unpetrify-ref: baserock/v219-729-g163ab29-jetson_btrfs_fixes build-depends: - dbus-pre - gobject-introspection diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph new file mode 100644 index 00000000..a7495405 --- /dev/null +++ b/strata/libsoup-common.morph @@ -0,0 +1,10 @@ +name: libsoup-common +kind: stratum +build-depends: +- morph: strata/foundation.morph +chunks: +- name: libsoup + morph: strata/libsoup-common/libsoup.morph + repo: upstream:libsoup + ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e + unpetrify-ref: baserock/morph diff --git a/strata/virtualization/libsoup.morph b/strata/libsoup-common/libsoup.morph index 0a5ebef6..0a5ebef6 100644 --- a/strata/virtualization/libsoup.morph +++ b/strata/libsoup-common/libsoup.morph diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 99a0562f..6020954e 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,10 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph +- morph: strata/ostree-core.morph - morph: strata/python-cliapp.morph +- morph: strata/python-core.morph +- morph: strata/python-pygobject.morph - morph: strata/python-wsgi.morph chunks: - name: python-ttystatus @@ -38,7 +41,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: ab92ce0343b838b336313f604ea035a60dfcb960 + ref: e62366ed8a32a44dbe034e8d43450338b1b66e12 unpetrify-ref: master build-depends: - cmdtest diff --git a/strata/nfs.morph b/strata/nfs.morph index 0d04812b..9b9aa248 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -23,7 +23,7 @@ chunks: - name: nfs-utils morph: strata/nfs/nfs-utils.morph repo: upstream:nfs-utils - ref: 08baf3bc2f66a1ca6401191e19380028d2fc2c6d + ref: 0da9f20a22bb32b2da6b587b4e85dafde087c0f7 unpetrify-ref: baserock/master build-depends: - libevent diff --git a/strata/ntpd/ntpd.morph b/strata/ntpd/ntpd.morph index fe875b35..e4e710cb 100644 --- a/strata/ntpd/ntpd.morph +++ b/strata/ntpd/ntpd.morph @@ -3,6 +3,47 @@ kind: chunk build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" --enable-linuxcaps +post-install-commands: +- | + cat > ntpd.service << EOF + [Unit] + Description=Network Time Service + After=network.target nss-lookup.target + Conflicts=systemd-timesyncd.service + + [Service] + Type=forking + ExecStart=/usr/bin/ntpd -u ntp:ntp + PrivateTmp=True + Restart=on-failure + + [Install] + WantedBy=multi-user.target + EOF +- install -D -m 644 ntpd.service "$DESTDIR"/lib/systemd/system/ntpd.service +- mkdir -p "$DESTDIR"/lib/systemd/system/multi-user.target.wants +- ln -s /lib/systemd/system/ntpd.service "$DESTDIR"/lib/systemd/system/multi-user.target.wants/ntpd.service +- | + cat > ntp.conf << EOF + # We use iburst here to reduce the potential initial delay to set the clock + server 0.pool.ntp.org iburst + server 1.pool.ntp.org iburst + server 2.pool.ntp.org iburst + server 3.pool.ntp.org iburst + + # kod - notify client when packets are denied service, + # rather than just dropping the packets + # + # nomodify - deny queries which attempt to modify the state of the server + # + # notrap - decline to provide mode 6 control message trap service to + # matching hosts + # + # see ntp.conf(5) for more details + restrict -4 default kod notrap nomodify + restrict -6 default kod notrap nomodify + EOF +- install -D -m 644 ntp.conf "$DESTDIR"/etc/ntp.conf system-integration: ntpd-misc: 00-add-ntpd-user: diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index f27ca21f..83e7f1ae 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -600,24 +600,6 @@ chunks: - netifaces - pastedeploy - python-xattr -- name: trove - repo: upstream:openstack/trove - ref: a4c38cc6ddbfba2301766eced939229cccc31953 - unpetrify-ref: 2014.2 - build-depends: - - sqlalchemy - - eventlet - - keystonemiddleware - - kombu - - routes - - webob - - pastedeploy - - paste - - sqlalchemy-migrate - - netifaces - - httplib2 - - passlib - - pexpect - name: wsgiref repo: upstream:python-packages/wsgiref.git ref: e8360785eef259394e13b2062407edc3c2cbc1e0 @@ -740,8 +722,8 @@ chunks: - name: ceilometer morph: strata/openstack-services/ceilometer.morph repo: upstream:openstack/ceilometer - ref: 94579bfc81b820380d03703e4e2311b3bd25c022 - unpetrify-ref: 2014.2 + ref: 1129b7013359bf242a2ea53be9d4faeccfbfac5a + unpetrify-ref: 2014.2.1 build-depends: - alembic - anyjson @@ -765,25 +747,6 @@ chunks: - tooz - webob - wsme -- name: heat - repo: upstream:openstack/heat - ref: c06772571a81383aa37336a78d72d455067b75e8 - unpetrify-ref: 2014.2 - build-depends: - - eventlet - - greenlet - - httplib2 - - keystonemiddleware - - kombu - - oslo-db - - oslo-messaging - - pastedeploy - - posix-ipc-tarball - - qpid-python - - routes - - sqlalchemy - - sqlalchemy-migrate - - webob - name: django-openstack-auth repo: upstream:openstack/django_openstack_auth ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360 diff --git a/strata/openstack-services/ceilometer.morph b/strata/openstack-services/ceilometer.morph index 07d3cf97..a93562a8 100644 --- a/strata/openstack-services/ceilometer.morph +++ b/strata/openstack-services/ceilometer.morph @@ -5,7 +5,7 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/ceilometer - install -D -m 644 etc/ceilometer/*.json "$DESTDIR"/etc/ceilometer - install -D -m 644 etc/ceilometer/*.yaml "$DESTDIR"/etc/ceilometer -- install -D -m 644 etc/ceilometer/api_paste.ini "DESTDIR"/etc/ceilometer +- install -D -m 644 etc/ceilometer/api_paste.ini "$DESTDIR"/etc/ceilometer/api_paste.ini - install -D -m 640 etc/ceilometer/rootwrap.conf "$DESTDIR"/etc/ceilometer/rootwrap.conf - mkdir -p "$DESTDIR"/etc/ceilometer/rootwrap.d - install -D -m 644 etc/ceilometer/rootwrap.d/* "$DESTDIR"/etc/ceilometer/rootwrap.d/ diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph new file mode 100644 index 00000000..5052bf4b --- /dev/null +++ b/strata/ostree-core.morph @@ -0,0 +1,17 @@ +name: ostree-core +kind: stratum +build-depends: +- morph: strata/foundation.morph +- morph: strata/core.morph +- morph: strata/libsoup-common.morph +chunks: +- name: libgsystem + repo: upstream:libgsystem + ref: 8231b8ad4a4ee35e4b11fae5f6e7cddabf1c51ae + unpetrify-ref: master +- name: ostree + repo: upstream:ostree + ref: c9704e9802dfeda9b5a138535c59e98df3dd7196 + unpetrify-ref: baserock/morph + build-depends: + - libgsystem diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph new file mode 100644 index 00000000..68b30b72 --- /dev/null +++ b/strata/python-pygobject.morph @@ -0,0 +1,13 @@ +name: python-pygobject +kind: stratum +description: | + Python GObject bindings +build-depends: +- morph: strata/python-core.morph +- morph: strata/foundation.morph +chunks: +- name: pygobject + morph: strata/python-pygobject/pygobject.morph + repo: upstream:pygobject + ref: 276341d7ddab180020c31e6837bd28fd25784de0 + unpetrify-ref: baserock/morph diff --git a/strata/virtualization/pygobject.morph b/strata/python-pygobject/pygobject.morph index a423537e..a423537e 100644 --- a/strata/virtualization/pygobject.morph +++ b/strata/python-pygobject/pygobject.morph diff --git a/strata/trove.morph b/strata/trove.morph index 40588c05..984050b7 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -71,7 +71,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 + ref: 16de74536e0846ba1d2e5101618df9146c785a41 unpetrify-ref: master - name: lua-scrypt morph: strata/trove/lua-scrypt.morph diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph new file mode 100644 index 00000000..9cc2c69e --- /dev/null +++ b/strata/unionfs-fuse-group.morph @@ -0,0 +1,13 @@ +name: unionfs-fuse-group +kind: stratum +description: |- + User-space union file system. + This is used by Morph for systems which are unable to use 'overlayfs'. It is slower than 'overlayfs', because it runs outside rather than inside the kernel, but 'overlayfs' is only available in Linux 3.18 and newer. +build-depends: +- morph: strata/foundation.morph +chunks: +- name: unionfs.fuse + morph: strata/unionfs-fuse-group/unionfs-fuse.morph + repo: upstream:unionfs-fuse + ref: efac5b7aa91ec860f8f430a8d21060fe53a07002 + unpetrify-ref: v0.26 diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph new file mode 100644 index 00000000..7fa36e41 --- /dev/null +++ b/strata/unionfs-fuse-group/unionfs-fuse.morph @@ -0,0 +1,7 @@ +name: unionfs-fuse +kind: chunk +description: User-space union file system. +build-commands: +- make PREFIX="$PREFIX" +install-commands: +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 1fe9442b..bdcab292 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -6,7 +6,9 @@ description: | kernel history to check which config are needed for openvswitch, libvirt, or ebtables, for example. build-depends: +- morph: strata/libsoup-common.morph - morph: strata/python-core.morph +- morph: strata/python-pygobject.morph - morph: strata/connman-common.morph - morph: strata/lvm.morph - morph: strata/xorg-util-macros-common.morph @@ -75,24 +77,11 @@ chunks: build-depends: - libvirt - urlgrabber -- name: pygobject - morph: strata/virtualization/pygobject.morph - repo: upstream:pygobject - ref: 276341d7ddab180020c31e6837bd28fd25784de0 - unpetrify-ref: baserock/morph -- name: libsoup - morph: strata/virtualization/libsoup.morph - repo: upstream:libsoup - ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e - unpetrify-ref: baserock/morph - name: libosinfo morph: strata/virtualization/libosinfo.morph repo: upstream:libosinfo ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12 unpetrify-ref: baserock/morph - build-depends: - - libsoup - - pygobject - name: virt-manager repo: upstream:virt-manager ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575 |