diff options
Diffstat (limited to 'strata')
109 files changed, 789 insertions, 586 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph index 43ebc2bd..f21cb222 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -8,8 +8,17 @@ chunks: - name: ansible morph: strata/ansible/ansible.morph repo: upstream:ansible - ref: 0a7124541247cc613352054f4bc0c3e116e0b657 - unpetrify-ref: baserock/v1.8.4 + ref: ebc8d48d34296fe010096f044e2b7591df37a622 + unpetrify-ref: v1.8.4 + submodules: + lib/ansible/modules/core: + url: upstream:ansible-modules-core.git + v2/ansible/modules/core: + url: upstream:ansible-modules-core.git + v2/ansible/modules/extras: + url: upstream:ansible-modules-extras.git + lib/ansible/modules/extras: + url: upstream:ansible-modules-extras.git - name: openstack-ansible-modules morph: strata/ansible/openstack-ansible-modules.morph repo: upstream:openstack/openstack-ansible-modules diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 6bd8ce66..c7469280 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -12,33 +12,32 @@ chunks: build-system: autotools - name: alsa-lib repo: upstream:alsa-lib - ref: 9cfd1faa27511edbb8bebbab85030125f33590ae + ref: 16c956e598a2b22459538ec7eb46b7a8421bb80a # Note: ref anchored because alsa-lib is known for rebasing # tags, and master - unpetrify-ref: baserock/v1.0.28 + unpetrify-ref: baserock/v1.0.29 build-system: autotools - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils - ref: bbf137f66b2c8ce36db73f59ee69d5c443436524 + ref: 85c622e2984b557e6bd79c13cea466012dfb3761 # Note: ref anchored because alsa-utils is known for rebasing # tags, and master - unpetrify-ref: baserock/v1.0.28 + unpetrify-ref: baserock/v1.0.29 build-depends: - alsa-lib - name: libical morph: strata/audio-bluetooth/libical.morph repo: upstream:libical-git - ref: da69aae790f680b633100475cac14c776fbda722 - unpetrify-ref: v1.0.1 + ref: 6c4af23b0a95fd105f38e879908cbc80390f3716 + unpetrify-ref: v2.0.0 - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez - ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6 - unpetrify-ref: baserock/v5.17-patched + ref: 5eb47745978925e451523c8e8cb2ad6a53ed3863 + unpetrify-ref: baserock/5.37+service-api build-depends: - libical - - alsa-lib - name: dbus-glib repo: upstream:dbus-glib ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph index f27fcf1c..e7208da7 100644 --- a/strata/audio-bluetooth/bluez.morph +++ b/strata/audio-bluetooth/bluez.morph @@ -4,8 +4,14 @@ description: Bluetooth protocol stack for Linux build-system: autotools configure-commands: - autoreconf -ivf -- ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library - --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib +- ./configure --prefix="$PREFIX" + --enable-tools + --enable-service + --enable-test + --enable-library + --sysconfdir=/etc + --localstatedir=/var + --libexecdir=/lib install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants" diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 4cb5034f..3b139fcc 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -27,8 +27,8 @@ chunks: - name: linux-jetson-tk1 morph: strata/bsp-jetson/linux-jetson-tk1.morph repo: upstream:linux - ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc - unpetrify-ref: v4.4 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: linux-firmware@jetson morph: strata/bsp-jetson/linux-firmware@jetson.morph repo: upstream:linux-firmware diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 395ac136..bffe390e 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -218,6 +218,7 @@ configure-commands: - scripts/config -e SCSI_LOWLEVEL - scripts/config -e NOUVEAU_PLATFORM_DRIVER - scripts/config -e DRM_TEGRA_STAGING +- scripts/config -e BT - yes '' | make ARCH=arm oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 05d179b5..9c83c359 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,8 +10,8 @@ chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph repo: upstream:linux - ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76 - unpetrify-ref: v4.0 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm 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 529b74bd..8102cea5 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -267,6 +267,7 @@ configure-commands: - scripts/config -e CONFIG_SND_INTEL8X0 - scripts/config -m CONFIG_DRM_CIRRUS_QEMU - scripts/config -m CONFIG_DRM_BOCHS +- scripts/config -e BT - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index c8d1c37f..ab6a3877 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,8 +10,8 @@ chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph repo: upstream:linux-stable - ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc - unpetrify-ref: v4.4 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm 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 4393f89d..08541c2b 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -268,6 +268,7 @@ configure-commands: - scripts/config -m CONFIG_DRM_CIRRUS_QEMU - scripts/config -m CONFIG_DRM_BOCHS - scripts/config -m CONFIG_DRM_VIRTIO_GPU +- scripts/config -e BT - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/bsp-x86_64-ivi.morph b/strata/bsp-x86_64-ivi.morph new file mode 100644 index 00000000..b94166c7 --- /dev/null +++ b/strata/bsp-x86_64-ivi.morph @@ -0,0 +1,12 @@ +name: bsp-x86_64-ivi +kind: stratum +description: Set of components required for booting a 64-bit + x86 based system, with some options specific to IVI systems. +build-depends: +- morph: strata/bsp-x86_both-tools.morph +chunks: +- name: linux-x86-64-generic + morph: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph + repo: upstream:linux-stable + ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc + unpetrify-ref: v4.4 diff --git a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph new file mode 100644 index 00000000..4ea25199 --- /dev/null +++ b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph @@ -0,0 +1,48 @@ +name: linux-x86-64-ivi +kind: chunk +products: +- artifact: linux-x86-64-ivi-devel + include: + - (usr/)?src/linux/.* +- artifact: linux-x86-64-ivi-bins + include: + - boot/.* +- artifact: linux-x86-64-ivi-libs + include: + - lib/.* +configure-commands: +- make defconfig +- scripts/config -m CONFIG_DRM_CIRRUS_QEMU +- scripts/config -m CONFIG_DRM_BOCHS +- scripts/config -m CONFIG_DRM_VIRTIO_GPU +- scripts/config -m CONFIG_BT_INTEL +- scripts/config -m CONFIG_MOSTCORE +- yes '' | make oldconfig +build-commands: +- make $MAKEFLAGS +install-commands: +- mkdir -p "$DESTDIR"/boot +- make INSTALL_PATH="$DESTDIR"/boot install +- make INSTALL_MOD_PATH="$DESTDIR" modules_install +- install -d "$DESTDIR$PREFIX/src/linux" +- | + ( + printf 'Makefile\0' + printf 'Module.symvers\0' + find arch/x86 -maxdepth 1 -name 'Makefile*' -print0 + find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0 + find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \ + \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0 + find include -name 'asm*' -prune -o -print0 + find include/asm-generic -print0 + find include/uapi -print0 + find scripts -print0 + ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" +system-integration: + linux-x86-64-ivi-misc: + # This is required for any modules to work correctly. However, it depends + # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs + # conditionally on `depmod` existing to avoid breaking in + # minimal-system-x86_64. + 00-depmod: + - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index c428a1ba..0cd09dc4 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -1,6 +1,7 @@ name: ceph-service kind: stratum build-depends: +- morph: strata/cpp-common-libs.morph - morph: strata/foundation.morph - morph: strata/network-security.morph chunks: @@ -44,11 +45,6 @@ chunks: ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph build-system: autotools -- name: boost - morph: strata/ceph-service/boost.morph - repo: upstream:boost-tarball - ref: ed232fdd34968697a68783b3195b1da4226915b5 - unpetrify-ref: boost_1_57_0 - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph @@ -60,4 +56,18 @@ chunks: - leveldb - libeditline - keyutils - - boost + submodules: + src/erasure-code/jerasure/gf-complete: + url: https://github.com/ceph/gf-complete.git + src/civetweb: + url: https://github.com/ceph/civetweb + ceph-erasure-code-corpus: + url: https://github.com/ceph/ceph-erasure-code-corpus.git + src/rocksdb: + url: https://github.com/ceph/rocksdb + src/erasure-code/jerasure/jerasure: + url: https://github.com/ceph/jerasure.git + src/libs3: + url: https://github.com/ceph/libs3.git + ceph-object-corpus: + url: https://github.com/ceph/ceph-object-corpus.git diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph deleted file mode 100644 index fa785e3c..00000000 --- a/strata/ceph-service/boost.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: boost -kind: chunk -configure-commands: -- ./bootstrap.sh -build-commands: -- ./b2 -install-commands: -- ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/chef.morph b/strata/chef.morph index 9a7f6e73..7a72fc3b 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -17,6 +17,9 @@ chunks: unpetrify-ref: 1.0.1 build-depends: - yajl + submodules: + ext/libyajl2/vendor/yajl: + url: https://github.com/lloyd/yajl.git - name: chef-12.0.0.alpha.0 morph: strata/chef/chef-master.morph repo: upstream:ruby-gems/chef @@ -49,6 +52,9 @@ chunks: unpetrify-ref: master build-depends: - libyajl2-1.0.1 + submodules: + ext/libyajl2/vendored: + url: https://github.com/lloyd/yajl - name: hashie-2.1.2 morph: strata/chef/hashie-2.1.2.morph repo: upstream:ruby-gems/hashie diff --git a/strata/connman-common.morph b/strata/connman-common.morph index 415b2fa4..a1dcf76e 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -7,8 +7,8 @@ chunks: - name: connman morph: strata/connman-common/connman.morph repo: upstream:connman - ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 - unpetrify-ref: baserock/1.24 + ref: 1bfe2a8eb20101926e6dfe7f1a535b64c6fcbecb + unpetrify-ref: '1.31' - name: ofono morph: strata/connman-common/ofono.morph repo: upstream:ofono diff --git a/strata/corba.morph b/strata/corba.morph new file mode 100644 index 00000000..3164ecc0 --- /dev/null +++ b/strata/corba.morph @@ -0,0 +1,17 @@ +name: corba +kind: stratum +build-depends: + - morph: strata/core.morph +chunks: + - name: MPC + repo: upstream:MPC + morph: strata/corba/MPC.morph + ref: c2cddd1335036f1ca3610274a155d2222a8b5f7c + unpetrify-ref: ACE+TAO-6_3_4 + - name: ACE_TAO + morph: strata/corba/ace_tao.morph + repo: upstream:ATCD + ref: b9ab94b74529a926864c154675559fd6a1d8998b + unpetrify-ref: ACE+TAO-6_3_4 + build-depends: + - MPC diff --git a/strata/corba/MPC.morph b/strata/corba/MPC.morph new file mode 100644 index 00000000..84b015ec --- /dev/null +++ b/strata/corba/MPC.morph @@ -0,0 +1,6 @@ +name: MPC +kind: chunk +build-system: manual +install-commands: +- mkdir -p "$DESTDIR/usr/src/MPC" +- cp -r * "$DESTDIR/usr/src/MPC" diff --git a/strata/corba/ace_tao.morph b/strata/corba/ace_tao.morph new file mode 100644 index 00000000..bfbbb4cc --- /dev/null +++ b/strata/corba/ace_tao.morph @@ -0,0 +1,32 @@ +name: ACE_TAO +kind: chunk +build-system: manual +configure-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + cd "$TAO_ROOT" + perl "$ACE_ROOT"/bin/mwc.pl TAO_ACE.mwc -type gnuace + +build-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + echo '#include "ace/config-linux.h"' > "$ACE_ROOT"/ace/config.h + echo "include "$ACE_ROOT"/include/makeinclude/platform_linux.GNU" > "$ACE_ROOT"/include/makeinclude/platform_macros.GNU + export LD_LIBRARY_PATH="$ACE_ROOT"/lib:$LD_LIBRARY_PATH + cd "$TAO_ROOT" + make +install-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + cd "$TAO_ROOT" + make DESTDIR="$DESTDIR" INSTALL_PREFIX="$PREFIX" install +system-integration: + ACE_TAO-misc: + 00-remove-build-dependencies: + - rm -rf /usr/src/MPC diff --git a/strata/core.morph b/strata/core.morph index 55525d91..e10fd894 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -90,8 +90,8 @@ chunks: - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new - ref: 57ac73fb5d0a878f282cbcd9e7951c77fdc59e3c - unpetrify-ref: OpenSSL_1_0_1s + ref: 3d2e575b3f71b4d66c0b948d411d8e936f192127 + unpetrify-ref: OpenSSL_1_0_1t build-depends: - perl - name: bzip2 @@ -143,8 +143,8 @@ chunks: - name: curl morph: strata/core/curl.morph repo: upstream:curl - ref: 202aa9f7758636730299b86715d924f54468a908 - unpetrify-ref: curl-7_38_0 + ref: 8f995e2e0022292374fc99a2277069b08ad98b5c + unpetrify-ref: curl-7_47_1 build-depends: - autoconf - automake @@ -161,8 +161,8 @@ chunks: - name: git-minimal morph: strata/core/git-minimal.morph repo: upstream:git - ref: 9874fca7122563e28d699a911404fc49d2a24f1c - unpetrify-ref: v2.3.0 + ref: ed9067f705aa51819c7dfff7e4190dd267beaf5d + unpetrify-ref: v2.8.0-rc2 build-depends: - autoconf - python3 @@ -187,8 +187,8 @@ chunks: - name: bison morph: strata/core/bison.morph repo: upstream:bison - ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 - unpetrify-ref: baserock/v3.0.2 + ref: c4e686a1abd817b4d4da5bdd5b3a5540566fd4a0 + unpetrify-ref: v3.0.4 build-depends: - autoconf - automake @@ -197,17 +197,25 @@ chunks: - git-minimal - help2man - mini-utils + submodules: + submodules/autoconf: + url: upstream:autoconf + gnulib: + url: upstream:gnulib - name: patch morph: strata/core/patch.morph repo: upstream:patch - ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f - unpetrify-ref: baserock/v2.7.1 + ref: 3b698ab6a13fd3e5890689cd85cf41312c682f8c + unpetrify-ref: v2.7.5 build-depends: - autoconf - automake - bison - git-minimal - mini-utils + submodules: + gnulib: + url: upstream:gnulib - name: xz repo: upstream:xz ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a @@ -220,10 +228,10 @@ chunks: - gettext-tarball - libtool-tarball - name: libtool - morph: strata/core/libtool.morph repo: upstream:libtool - ref: 5e11a17c39a2a976a09c33a568431a9f7ad00d48 - unpetrify-ref: baserock/v2.4.6 + ref: f09d00cbcf924c378573163e244fffeb8d28005f + unpetrify-ref: v2.4.6 + build-system: autotools build-depends: - autoconf - automake @@ -233,6 +241,9 @@ chunks: - patch - texinfo-tarball - xz + submodules: + gnulib: + url: upstream:gnulib - name: pkg-config morph: strata/core/pkg-config.morph repo: upstream:pkg-config @@ -332,15 +343,16 @@ chunks: - file - name: libxml2 repo: upstream:libxml2 - ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7 - unpetrify-ref: v2.9.1 + ref: 6657afe83a38278f124ace71dc85f60420beb2d5 + unpetrify-ref: v2.9.3 build-system: autotools build-depends: - autoconf - automake - file - - python3 - libtool + - pkg-config + - python3 - xz - name: libxslt repo: upstream:libxslt @@ -384,7 +396,7 @@ chunks: - name: cython repo: upstream:cython ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d - unpetrify-ref: "0.22" + unpetrify-ref: '0.22' build-system: python3-distutils build-depends: - python3 diff --git a/strata/core/linux-pam.morph b/strata/core/linux-pam.morph index e6cbf642..e65caa63 100644 --- a/strata/core/linux-pam.morph +++ b/strata/core/linux-pam.morph @@ -4,6 +4,6 @@ build-system: autotools pre-configure-commands: - autoreconf -ivf configure-commands: -# libdir has to be specified or it'll go into lib64. It has to be /lib because -# systemd installs its pam library into /lib/security. -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="/lib" +# libdir has to be specified or it'll go into lib64. It has to be /usr/lib because +# systemd installs its pam library into /usr/lib/security. +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib" diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2ad2d866..a7f75129 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -10,8 +10,11 @@ chunks: - name: coreutils morph: strata/coreutils-common/coreutils.morph repo: upstream:coreutils - ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 - unpetrify-ref: baserock/8.23 + ref: 68f73f23866d6137e9c8d88d86073b33588d7b56 + unpetrify-ref: v8.25 + submodules: + gnulib: + url: upstream:gnulib - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed @@ -19,6 +22,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - coreutils + submodules: + gnulib: + url: upstream:gnulib - name: diff morph: strata/coreutils-common/diff.morph repo: upstream:diffutils @@ -26,6 +32,9 @@ chunks: unpetrify-ref: baserock/v3.3 build-depends: - coreutils + submodules: + gnulib: + url: upstream:gnulib - name: tar morph: strata/coreutils-common/tar.morph repo: upstream:tar @@ -33,8 +42,26 @@ chunks: unpetrify-ref: baserock/release_1_28 build-depends: - coreutils + submodules: + paxutils: + url: upstream:paxutils + gnulib: + url: upstream:gnulib - name: findutils - morph: strata/coreutils-common/findutils.morph repo: upstream:findutils - ref: ee6b25541336f9d74624ca814538ddc8c67f0732 - unpetrify-ref: baserock/v4.5.14 + ref: 992a6b62ab8061531dc0ad40325b8e4c222fce66 + unpetrify-ref: v4.6.0 + build-system: autotools + submodules: + gnulib: + url: upstream:gnulib +- name: less + repo: upstream:less + ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 + unpetrify-ref: baserock/morph + build-system: autotools +- name: jq + repo: upstream:jq + ref: a5b5cbefb83935ce95ec62b9cadc8ec73026d33a + unpetrify-ref: jq-1.5 + build-system: autotools diff --git a/strata/coreutils-common/findutils.morph b/strata/coreutils-common/findutils.morph deleted file mode 100644 index c9ba5ab6..00000000 --- a/strata/coreutils-common/findutils.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: findutils -kind: chunk -build-system: autotools -pre-configure-commands: -- ./import-gnulib.sh -d gnulib diff --git a/strata/cpp-common-libs.morph b/strata/cpp-common-libs.morph new file mode 100644 index 00000000..470f0155 --- /dev/null +++ b/strata/cpp-common-libs.morph @@ -0,0 +1,11 @@ +name: cpp-common-libs +kind: stratum +description: C++ common libraries +build-depends: +- morph: strata/python2-core.morph +chunks: +- name: boost + morph: strata/cpp-common-libs/boost.morph + repo: upstream:boost-tarball + ref: ed232fdd34968697a68783b3195b1da4226915b5 + unpetrify-ref: boost_1_57_0 diff --git a/strata/genivi-demo-platform-libs/boost.morph b/strata/cpp-common-libs/boost.morph index 49c0590e..6aaee8ad 100644 --- a/strata/genivi-demo-platform-libs/boost.morph +++ b/strata/cpp-common-libs/boost.morph @@ -1,5 +1,6 @@ name: boost kind: chunk +build-system: manual configure-commands: - ./bootstrap.sh build-commands: diff --git a/strata/devtools.morph b/strata/devtools.morph index ae50096b..41dd501c 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -30,11 +30,6 @@ chunks: repo: upstream:screen ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 unpetrify-ref: baserock/morph -- name: less - repo: upstream:less - ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 - unpetrify-ref: baserock/morph - build-system: autotools - name: git-review repo: upstream:git-review ref: 79262a52301c146a6b60d09a828661a83a5f5ba7 @@ -43,13 +38,16 @@ chunks: - name: wget morph: strata/devtools/wget.morph repo: upstream:wget - ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f - unpetrify-ref: baserock/v1.16.3 + ref: f65f522f58606f125535306e712c2c29921ee8b4 + unpetrify-ref: v1.17.1 + submodules: + gnulib: + url: upstream:gnulib - name: git morph: strata/devtools/git.morph repo: upstream:git - ref: 9874fca7122563e28d699a911404fc49d2a24f1c - unpetrify-ref: v2.3.0 + ref: ed9067f705aa51819c7dfff7e4190dd267beaf5d + unpetrify-ref: v2.8.0-rc2 - name: iotop repo: upstream:iotop ref: 59e2537794d91c1375d391293f8fd89ca8b794a8 diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph index 6ca079a5..40945640 100644 --- a/strata/devtools/git.morph +++ b/strata/devtools/git.morph @@ -7,3 +7,5 @@ build-commands: - make all doc install-commands: - make install install-doc +post-install-commands: +- install -D -m 644 -t "$DESTDIR"/etc/bash_completion.d/. contrib/completion/git-completion.bash diff --git a/strata/elixir.morph b/strata/elixir.morph new file mode 100644 index 00000000..dd46ed64 --- /dev/null +++ b/strata/elixir.morph @@ -0,0 +1,11 @@ +name: elixir +kind: stratum +description: stratum for elixir +build-depends: +- morph: strata/erlang.morph +chunks: +- name: elixir + morph: strata/elixir/elixir.morph + repo: upstream:elixir + ref: 737ac62926db7a692e2fe67c27b696cfd0866674 + unpetrify-ref: v1.2.3 diff --git a/strata/elixir/elixir.morph b/strata/elixir/elixir.morph new file mode 100644 index 00000000..1efbea87 --- /dev/null +++ b/strata/elixir/elixir.morph @@ -0,0 +1,6 @@ +name: elixir +kind: chunk +build-commands: +- make clean +install-commands: +- make install diff --git a/strata/erlang.morph b/strata/erlang.morph index 5eae200b..3aad68e8 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -7,8 +7,8 @@ chunks: - name: erlang morph: strata/erlang/erlang.morph repo: upstream:erlang - ref: 9417f044ee3c291c2ea343c203aebdcc40597226 - unpetrify-ref: OTP-17.3.4 + ref: 1ab69efa960703b86a13ea6ba96f4fd56f1565f9 + unpetrify-ref: OTP-18.3.3 - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/strata/fail2ban-common.morph b/strata/fail2ban-common.morph new file mode 100644 index 00000000..a6d1b175 --- /dev/null +++ b/strata/fail2ban-common.morph @@ -0,0 +1,14 @@ +name: fail2ban-common +kind: stratum +description: | + This stratum only installs fail2ban. You will need to + configure it afterwards. It's recommended to include + iptables in the system too. +build-depends: +- morph: strata/core.morph +chunks: +- name: fail2ban + morph: strata/fail2ban-common/fail2ban.morph + repo: upstream:fail2ban + ref: 70ba5cb0054f0869930b8cd2dc1bb836653dd289 + unpetrify-ref: "0.9.3" diff --git a/strata/fail2ban-common/fail2ban.morph b/strata/fail2ban-common/fail2ban.morph new file mode 100644 index 00000000..2f267a5a --- /dev/null +++ b/strata/fail2ban-common/fail2ban.morph @@ -0,0 +1,6 @@ +name: fail2ban +kind: chunk +build-system: python3-distutils +post-install-commands: +- install -D -m 640 files/fail2ban.service "$DESTDIR"/"$PREFIX"/lib/systemd/system/fail2ban.service +- install -D -m 640 files/fail2ban-tmpfiles.conf "$DESTDIR"/"$PREFIX"/lib/tmpfiles.d/fail2ban.conf diff --git a/strata/foundation.morph b/strata/foundation.morph index be983cca..64e021c1 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -7,7 +7,7 @@ chunks: - name: bash-completion repo: upstream:bash-completion ref: 3085c7e12179817a02a611016606391295c69942 - unpetrify-ref: "2.1" + unpetrify-ref: '2.1' build-system: autotools - name: groff morph: strata/foundation/groff.morph @@ -17,8 +17,8 @@ chunks: - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod - ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 - unpetrify-ref: v18 + ref: 42f32b8ae45ad8e3a1da29c9b20af9b5e2e9e676 + unpetrify-ref: v22 - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz @@ -27,8 +27,8 @@ chunks: - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils - ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 - unpetrify-ref: baserock/morph + ref: 37c9315c504f266c23d51e62e59d32422dbbe9e7 + unpetrify-ref: v3.4.1 - name: dbus-pre morph: strata/foundation/dbus-pre.morph repo: upstream:dbus @@ -40,34 +40,38 @@ chunks: ref: d77c33ae608d67086ea057cca5ddee99a7202f8b unpetrify-ref: libgpg-error-1.19 - name: libgcrypt + morph: strata/foundation/libgcrypt.morph repo: upstream:libgcrypt - ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 - build-system: autotools + ref: e74d6f537498fea347b6073ba90c55d2693c4696 + unpetrify-ref: baserock/libgcrypt-1.5.5 build-depends: - libgpg-error - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: c379f143a5ccdbc94a87cfca0174e7f21fa05f26 - unpetrify-ref: v227 + ref: 95adafc428b5b4be0ddd4d43a7b96658390388bc + unpetrify-ref: v229 build-depends: - dbus-pre - kmod - libgcrypt - name: libusb repo: upstream:libusb - ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 - unpetrify-ref: v1.0.19 + ref: 01d6a03f417eb5dbac6ce039febdabdc4954c763 + unpetrify-ref: baserock/v1.0.20+parallel-build-fix build-system: autotools build-depends: - systemd - name: usbutils repo: upstream:usbutils - ref: c37f146eb2c6642c600f1b025a6d56996b0697ff - unpetrify-ref: baserock/v008 + ref: 3bafa6940f512357d7aa54d3a76de01662a19e48 + unpetrify-ref: v008 build-system: autotools build-depends: - libusb + submodules: + usbhid-dump: + url: upstream:usbhid-dump - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo @@ -76,8 +80,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 - unpetrify-ref: baserock/morph + ref: e9b2eec7c5856032652bb8ff734174764e444c74 + unpetrify-ref: baserock/fuse_2_9_4-fix-armv8 - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs @@ -109,3 +113,15 @@ chunks: repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 +- name: python-systemd + build-system: python3-distutils + repo: upstream:python-packages/python-systemd + ref: 8ccd64789ab030b76a99b578b5b1e9812b7a8cd8 + unpetrify-ref: v231 + build-depends: + - systemd +- name: libarchive + morph: strata/foundation/libarchive.morph + repo: upstream:libarchive + ref: 19f23e191f9d3e1dd2a518735046100419965804 + unpetrify-ref: v3.1.2 diff --git a/strata/genivi/libarchive.morph b/strata/foundation/libarchive.morph index bf840f58..bf840f58 100644 --- a/strata/genivi/libarchive.morph +++ b/strata/foundation/libarchive.morph diff --git a/strata/core/libtool.morph b/strata/foundation/libgcrypt.morph index 04263ac9..78018a48 100644 --- a/strata/core/libtool.morph +++ b/strata/foundation/libgcrypt.morph @@ -1,5 +1,5 @@ -name: libtool +name: libgcrypt kind: chunk build-system: autotools pre-configure-commands: -- ./bootstrap +- autoreconf -fi diff --git a/strata/foundation/openssh.morph b/strata/foundation/openssh.morph index 45339156..7d38791f 100644 --- a/strata/foundation/openssh.morph +++ b/strata/foundation/openssh.morph @@ -24,6 +24,9 @@ install-commands: - chmod go= "$DESTDIR"/var/lib/sshd - install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen" - install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id" -- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" -- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service" -- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service" +- mkdir -p "$DESTDIR$PREFIX/lib/systemd/system/" +- install -m 644 opensshd.service "$DESTDIR$PREFIX/lib/systemd/system/opensshd.service" +system-integration: + openssh-misc: + 00-enable-opensshd-unit: + - systemctl enable opensshd diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 04a04c62..ae1f6a14 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -2,25 +2,20 @@ name: systemd kind: chunk build-system: autotools configure-commands: -- sh autogen.sh +- ./autogen.sh # KILL added because it picks up /usr/bin/kill, which is not installed on # all systems -- | - KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --enable-compat-libs \ - --disable-tests --sysconfdir=/etc --localstatedir=/var \ - --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ - --with-rootprefix= --with-rootlibdir=/lib -install-commands: -- make DESTDIR="$DESTDIR" install +- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var + --disable-manpages + --disable-tests + --libexecdir="$PREFIX/libexec" + --enable-split-usr +post-install-commands: - mkdir -p "$DESTDIR"/sbin -- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init -- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl +- ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init +- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/bin/systemctl "$DESTDIR/sbin/$f"; done -- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service" -- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" - >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" -post-install-commands: - | cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" [Match] diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph index 598180b2..5ddc0d1b 100644 --- a/strata/genivi-demo-platform-libs.morph +++ b/strata/genivi-demo-platform-libs.morph @@ -6,11 +6,6 @@ build-depends: - morph: strata/python-pygobject.morph - morph: strata/audio-bluetooth.morph chunks: -- name: boost - morph: strata/genivi-demo-platform-libs/boost.morph - repo: upstream:boost-tarball - ref: ed232fdd34968697a68783b3195b1da4226915b5 - unpetrify-ref: boost_1_57_0 - name: dbus-c++ morph: strata/genivi-demo-platform-libs/dbus-c++.morph repo: upstream:dbus-c++ diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 4da796e6..f58b8a6b 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -15,11 +15,9 @@ chunks: repo: upstream:genivi/browser-poc ref: d90501f8bd3edcd35eae72efbfb4583ba8f3cdfc unpetrify-ref: baserock/genivi/genivi-demo-platform -- name: automotive-message-broker - morph: strata/genivi-demo-platform/automotive-message-broker.morph - repo: upstream:automotive-message-broker - ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 - unpetrify-ref: '0.14' + submodules: + documentation/designdocument/cls: + url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager @@ -40,5 +38,5 @@ chunks: - name: genivi-demo-platform-hmi morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph repo: upstream:genivi/genivi-demo-platform-hmi - ref: f56acfadb5400087c1bb935406fcb005e315f27f - unpetrify-ref: baserock/weston-1.9-wip + ref: fd2c954165b0c0f7f4d9e94e8c9c3c8541a53e79 + unpetrify-ref: master diff --git a/strata/genivi.morph b/strata/genivi.morph index f33394f8..b0442120 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -13,8 +13,8 @@ chunks: - name: DLT-daemon morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon - ref: 8b48e73f79b4463393916e4c6696917e3dedd026 - unpetrify-ref: v2.10.0 + ref: e9a486a08fff6d3cc7133a350cec3ee10f463207 + unpetrify-ref: v2.15.0 - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller @@ -48,8 +48,8 @@ chunks: - genivi-common-api-runtime - name: audiomanager repo: upstream:audiomanager - ref: 8725157e248c6706de59a02996f869b6ccdccb13 - unpetrify-ref: '7.0' + ref: 49e010d6bd40929b00c4855ec3aab4cbafca906e + unpetrify-ref: '7.3' build-system: cmake build-depends: - DLT-daemon @@ -71,10 +71,10 @@ chunks: - itzam-tarball - DLT-daemon - name: persistence-client-library - morph: strata/genivi/persistence-client-library.morph repo: upstream:genivi/persistence-client-library - ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80 - unpetrify-ref: baserock/v1.0.0 + ref: 4b503da99c6b04ad21a197dafe6e7243187c7c7e + unpetrify-ref: v1.1.0 + build-system: autotools build-depends: - persistence-common-object - DLT-daemon @@ -87,11 +87,6 @@ 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 @@ -100,7 +95,6 @@ chunks: build-depends: - persistence-common-object - DLT-daemon - - libarchive - node-state-manager - name: node-health-monitor repo: upstream:genivi/node-health-monitor diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph index d16c42ea..19ffd3b5 100644 --- a/strata/genivi/DLT-daemon.morph +++ b/strata/genivi/DLT-daemon.morph @@ -2,4 +2,6 @@ name: DLT-daemon kind: chunk build-system: cmake configure-commands: -- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_SYSTEMD=ON +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" + -DCMAKE_INSTALL_LIBDIR="$PREFIX/lib" + -DWITH_SYSTEMD=ON diff --git a/strata/genivi/persistence-client-library.morph b/strata/genivi/persistence-client-library.morph deleted file mode 100644 index 196572f2..00000000 --- a/strata/genivi/persistence-client-library.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: persistence-client-library -kind: chunk -build-system: autotools -configure-commands: -# Configure library name. We are supposed to change them in this version of -# persistence-client-library. -# The need of doing this has been fixed upstream in the following commit: -# http://git.projects.genivi.org/?p=persistence/persistence-client-library.git;a=commitdiff;h=6b208bfc268890360fcbd5cede70da5d2f9fb459 -# Once we upgrade we can drop this `sed` -- sed -i 's/libpers_common.so.1/libpers_common.so/' config/pclCustomLibConfigFile.cfg -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-werror diff --git a/strata/gnome.morph b/strata/gnome.morph index 6648e9b8..84d89e0e 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -216,6 +216,9 @@ chunks: - libnotify - lcms2 - upower + submodules: + plugins/media-keys/gvc: + url: upstream:gnome/libgnome-volume-control - name: zenity repo: upstream:zenity ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50 @@ -347,12 +350,15 @@ chunks: - name: gnome-online-accounts morph: strata/gnome/gnome-online-accounts.morph repo: upstream:gnome/gnome-online-accounts - ref: 167ada60a66a0ed851bb65335a46570cf071115a - unpetrify-ref: baserock/3.18.1 + ref: d08463aefde22f36898f4e79798d365359e57614 + unpetrify-ref: 3.18.1 build-depends: - librest - telepathy-glib - WebKitGtk + submodules: + telepathy-account-widgets: + url: upstream:gnome/telepathy-account-widgets - name: liboauth repo: upstream:liboauth ref: 9ff9d2902caf8a85c5019c11214d73e67053ba69 @@ -374,8 +380,8 @@ chunks: - name: evolution-data-server morph: strata/gnome/evolution-data-server.morph repo: upstream:evolution-data-server - ref: 658d6e37796984bf05e275413726ad3b71083ccf - unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_3 + ref: c7e3eb0e4e773e706ab170b9bfb1089ed1546eda + unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_5 build-depends: - gnome-online-accounts - krb5 @@ -447,6 +453,11 @@ chunks: - startup-notification - telepathy-glib - network-manager-applet + submodules: + src/gvc: + url: upstream:gnome/libgnome-volume-control + data/theme/gnome-shell-sass: + url: upstream:gnome/gnome-shell-sass - name: gnome-session morph: strata/gnome/gnome-session.morph repo: upstream:gnome/gnome-session @@ -464,8 +475,8 @@ chunks: - name: accountsservice morph: strata/gnome/accountsservice.morph repo: upstream:accountsservice - ref: 36b424b4aad91aaf91eeb6b6285cf550b15fcfeb - unpetrify-ref: master + ref: 1b91edfe9db81e75d0f08e98c6909cdf34c9e91e + unpetrify-ref: baserock/0.6.40-8-gcad21b1+libsystemd_fix - name: gdm morph: strata/gnome/gdm.morph repo: upstream:gdm @@ -537,11 +548,14 @@ chunks: - vte - gnome-desktop - gsettings-desktop-schemas + submodules: + libgd: + url: upstream:gnome/libgd - name: desktop-file-utils morph: strata/gnome/desktop-file-utils.morph repo: upstream:desktop-file-utils ref: 4944725bddcf5821d53d7d648fc53347ce12cc03 - unpetrify-ref: "0.22" + unpetrify-ref: '0.22' - name: gnome-terminal morph: strata/gnome/gnome-terminal.morph repo: upstream:gnome/gnome-terminal @@ -561,11 +575,14 @@ chunks: build-system: autotools - name: farstream repo: upstream:farstream - ref: 9247c10816835dc76269baa7c4c8996ae1a2fac3 - unpetrify-ref: baserock/0.2.7 + ref: 01fafe82fbc01f31e76623fbbbe6dd99eb28d6bb + unpetrify-ref: 0.2.7 build-system: autotools build-depends: - libnice + submodules: + common: + url: upstream:gstreamer-common - name: telepathy-farstream repo: upstream:telepathy-farstream ref: 0b1bba79cfe94e7676fe69e9e0d2e3983a3c14c5 @@ -577,18 +594,24 @@ chunks: - name: telepathy-gabble morph: strata/gnome/telepathy-gabble.morph repo: upstream:telepathy-gabble - ref: 91d890ef3f269e92ea3a2a265597293e056e842c - unpetrify-ref: baserock/telepathy-gabble-0.18.3 + ref: f10f557fd67ec11738670828a553496960c0d411 + unpetrify-ref: telepathy-gabble-0.18.3 build-depends: - libnice - telepathy-glib + submodules: + lib/ext/wocky: + url: upstream:wocky - name: telepathy-salut morph: strata/gnome/telepathy-salut.morph repo: upstream:telepathy-salut - ref: e554f3c595307f665e5c2dd464f1baf0120ab43d - unpetrify-ref: baserock/telepathy-salut-0.8.1 + ref: cd32e00a3a461756cbf1f6899a0c2aa5bd5d79ee + unpetrify-ref: telepathy-salut-0.8.1 build-depends: - telepathy-glib + submodules: + lib/ext/wocky: + url: upstream:wocky - name: telepathy-idle repo: upstream:telepathy-idle ref: 55e9841a4af51d7f014395475526b700abec4d0b @@ -642,11 +665,6 @@ chunks: build-depends: - libcanberra - libnotify -- name: libarchive - morph: strata/gnome/libarchive.morph - repo: upstream:libarchive - ref: 19f23e191f9d3e1dd2a518735046100419965804 - unpetrify-ref: v3.1.2 - name: gcab repo: upstream:gnome/gcab ref: e57dd3d1ddb0da91df9188c2a98d59d1050ac6cb @@ -662,7 +680,6 @@ chunks: build-system: autotools build-depends: - gcab - - libarchive - name: gnome-color-manager morph: strata/gnome/gnome-color-manager.morph repo: upstream:gnome/gnome-color-manager @@ -706,8 +723,8 @@ chunks: - name: gnome-control-center morph: strata/gnome/gnome-control-center.morph repo: upstream:gnome/gnome-control-center - ref: f00c05ba3b3c7aa328d7970b73a784739cef560a - unpetrify-ref: baserock/3.18 + ref: 49da7d8089298ba9e15d8e025db606278802d5ac + unpetrify-ref: GNOME_CONTROL_CENTER_3_18_0 build-depends: - accountsservice - cheese @@ -728,6 +745,11 @@ chunks: - libgtop - libpwquality - network-manager-applet + submodules: + libgd: + url: upstream:gnome/libgd + panels/sound/gvc: + url: upstream:gnome/libgnome-volume-control - name: gnome-initial-setup morph: strata/gnome/gnome-initial-setup.morph repo: upstream:gnome/gnome-initial-setup @@ -756,7 +778,7 @@ chunks: build-system: autotools repo: upstream:sound-theme-freedesktop ref: 9d2ac65a2f88263f0eec8b777ef3bdc023b93c25 - unpetrify-ref: "0.8" + unpetrify-ref: '0.8' - name: libwnck morph: strata/gnome/libwnck.morph repo: upstream:libwnck @@ -793,8 +815,8 @@ chunks: - WebKitGtk - name: totem repo: upstream:gnome/totem - ref: 77cf0b9d3de4fd3a48492c77e25308d6c411b651 - unpetrify-ref: baserock/V_3_18_1 + ref: dc21ef2e61f7e8a085a0f98eeec808b6424af988 + unpetrify-ref: V_3_18_1 build-system: autotools build-depends: - appstream-glib @@ -808,9 +830,12 @@ chunks: - iso-codes - libpeas - yelp-tools + submodules: + libgd: + url: upstream:gnome/libgd - name: yelp repo: upstream:gnome/yelp - morph: strata/gnome/yelp.morph + morph: strata/gnome/yelp.morph ref: 9932283ce9610f969e023a0dc326c81159c06a15 unpetrify-ref: 3.18.1 build-depends: @@ -832,8 +857,8 @@ chunks: - yelp-tools - name: gedit repo: upstream:gnome/gedit - ref: 4b318c265d71eca3572920bb159dcda9aa9f9184 - unpetrify-ref: baserock/3.18.2 + ref: 8156d35a6eb27f3251e1ea454a48cb2a2ae4f87c + unpetrify-ref: 3.18.2 build-system: autotools build-depends: - gsettings-desktop-schemas @@ -841,6 +866,9 @@ chunks: - iso-codes - libpeas - yelp-tools + submodules: + libgd: + url: upstream:gnome/libgd - name: gnome-calendar repo: upstream:gnome/gnome-calendar ref: 5292e9d57442067701ce94eea54b4b12d13b7aa3 @@ -862,8 +890,8 @@ chunks: - name: empathy morph: strata/gnome/empathy.morph repo: upstream:gnome/empathy - ref: facd02a2cf3c0d2778b10626362b29e2a6df546a - unpetrify-ref: baserock/EMPATHY_3_12_11 + ref: 1245792e78ab67683349d376f4b7b5a2a02a0b9f + unpetrify-ref: EMPATHY_3_12_11 build-depends: - cheese - clutter @@ -882,10 +910,13 @@ chunks: - telepathy-logger - telepathy-mission-control - yelp-tools + submodules: + telepathy-account-widgets: + url: upstream:gnome/telepathy-account-widgets - name: gnome-contacts repo: upstream:gnome/gnome-contacts - ref: 3715ec79662989038d5055bb74aa0b728b40edb5 - unpetrify-ref: baserock/3.18.0 + ref: fa736997cc7ec8df89458502c0a181090def64e9 + unpetrify-ref: 3.18.0 build-system: autotools build-depends: - cheese @@ -895,6 +926,9 @@ chunks: - libchamplain - libnotify - telepathy-glib + submodules: + libgd: + url: upstream:gnome/libgd - name: gnome-maps repo: upstream:gnome/gnome-maps ref: 6d6e8afd54735e565a0c81cb761f22bb82d142db @@ -950,8 +984,8 @@ chunks: - name: evolution morph: strata/gnome/evolution.morph repo: upstream:gnome/evolution - ref: 579583275620be75afdedcde909a82fd96136188 - unpetrify-ref: EVOLUTION_3_18_3 + ref: 6a02c7980589cf24de90c29556bc84ee2f57b832 + unpetrify-ref: EVOLUTION_3_18_5_2 build-depends: - evolution-data-server - clutter-gtk diff --git a/strata/gnome/cracklib.morph b/strata/gnome/cracklib.morph index 6b373cfa..fe204255 100644 --- a/strata/gnome/cracklib.morph +++ b/strata/gnome/cracklib.morph @@ -7,7 +7,7 @@ configure-commands: - cd src && ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-default-dict=/lib/cracklib/pw_dict build-commands: - make -C src -- make -C words +- make -C words cracklib-words.gz install-commands: - make -C src install - install -m644 -D words/cracklib-words.gz $DESTDIR$PREFIX/share/dict/cracklib-words.gz diff --git a/strata/gnome/libarchive.morph b/strata/gnome/libarchive.morph deleted file mode 100644 index bf840f58..00000000 --- a/strata/gnome/libarchive.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libarchive -kind: chunk -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-acl diff --git a/strata/ivi-common.morph b/strata/ivi-common.morph new file mode 100644 index 00000000..80c519b1 --- /dev/null +++ b/strata/ivi-common.morph @@ -0,0 +1,12 @@ +name: ivi-common +kind: stratum +description: Components shared with different IVI systems +build-depends: +- morph: strata/cpp-common-libs.morph +- morph: strata/glib-common.morph +chunks: +- name: automotive-message-broker + morph: strata/ivi-common/automotive-message-broker.morph + repo: upstream:automotive-message-broker + ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 + unpetrify-ref: '0.14' diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/ivi-common/automotive-message-broker.morph index 2516cf29..50428735 100644 --- a/strata/genivi-demo-platform/automotive-message-broker.morph +++ b/strata/ivi-common/automotive-message-broker.morph @@ -1,6 +1,6 @@ name: automotive-message-broker kind: chunk -description: The GENIVI Automotive Message Broker +description: Automotive Message Broker framework build-system: cmake post-install-commands: - mkdir -p "$DESTDIR/usr/lib/systemd/system" @@ -9,12 +9,12 @@ post-install-commands: [Unit] Description=Automotive Message Broker After=syslog.target - + [Service] Type=dbus BusName=org.automotive.message.broker ExecStart=/usr/bin/ambd - + [Install] WantedBy=multi-user.target EOF diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 57e34185..f0316824 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -12,5 +12,5 @@ chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: 05ce93f191039df06a812a085476ba60af5a2cb6 + ref: f271373b9b93037d9183d777f34d55d1bc2310b7 unpetrify-ref: master diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 092ff3ca..e0562a00 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -11,8 +11,8 @@ chunks: - name: mesa morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: 7bcd827806b0816d61122ba3d37dd40178d96d98 - unpetrify-ref: mesa-11.1.2 + ref: ff9ddb9eb1b3b25f40e71a95bb48421abfcb11d9 + unpetrify-ref: mesa-11.2.0 - name: libepoxy repo: upstream:libepoxy ref: e2c33af5bfcfc9d168f9e776156dd47c33f428b3 diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index ebcf0a78..41a962b4 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -5,7 +5,7 @@ configure-commands: - | cpu=$(echo $TARGET | cut -d '-' -f 1) case "$cpu" in - armv7lhf) + arm*) DRIDRIVERS=no GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4 ;; diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 25983404..f713ba18 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -37,7 +37,7 @@ chunks: build-system: python-distutils - name: morph repo: baserock:baserock/morph - ref: 535443bcfa78568ecdd091a57e4aff64bfbf9638 + ref: 74e8d1b9aeb47d957d526250784d2c0087e59bf9 unpetrify-ref: master build-system: python-distutils build-depends: diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index a9c84ca4..390f3933 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -14,24 +14,33 @@ chunks: build-system: autotools - name: gstreamer@0.10 repo: upstream:gstreamer - ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f - unpetrify-ref: baserock/morph/0.10 + ref: 76fc67b18c38e7f6c9cfacc4e4d0ed11d3b2c548 + unpetrify-ref: "0.10" build-system: autotools build-depends: - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-base@0.10 repo: upstream:gstreamer-plugins-base - ref: 960c596309dbb983a1d733259adccc45c47006a2 - unpetrify-ref: baserock/morph/0.10 + ref: 1e1e6eaf3f0dd11f6618154d9739cbe3e007d206 + unpetrify-ref: "0.10" build-system: autotools build-depends: - gstreamer@0.10 + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-good@0.10 repo: upstream:gstreamer-plugins-good - ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3 - unpetrify-ref: baserock/morph/0.10 + ref: 5af6f5bfb6c3619a9ccc3b1681579aeb90e8b89a + unpetrify-ref: "0.10" build-system: autotools build-depends: - gstreamer@0.10 - gstreamer-plugins-base@0.10 - orc + submodules: + common: + url: upstream:gstreamer-common diff --git a/strata/multimedia-gstreamer-openmax-generic.morph b/strata/multimedia-gstreamer-openmax-generic.morph index 9d21a0db..1a006971 100644 --- a/strata/multimedia-gstreamer-openmax-generic.morph +++ b/strata/multimedia-gstreamer-openmax-generic.morph @@ -7,5 +7,8 @@ chunks: - name: gst-omx morph: strata/multimedia-gstreamer-openmax-generic/gst-omx.morph repo: upstream:gst-omx - ref: baserock/1.2.0 - unpetrify-ref: baserock/1.2.0 + ref: b4c7c726ef443cf8a89df26026706e391846bb4a + unpetrify-ref: 1.2.0 + submodules: + common: + url: upstream:gstreamer-common diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 0cef379e..81c59f73 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -11,47 +11,64 @@ chunks: - name: orc morph: strata/multimedia-gstreamer/orc.morph repo: upstream:orc - ref: 1a3af3cb4daeb6802197a7854507d6ee8bc9a06b - unpetrify-ref: orc-0.4.24 + ref: 831886d1f70d3cc21a913b2e335da38af4cae524 + unpetrify-ref: orc-0.4.25 - name: gstreamer repo: upstream:gstreamer - ref: 3119e6bb4b574a01921da2e652d2910d98a6eb27 - unpetrify-ref: baserock/1.6.3 + ref: 1abf889dddc75b4e4db2f4505a4287cb20878d27 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-base repo: upstream:gstreamer-plugins-base - ref: 644cd58c5a1142580ad133a5122986581cf4d8ef - unpetrify-ref: baserock/1.6.3 + ref: d67525d594d592e01f13be3c498fef891d11cbf3 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-good repo: upstream:gstreamer-plugins-good - ref: e6fb1b485dd2726e6c65d938c5ea4d002cf1036e - unpetrify-ref: baserock/1.6.3 + ref: 7b809209f7abc07fca51addb60bd499fa8693eed + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer - gstreamer-plugins-base - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-bad repo: upstream:gstreamer-plugins-bad - ref: 9a2e845040c3aafff00159a6b0031e123cad4b2f - unpetrify-ref: baserock/1.6.3 + ref: 740d3507eaf4381ba80de18b607bbd732bccca65 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer - gstreamer-plugins-base - orc + submodules: + common: + url: upstream:gstreamer-common - name: gst-libav morph: strata/multimedia-gstreamer/gst-libav.morph repo: upstream:gst-libav - ref: ac8afa33d47e10246d9b7329f39dc53b4bd4711e - unpetrify-ref: baserock/1.6.3 + ref: 2d362cc9206785bab4d20c7e375b9c8872d60f95 + unpetrify-ref: 1.8.0 build-depends: - gstreamer - gstreamer-plugins-base - orc + submodules: + gst-libs/ext/libav: + url: upstream:ffmpeg + common: + url: upstream:gstreamer-common diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph index 421d55e5..83a32f70 100644 --- a/strata/multimedia-hardware-codecs-x86.morph +++ b/strata/multimedia-hardware-codecs-x86.morph @@ -21,8 +21,11 @@ chunks: - libva - name: gstreamer-vaapi repo: upstream:gstreamer-vaapi - ref: a5842bbcfae873306f52c60386ea06357a4cb9d0 - unpetrify-ref: baserock/1.6.0 + ref: 4f62bf5a5e729ca851223b82d88a7f8c0b321de9 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - libva + submodules: + common: + url: upstream:gstreamer-common diff --git a/strata/network-security.morph b/strata/network-security.morph index caf4a08b..14490ba5 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -36,9 +36,12 @@ chunks: - name: gnutls morph: strata/network-security/gnutls.morph repo: upstream:gnutls - ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6 - unpetrify-ref: baserock/gnutls_3_4_6 + ref: a9bcd4881a539e64bd948eff3fa3434e23973262 + unpetrify-ref: gnutls_3_4_6 build-depends: - nettle - libtasn1 - p11-kit + submodules: + devel/openssl: + url: upstream:openssl-new diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 2cc262c8..91ea24eb 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -14,8 +14,8 @@ chunks: build-system: python-distutils - name: cffi repo: upstream:python-packages/cffi - ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 - unpetrify-ref: master + ref: 40b9759b5bbf9f6a4efa1168acc9a60890527f6f + unpetrify-ref: release-1.6 build-system: python-distutils build-depends: - pycparser @@ -47,8 +47,8 @@ chunks: build-system: python-distutils - name: cryptography repo: upstream:python-packages/cryptography - ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f - unpetrify-ref: 0.7.2 + ref: afcd8f5ad8eb21f13be308c5183ef34ad28f9987 + unpetrify-ref: 1.3.2 build-system: python-distutils build-depends: - pyasn1 diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index a26a6729..ac7ed111 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -13,7 +13,7 @@ chunks: morph: strata/openstack-services/erlang-sd_notify.morph repo: upstream:erlang-modules/erlang-sd_notify ref: 99f4689c2c18570680329f822591f95f9341ca10 - unpetrify-ref: "0.1" + unpetrify-ref: '0.1' - name: rabbitmq-codegen morph: strata/openstack-services/rabbitmq-codegen.morph ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32 @@ -43,6 +43,11 @@ chunks: unpetrify-ref: baserock/v1.6.1 build-depends: - py-amqp + submodules: + rabbitmq-codegen: + url: upstream:rabbitmq-codegen.git + rabbitmq-c: + url: upstream:python-packages/rabbitmq-c-github-ask.git - name: anyjson repo: upstream:python-packages/anyjson ref: 016506078e94718e1fe750eb5083ab5ba07498c8 @@ -125,6 +130,9 @@ chunks: ref: cce3ebd658f28aeb7dd54561554dedf5259303dc unpetrify-ref: baserock/v0.5.4 build-system: python-distutils + submodules: + ext/spec: + url: upstream:mustache-spec - name: pies repo: upstream:python-packages/pies.git ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c @@ -189,7 +197,7 @@ chunks: - name: repoze-lru repo: upstream:python-packages/repoze-lru ref: 29c8281dee7fe8dae8c66c7c40ce7c058ec2ab0f - unpetrify-ref: "0.6" + unpetrify-ref: '0.6' build-system: python-distutils - name: routes repo: upstream:python-packages/routes @@ -206,7 +214,7 @@ chunks: - name: tempita repo: upstream:python-packages/tempita ref: b2b67795a009e9f825cbd855d766b78a00273f10 - unpetrify-ref: "0.5" + unpetrify-ref: '0.5' build-system: python-distutils - name: numpy repo: upstream:python-packages/numpy.git @@ -215,6 +223,11 @@ chunks: build-system: python-distutils build-depends: - sphinx + submodules: + doc/sphinxext: + url: upstream:numpydoc.git + doc/scipy-sphinx-theme: + url: upstream:scipy-sphinx-theme.git - name: websockify repo: upstream:python-packages/websockify ref: 2f025741f86419d4ad5702dabf5903db3dbfe77c @@ -222,6 +235,9 @@ chunks: build-system: python-distutils build-depends: - numpy + submodules: + include/web-socket-js-project: + url: upstream:web-socket-js.git - name: httplib2 repo: upstream:python-packages/httplib2 ref: f9f797223d075874b0031aea832152688ec23fef @@ -245,7 +261,7 @@ chunks: - name: python-pexpect repo: upstream:python-packages/pexpect ref: 671417beb41c21f772687c565196fdde444b053b - unpetrify-ref: "3.3" + unpetrify-ref: '3.3' build-system: python-distutils - name: ply repo: upstream:python-packages/ply.git @@ -355,7 +371,7 @@ chunks: - name: aioeventlet repo: upstream:python-packages/aioeventlet ref: 3cac0d7740592a380a7dadb2ddcdda000cae2bda - unpetrify-ref: "0.4" + unpetrify-ref: '0.4' build-system: python-distutils build-depends: - trollius @@ -409,7 +425,7 @@ chunks: - name: happybase repo: upstream:python-packages/happybase ref: 90a4b7ef741f0ecfe5145693f64c6f7180b9ba3d - unpetrify-ref: "0.8" + unpetrify-ref: '0.8' build-system: python-distutils build-depends: - thrift @@ -713,7 +729,7 @@ chunks: - name: pint repo: upstream:python-packages/pint ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73 - unpetrify-ref: "0.6" + unpetrify-ref: '0.6' build-system: python-distutils - name: horizon morph: strata/openstack-services/horizon.morph @@ -730,6 +746,9 @@ chunks: repo: upstream:novnc ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4 unpetrify-ref: baserock/v0.5.1 + submodules: + include/web-socket-js-project: + url: upstream:web-socket-js - name: pyserial repo: upstream:python-packages/pyserial ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667 diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph index 5d0297eb..f2207be6 100644 --- a/strata/ostree-core.morph +++ b/strata/ostree-core.morph @@ -23,10 +23,15 @@ chunks: unpetrify-ref: master build-system: autotools - name: ostree + morph: strata/ostree-core/ostree.morph repo: upstream:ostree - ref: 45ec78735daf72da1998f9df2887ea9b5e2600c3 - unpetrify-ref: baserock/v2015.9 - build-system: autotools + ref: 80698543c2cae285220b0406b24ea71b647ab0aa + unpetrify-ref: v2016.4 build-depends: - gpgme - libgsystem + submodules: + libglnx: + url: upstream:libglnx + bsdiff: + url: upstream:bsdiff diff --git a/strata/ostree-core/ostree.morph b/strata/ostree-core/ostree.morph new file mode 100644 index 00000000..2f2d86c7 --- /dev/null +++ b/strata/ostree-core/ostree.morph @@ -0,0 +1,7 @@ +name: ostree +kind: chunk +build-system: autotools +configure-commands: +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var + --disable-man diff --git a/strata/python2-core.morph b/strata/python2-core.morph index 7e6b6310..aa6fe2e5 100644 --- a/strata/python2-core.morph +++ b/strata/python2-core.morph @@ -91,8 +91,8 @@ chunks: - name: libxml2-python2 repo: upstream:libxml2 - ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7 - unpetrify-ref: v2.9.1 + ref: 6657afe83a38278f124ace71dc85f60420beb2d5 + unpetrify-ref: v2.9.3 build-system: autotools build-depends: - python2 diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index 0533ea58..107d76be 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,3 +9,6 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 + submodules: + qbs: + url: upstream:qbs diff --git a/strata/qt5-ivi.morph b/strata/qt5-ivi.morph new file mode 100644 index 00000000..16e7cd26 --- /dev/null +++ b/strata/qt5-ivi.morph @@ -0,0 +1,17 @@ +name: qt5-ivi +kind: stratum +description: Qt5 IVI stratum +build-depends: +- morph: strata/ruby.morph +- morph: strata/qt5-tools.morph +chunks: +- name: qtapplicationmanager + morph: strata/qt5-ivi/qtapplicationmanager.morph + repo: upstream:qt5/qtapplicationmanager + ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb + unpetrify-ref: 5.7 +- name: qtivi + repo: upstream:qt5/qtivi + ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a + unpetrify-ref: 5.7 + build-system: qmake diff --git a/strata/qt5-ivi/qtapplicationmanager.morph b/strata/qt5-ivi/qtapplicationmanager.morph new file mode 100644 index 00000000..45f2c07a --- /dev/null +++ b/strata/qt5-ivi/qtapplicationmanager.morph @@ -0,0 +1,8 @@ +name: qtapplicationmanager +kind: chunk +build-system: qmake +configure-commands: +- qmake -config install-prefix=$PREFIX +post-install-commands: +- mkdir -p $DESTDIR/opt/am +- cp -r template-opt/am/* $DESTDIR/opt/am/ diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index d4c76ee8..0d556d38 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -8,5 +8,8 @@ chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph repo: upstream:qt-creator - ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 - unpetrify-ref: baserock/3.3.0 + ref: 8895770ba36f96f150fe8dca71f889ff24d07fd6 + unpetrify-ref: baserock/v3.6.1 + submodules: + qbs: + url: upstream:qbs diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index 20473ec2..a4830aff 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -6,7 +6,7 @@ build-depends: - morph: strata/multimedia-gstreamer.morph chunks: - name: qtmultimedia - morph: strata/qt5-tools/qtmultimedia.morph repo: upstream:qt5/qtmultimedia - ref: a42a5ae6191ecbe317a00d8261bc53e842967052 - unpetrify-ref: baserock/qt5.4-wip-gstreamer-1.0 + ref: 9985224a89b830dc182b428f491b6187d6f0e1ba + unpetrify-ref: v5.6.0 + build-system: qmake diff --git a/strata/qt5-tools-qtwayland-genivi.morph b/strata/qt5-tools-qtwayland-genivi.morph deleted file mode 100644 index 1a93c5d3..00000000 --- a/strata/qt5-tools-qtwayland-genivi.morph +++ /dev/null @@ -1,13 +0,0 @@ -name: qt5-tools-qtwayland-genivi -kind: stratum -description: | - Modified version of Qt5 Wayland which makes Qt applications use the - LayerManager API -build-depends: -- morph: strata/qt5-tools.morph -chunks: -- name: qtwayland@genivi - repo: upstream:qt5/qtwayland - ref: 394c54253d5d965e353b618fd373fa89f79cbd96 - unpetrify-ref: baserock/genivi-5.4.0-wip - build-system: qmake diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index d22b3268..54dcf1e2 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -2,10 +2,11 @@ name: qt5-tools-qtwayland kind: stratum description: Qt5 Wayland module build-depends: +- morph: strata/input-common.morph - morph: strata/qt5-tools.morph chunks: - name: qtwayland + morph: strata/qt5-tools-qtwayland/qtwayland.morph repo: upstream:qt5/qtwayland - ref: d5e7965a87d81e2d7157c785403b0aba681de62a - unpetrify-ref: 5.4.2 - build-system: qmake + ref: ebba84e70fe3610affc3974f51c8ed6d539377aa + unpetrify-ref: baserock/v5.6.0-15-gebba84e+ivi-shell diff --git a/strata/qt5-tools-qtwayland/qtwayland.morph b/strata/qt5-tools-qtwayland/qtwayland.morph new file mode 100644 index 00000000..06e8ac7c --- /dev/null +++ b/strata/qt5-tools-qtwayland/qtwayland.morph @@ -0,0 +1,5 @@ +name: qtwayland +kind: chunk +build-system: qmake +configure-commands: +- qmake -makefile CONFIG+=wayland-compositor diff --git a/strata/qt5-tools-qtwebengine.morph b/strata/qt5-tools-qtwebengine.morph new file mode 100644 index 00000000..9c954f5f --- /dev/null +++ b/strata/qt5-tools-qtwebengine.morph @@ -0,0 +1,16 @@ +name: qt5-tools-qtwebengine +kind: stratum +description: Qt5 WebEngine Development Libraries and Tools +build-depends: +- morph: strata/multimedia-gstreamer.morph +- morph: strata/qt5-tools.morph +- morph: strata/ruby.morph +chunks: +- name: qtwebengine + repo: upstream:qt5/qtwebengine + ref: 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f + unpetrify-ref: v5.6.0 + build-system: qmake + submodules: + src/3rdparty: + url: upstream:qt5/qtwebengine-chromium.git diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index bb86d6b5..5d298e4d 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -7,28 +7,28 @@ build-depends: - morph: strata/ruby.morph chunks: - name: qtwebkit - morph: strata/qt5-tools/qtwebkit.morph repo: upstream:qt5/qtwebkit - ref: 586bdc38324dfaeec65389bf7646c82cb35db017 - unpetrify-ref: 5.4.2 + ref: 7205faf1a546a690f68176989100109e9a3335b7 + unpetrify-ref: '5.6' + build-system: qmake - name: qtwebkit-examples - morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples - ref: 70bd4d5253f134bf48a30544030bb832f1eba8b3 - unpetrify-ref: v5.4.0 + ref: 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 + unpetrify-ref: '5.6' + build-system: qmake build-depends: - qtwebkit - name: qttools - morph: strata/qt5-tools/qttools.morph repo: upstream:qt5/qttools - ref: 5060a0ec7dcb26826b19eefbd6063efcbde6101f - unpetrify-ref: v5.4.0 + ref: 9904992dc4eb9a5958fcfbac238374ff38498143 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtwebkit - name: qttranslations - morph: strata/qt5-tools/qttranslations.morph repo: upstream:qt5/qttranslations - ref: 3aad4ab4718d4bf952275a07e406e93eb6a22eed - unpetrify-ref: v5.4.0 + ref: 41d212290c3822b8eef151785d89ac5f5b246bde + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qttools diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 085643f9..7424a41c 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -9,123 +9,121 @@ chunks: - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase - ref: 5367fa356233da4c0f28172a8f817791525f5457 - unpetrify-ref: v5.4.0 + ref: d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b + unpetrify-ref: v5.6.0 - name: qtsvg - morph: strata/qt5-tools/qtsvg.morph repo: upstream:qt5/qtsvg - ref: eece19e62638409b479cabcbb985978d61d84307 - unpetrify-ref: v5.4.0 + ref: 38777ea7451d55e9c3d32d88d46063016013f60c + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtscript - morph: strata/qt5-tools/qtscript.morph repo: upstream:qt5/qtscript - ref: 1371263991489f11774250aa609ace0b12415186 - unpetrify-ref: v5.4.0 + ref: a70f6a1b9599931fccd13b15a1700e61137f7e72 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtdeclarative - morph: strata/qt5-tools/qtdeclarative.morph repo: upstream:qt5/qtdeclarative - ref: fdf004803d036583f58ceb832803cfe39c6ba6d8 - unpetrify-ref: v5.4.0 - build-depends: - - qtbase - - qtscript -- name: qtquick1 - morph: strata/qt5-tools/qtquick1.morph - repo: upstream:qt5/qtquick1 - ref: 1f92491bd95abc642dcd882846884a5271c8ba16 - unpetrify-ref: v5.4.0 + ref: de276ed0c8a715098245641285405b8a884ef898 + unpetrify-ref: baserock/v5.6.0 + build-system: qmake build-depends: - qtbase - qtscript + submodules: + tests/manual/v4/test262: + url: upstream:qt5/qtdeclarative-testsuites.git - name: qt3d - morph: strata/qt5-tools/qt3d.morph repo: upstream:qt5/qt3d - ref: bdb98baf8253c69949a8c259369203da9ffb269c - unpetrify-ref: baserock/v5.0.0-beta1-81-gbdb98ba + ref: 7a208d76ed96bb506899becfe680df06f95451c7 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtscript - qtdeclarative - name: qtquickcontrols - morph: strata/qt5-tools/qtquickcontrols.morph repo: upstream:qt5/qtquickcontrols - ref: ea099e341b5f8845be56f81b22e44a8b6cb227a2 - unpetrify-ref: v5.4.0 + ref: 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtsensors - morph: strata/qt5-tools/qtsensors.morph repo: upstream:qt5/qtsensors - ref: 10702cfa8ce803e0911306284c246a879d865f1d - unpetrify-ref: v5.4.0 + ref: 7197e7f4b385315cb241043495cbfad58deb911a + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtserialport - morph: strata/qt5-tools/qtserialport.morph repo: upstream:qt5/qtserialport - ref: 9aef6c3c8ff97b7998bdd813f7c7f3d845b2a53f - unpetrify-ref: v5.4.0 + ref: 03d492e49e74eefa1c83e37e833d862f4b9f1e45 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtx11extras - morph: strata/qt5-tools/qtx11extras.morph repo: upstream:qt5/qtx11extras - ref: a21bbb45019e1bbc7b583811ff2e84757082a01a - unpetrify-ref: v5.4.0 + ref: d64ee96f0df4d3baa6959b8552bc59d53cb0b451 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtxmlpatterns - morph: strata/qt5-tools/qtxmlpatterns.morph repo: upstream:qt5/qtxmlpatterns - ref: 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044 - unpetrify-ref: v5.4.0 + ref: e9110eb0a0980aa7e49928a836e0b00c2c3f4120 + unpetrify-ref: baserock/v5.6.0 + build-system: qmake build-depends: - qtbase + submodules: + testsuites: + url: upstream:qt5/qtxmlpatterns-testsuites.git - name: qtdoc - morph: strata/qt5-tools/qtdoc.morph repo: upstream:qt5/qtdoc - ref: 251f5eaa2dae740c0d0217893038a3f5bab2bca3 - unpetrify-ref: v5.4.0 + ref: 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtgraphicaleffects - morph: strata/qt5-tools/qtgraphicaleffects.morph repo: upstream:qt5/qtgraphicaleffects - ref: 9e9600d92224084f7942a6bd83b926c630a29747 - unpetrify-ref: v5.4.0 + ref: 4b8e9a348ca379b203c26ff14dd236267dd60646 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtimageformats - morph: strata/qt5-tools/qtimageformats.morph repo: upstream:qt5/qtimageformats - ref: fdc7026fb7d098abbf135fd5e7d2cf00884f9235 - unpetrify-ref: v5.4.0 + ref: 0bd46d5861fa7b48c87cd3a734d00671df929869 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtconnectivity - morph: strata/qt5-tools/qtconnectivity.morph repo: upstream:qt5/qtconnectivity - ref: 5d405d07fb51502d0bfab08f4d74aa5eba365bab - unpetrify-ref: v5.4.0 + ref: 8b550f0a7508ed413cded71a20485e61010b0aa3 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtlocation - morph: strata/qt5-tools/qtlocation.morph repo: upstream:qt5/qtlocation - ref: 7791dd790d2b15751b703db70a5fceb31d3fd99f - unpetrify-ref: v5.4.0 + ref: ca4bce553d03a64fa119650990083267ea9c8d31 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtwebsockets - morph: strata/qt5-tools/qtwebsockets.morph repo: upstream:qt5/qtwebsockets - ref: d1c9ede19976767393fe5db2f396c0c18d6fbced - unpetrify-ref: v5.4.0 + ref: 88946bbe209cb6148b4a3284077bb9a06c7bc1ef + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase diff --git a/strata/qt5-tools/qt3d.morph b/strata/qt5-tools/qt3d.morph deleted file mode 100644 index d4e44d4e..00000000 --- a/strata/qt5-tools/qt3d.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qt3d -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph index 9b2a20c6..0a6c61bc 100644 --- a/strata/qt5-tools/qtbase.morph +++ b/strata/qt5-tools/qtbase.morph @@ -1,17 +1,5 @@ name: qtbase kind: chunk +build-system: qmake configure-commands: - ./configure -v -prefix /usr -opensource -confirm-license -build-commands: -- make -- touch /qtbase.build/src/corelib/corelib.pro -- touch /qtbase.build/qmake/qmake.pro -- touch /qtbase.build/qmake/qmake-docs.pro -- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc -- make html_docs -- ./bin/qmake -unset QDOC -install-commands: -- make install INSTALL_ROOT="$DESTDIR" -- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc -- make install_html_docs INSTALL_ROOT="$DESTDIR" -- ./bin/qmake -unset QDOC diff --git a/strata/qt5-tools/qtconnectivity.morph b/strata/qt5-tools/qtconnectivity.morph deleted file mode 100644 index d1123711..00000000 --- a/strata/qt5-tools/qtconnectivity.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtconnectivity -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtdeclarative.morph b/strata/qt5-tools/qtdeclarative.morph deleted file mode 100644 index 9eb02331..00000000 --- a/strata/qt5-tools/qtdeclarative.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtdeclarative -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtdoc.morph b/strata/qt5-tools/qtdoc.morph deleted file mode 100644 index 3b449382..00000000 --- a/strata/qt5-tools/qtdoc.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtdoc -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtgraphicaleffects.morph b/strata/qt5-tools/qtgraphicaleffects.morph deleted file mode 100644 index 27c42971..00000000 --- a/strata/qt5-tools/qtgraphicaleffects.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtgraphicaleffects -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtimageformats.morph b/strata/qt5-tools/qtimageformats.morph deleted file mode 100644 index 08323ca1..00000000 --- a/strata/qt5-tools/qtimageformats.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtimageformats -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtjsbackend.morph b/strata/qt5-tools/qtjsbackend.morph deleted file mode 100644 index 5813084c..00000000 --- a/strata/qt5-tools/qtjsbackend.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtjsbackend -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtlocation.morph b/strata/qt5-tools/qtlocation.morph deleted file mode 100644 index 14a527ff..00000000 --- a/strata/qt5-tools/qtlocation.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtlocation -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtmultimedia.morph b/strata/qt5-tools/qtmultimedia.morph deleted file mode 100644 index 537baa08..00000000 --- a/strata/qt5-tools/qtmultimedia.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtmultimedia -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make install_html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtquick1.morph b/strata/qt5-tools/qtquick1.morph deleted file mode 100644 index d4692445..00000000 --- a/strata/qt5-tools/qtquick1.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtquick1 -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtquickcontrols.morph b/strata/qt5-tools/qtquickcontrols.morph deleted file mode 100644 index 12051034..00000000 --- a/strata/qt5-tools/qtquickcontrols.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtquickcontrols -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtscript.morph b/strata/qt5-tools/qtscript.morph deleted file mode 100644 index 6f27842e..00000000 --- a/strata/qt5-tools/qtscript.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtscript -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtsensors.morph b/strata/qt5-tools/qtsensors.morph deleted file mode 100644 index d4b4ec00..00000000 --- a/strata/qt5-tools/qtsensors.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtsensors -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtserialport.morph b/strata/qt5-tools/qtserialport.morph deleted file mode 100644 index 0a623865..00000000 --- a/strata/qt5-tools/qtserialport.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtserialport -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtsvg.morph b/strata/qt5-tools/qtsvg.morph deleted file mode 100644 index 40316a3c..00000000 --- a/strata/qt5-tools/qtsvg.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtsvg -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qttools.morph b/strata/qt5-tools/qttools.morph deleted file mode 100644 index 1baa10e7..00000000 --- a/strata/qt5-tools/qttools.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qttools -kind: chunk -configure-commands: -- qmake -build-commands: -- unset TARGET ; make -- unset TARGET ; make html_docs -install-commands: -- unset TARGET ; make install INSTALL_ROOT=$DESTDIR -- unset TARGET ; make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qttranslations.morph b/strata/qt5-tools/qttranslations.morph deleted file mode 100644 index bfb61302..00000000 --- a/strata/qt5-tools/qttranslations.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qttranslations -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebkit-examples.morph b/strata/qt5-tools/qtwebkit-examples.morph deleted file mode 100644 index b6683e65..00000000 --- a/strata/qt5-tools/qtwebkit-examples.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtwebkit-examples -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebkit.morph b/strata/qt5-tools/qtwebkit.morph deleted file mode 100644 index c76db433..00000000 --- a/strata/qt5-tools/qtwebkit.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtwebkit -kind: chunk -configure-commands: -- QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebsockets.morph b/strata/qt5-tools/qtwebsockets.morph deleted file mode 100644 index e1cac87f..00000000 --- a/strata/qt5-tools/qtwebsockets.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtwebsockets -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtx11extras.morph b/strata/qt5-tools/qtx11extras.morph deleted file mode 100644 index edea0acf..00000000 --- a/strata/qt5-tools/qtx11extras.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtx11extras -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtxmlpatterns.morph b/strata/qt5-tools/qtxmlpatterns.morph deleted file mode 100644 index bdd32d5f..00000000 --- a/strata/qt5-tools/qtxmlpatterns.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtxmlpatterns -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/ruby-1.8.morph b/strata/qt5-tools/ruby-1.8.morph deleted file mode 100644 index cee282c0..00000000 --- a/strata/qt5-tools/ruby-1.8.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: ruby-1.8 -kind: chunk -configure-commands: -- autoconf -- ./configure --prefix=/usr --program-suffix=-1.8 -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install diff --git a/strata/qt5-tools/ruby-1.9.morph b/strata/qt5-tools/ruby-1.9.morph deleted file mode 100644 index bc697ada..00000000 --- a/strata/qt5-tools/ruby-1.9.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: ruby-1.9 -kind: chunk -configure-commands: -- autoconf -- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8 -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install diff --git a/strata/sandboxing.morph b/strata/sandboxing.morph new file mode 100644 index 00000000..64de36c3 --- /dev/null +++ b/strata/sandboxing.morph @@ -0,0 +1,18 @@ +name: sandboxing +kind: stratum +description: | + Libraries/tools for running programs/commands in a (partially) isolated + environment. +build-depends: +- morph: strata/python2-core.morph +chunks: +- name: sandboxlib + repo: upstream:sandboxlib + ref: ce30050daa10fa32801e8f798911b36aa82343a4 + unpetrify-ref: master + build-system: python-distutils +- name: linux-user-chroot + repo: upstream:linux-user-chroot + ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d + unpetrify-ref: v2015.1 + build-system: autotools diff --git a/strata/tools.morph b/strata/tools.morph index 0a71acee..c17da999 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -14,11 +14,6 @@ chunks: repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch -- name: linux-user-chroot - repo: upstream:linux-user-chroot - ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d - unpetrify-ref: v2015.1 - build-system: autotools - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof @@ -64,6 +59,9 @@ chunks: repo: upstream:parted ref: 387e96e6eac59d84e9a688422b4b321ae9beaa20 unpetrify-ref: baserock/v3.2 + submodules: + gnulib: + url: upstream:gnulib - name: zip morph: strata/tools/zip.morph repo: upstream:zip diff --git a/strata/tools/parted.morph b/strata/tools/parted.morph index 86d74da6..0f279950 100644 --- a/strata/tools/parted.morph +++ b/strata/tools/parted.morph @@ -3,6 +3,7 @@ kind: chunk build-system: autotools pre-configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf +- sed -i -e '/^buildreq="/,/^"/{/perl/d}' bootstrap.conf - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib configure-commands: # Disable device-mapper as it is not installed on Baserock diff --git a/strata/trove.morph b/strata/trove.morph index e19e673b..fa5c45e0 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -19,6 +19,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: luxio morph: strata/trove/luxio.morph repo: upstream:luxio @@ -34,6 +37,9 @@ chunks: build-depends: - lua - luxio + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: clod morph: strata/trove/clod.morph repo: upstream:gitano/clod @@ -41,14 +47,24 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: gall morph: strata/trove/gall.morph repo: upstream:gitano/gall - ref: f58c7526fbb0421d7f5446644f01f4cf57035ee2 + ref: 11de77bd79c08a152932a3435d1921abc1020252 unpetrify-ref: baserock/morph build-depends: - lua - luxio + submodules: + libgit2: + url: upstream:gitano/libgit2 + luagit2: + url: upstream:gitano/luagit2 + extras/luacov: + url: upstream:gitano/luacov - name: lrexlib-pcre morph: strata/trove/lrexlib-pcre.morph repo: upstream:lrexlib @@ -68,6 +84,9 @@ chunks: repo: upstream:cgit ref: dc881acb0c857c783b611c03294d79a7553a4ec7 unpetrify-ref: baserock/v0.12 + submodules: + git: + url: upstream:git - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup diff --git a/strata/vala-common.morph b/strata/vala-common.morph index 7827703c..e1438de3 100644 --- a/strata/vala-common.morph +++ b/strata/vala-common.morph @@ -22,6 +22,9 @@ chunks: ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34 unpetrify-ref: baserock/2015-12-15 build-system: autotools + submodules: + autoconf-archive: + url: upstream:autoconf-archive - name: libgee repo: upstream:gnome/libgee ref: 4301ab58efc217409c588a5527f68990b4e3d220 diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 2a91fa17..32131bc5 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -30,6 +30,29 @@ chunks: repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 + submodules: + roms/openbios: + url: upstream:qemu-openbios + dtc: + url: upstream:device-tree-compiler + roms/openhackware: + url: upstream:qemu-openhackware + roms/seabios: + url: upstream:qemu-seabios + roms/vgabios: + url: upstream:qemu-vgabios + roms/u-boot: + url: upstream:u-boot + roms/SLOF: + url: upstream:qemu-SLOF + roms/qemu-palcode: + url: upstream:qemu-palcode + roms/ipxe: + url: upstream:qemu-ipxe + roms/sgabios: + url: upstream:qemu-sgabios + pixman: + url: upstream:pixman - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -51,6 +74,9 @@ chunks: - qemu - yajl - dmidecode + submodules: + gnulib: + url: upstream:gnulib - name: pycurl repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index f2de396d..8ea59e6f 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -6,5 +6,12 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: b05668f0ad64ad9ba82e124965163daed4172ead - unpetrify-ref: 1.9.0 + ref: 0ff73b7666b8aee1a68302dd6a7664b68aa659af + unpetrify-ref: 1.10.0 +- name: wayland-protocols + repo: upstream:wayland-protocols + ref: 596dfda882a51c05699bcb28a8459ce936a138db + unpetrify-ref: 1.1 + build-system: autotools + build-depends: + - wayland diff --git a/strata/weston-common.morph b/strata/weston-common.morph index a7ef2401..24545c2a 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -10,5 +10,5 @@ chunks: - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: c7dbc0a8c18e03719b3618b2dff7102f47a1331b - unpetrify-ref: baserock/weston-1.9.0/tegra + ref: 3d983f5964cbdcf44876e62925c39df74dfa1d6b + unpetrify-ref: baserock/weston-1.10.0/tegra diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph index b97294ef..af0844ed 100644 --- a/strata/weston-common/weston.morph +++ b/strata/weston-common/weston.morph @@ -2,6 +2,6 @@ name: weston kind: chunk build-system: autotools configure-commands: -- | - ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \ - --enable-demo-clients-install +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc + --enable-demo-clients-install + --enable-systemd-notify diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 2fb1e78d..ccea9434 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -15,7 +15,7 @@ chunks: - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: beac5d2e25324ca9cc82d0e3b364512258af3567 - unpetrify-ref: 1.9.0 + ref: 44598504503eea5ac7f94c88477a5a78bda01f30 + unpetrify-ref: 1.9.1 build-depends: - weston diff --git a/strata/x-common.morph b/strata/x-common.morph index 33254949..65212bb8 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -160,6 +160,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-wm repo: upstream:util-wm ref: fb7afc3f291c8cc072d327cd8d97ab1db3283c21 @@ -167,6 +170,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-keysyms repo: upstream:util-keysyms ref: edb763a8837d3932690b9d6d77cb7e20a9ab8013 @@ -174,6 +180,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-image repo: upstream:util-image ref: f20f25a1c017c58d5d7dfffc6e9adc8d31879152 @@ -182,6 +191,9 @@ chunks: build-depends: - xcb-libxcb - xcb-util + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: xorg-lib-libxtrans repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 4d93d770..d9462426 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -29,8 +29,8 @@ chunks: - name: xserver morph: strata/x-generic/xserver.morph repo: upstream:xserver - ref: 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd - unpetrify-ref: xorg-server-1.18.0 + ref: 93d4224ccf3dee5a51815a66f76c905450419b50 + unpetrify-ref: xorg-server-1.18.2 build-depends: - xorg-font-util - xorg-lib-libXfont diff --git a/strata/xdg-app-common.morph b/strata/xdg-app-common.morph index 44f82403..0cbe8c2c 100644 --- a/strata/xdg-app-common.morph +++ b/strata/xdg-app-common.morph @@ -12,7 +12,10 @@ chunks: - name: xdg-app morph: strata/xdg-app-common/xdg-app.morph repo: upstream:xdg-app - ref: 7e90d39533745d5fd2a1b030f55099f803ae3a5c - unpetrify-ref: baserock/0.4.13 + ref: 619e1f1025851179dee3e616000e5de2ccde9412 + unpetrify-ref: 0.5.1 build-depends: - elfutils + submodules: + libglnx: + url: upstream:libglnx |