summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--clusters/weston-system-x86_64-generic-deploy.morph12
-rw-r--r--strata/c2man/c2man.morph11
-rw-r--r--strata/connectivity.morph8
-rw-r--r--strata/core.morph7
-rw-r--r--strata/enlightenment.morph39
-rw-r--r--strata/enlightenment/bullet3.morph8
-rw-r--r--strata/enlightenment/efl.morph5
-rw-r--r--strata/input-common.morph4
-rw-r--r--strata/libdrm-common.morph4
-rw-r--r--strata/lua.morph6
-rw-r--r--strata/lua/luajit2.morph7
-rw-r--r--strata/multimedia-gstreamer-0.10.morph14
-rw-r--r--strata/qt5-sdk.morph9
-rw-r--r--strata/qt5-sdk/qt-creator.morph1
-rw-r--r--strata/qt5-tools-qtmultimedia.morph13
-rw-r--r--strata/qt5-tools-qtwebkit.morph35
-rw-r--r--strata/qt5-tools.morph153
-rw-r--r--strata/qt5-tools/qtbase.morph2
-rw-r--r--strata/qt5-tools/qtconnectivity.morph10
-rw-r--r--strata/qt5-tools/qtlocation.morph10
-rw-r--r--strata/qt5-tools/qtwebsockets.morph10
-rw-r--r--strata/trove.morph2
-rw-r--r--strata/wayland-generic.morph5
-rw-r--r--strata/wayland-generic/libxkbcommon.morph5
-rw-r--r--strata/weston-common.morph21
-rw-r--r--strata/weston-common/weston.morph9
-rw-r--r--strata/x-common.morph28
-rw-r--r--strata/x-generic.morph8
-rw-r--r--strata/x-generic/xserver.morph2
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph6
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph40
-rw-r--r--systems/weston-system-x86_64-generic.morph40
32 files changed, 362 insertions, 172 deletions
diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph
new file mode 100644
index 00000000..ac63a93a
--- /dev/null
+++ b/clusters/weston-system-x86_64-generic-deploy.morph
@@ -0,0 +1,12 @@
+name: release
+kind: cluster
+description: |
+ Deploy a stock weston system.
+systems:
+- morph: systems/weston-system-x86_64-generic.morph
+ deploy:
+ weston-system-x86_64-generic:
+ type: rawdisk
+ location: /weston-system-x86_64-generic.img
+ DISK_SIZE: 4G
+ KERNEL_ARGS: vga=788
diff --git a/strata/c2man/c2man.morph b/strata/c2man/c2man.morph
new file mode 100644
index 00000000..93390d2d
--- /dev/null
+++ b/strata/c2man/c2man.morph
@@ -0,0 +1,11 @@
+name: c2man
+kind: chunk
+configure-commands:
+- ./Configure -d -e
+build-commands:
+- make LEX=flex
+install-commands:
+- mkdir -p $DESTDIR$PREFIX/bin
+- mkdir -p $DESTDIR$PREFIX/lib
+- mkdir -p $DESTDIR$PREFIX/man
+- make install bin=$DESTDIR$PREFIX/bin privlib=$DESTDIR$PREFIX/lib/c2man mansrc=$DESTDIR$PREFIX/man
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index a8697f3a..2cc6bb69 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -11,12 +11,12 @@ chunks:
- name: wpa_supplicant
morph: strata/connectivity/wpa_supplicant.morph
repo: upstream:hostap
- ref: 1cdfb99c3a04235697dc6979b9eb5418861e42f8
- unpetrify-ref: baserock/genivi/morph
+ ref: c4a58c968044c2002706b1a69c089c4d63728e77
+ unpetrify-ref: baserock/hostap_2_3
build-depends:
- libnl
- name: iptables
repo: upstream:iptables
- ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
- unpetrify-ref: baserock/morph
+ ref: 482c6d3731e2681cb4baae835c294840300197e6
+ unpetrify-ref: v1.4.21
build-depends: []
diff --git a/strata/core.morph b/strata/core.morph
index 37133fee..a1fc9a10 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -89,12 +89,6 @@ chunks:
ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
unpetrify-ref: baserock/bash-4.3-patch-27
build-depends: []
-- name: error-perl-tarball
- repo: upstream:error-perl-tarball
- ref: 661707e7bd4282aeab5a2f6a8f02ca5731fd813f
- unpetrify-ref: baserock/morph
- build-depends:
- - perl
- name: flex
morph: strata/core/flex.morph
repo: upstream:flex
@@ -211,7 +205,6 @@ chunks:
- autoconf
- cpython
- curl
- - error-perl-tarball
- gettext
- libexpat
- openssl-new
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 7ef6e22a..845e7fab 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -6,42 +6,56 @@ build-depends:
- morph: strata/x-generic.morph
- morph: strata/lua.morph
- morph: strata/audio-bluetooth.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
+- morph: strata/multimedia.morph
- morph: strata/connman-common.morph
chunks:
+- name: fribidi
+ repo: upstream:fribidi
+ ref: c9916f2ab289126a32febcc4754efc73a011fb0c
+ unpetrify-ref: baserock/morph/0.19.6
+ build-depends: []
+- name: bullet3
+ morph: strata/enlightenment/bullet3.morph
+ repo: upstream:bullet3
+ ref: 940059ddb3c4476bb9860f79f35b0b1230857f54
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: efl
morph: strata/enlightenment/efl.morph
repo: upstream:enlightenment/efl
- ref: 8f9b565e79552f09a39507ce802786b1fe773d2d
- unpetrify-ref: baserock/morph
- build-depends: []
+ ref: 3013a7c5cbd728dd9bc5516ffb4bd4f505888bd4
+ unpetrify-ref: v1.12.0
+ build-depends:
+ - bullet3
+ - fribidi
+ - luajit2
- name: elementary
morph: strata/enlightenment/elementary.morph
repo: upstream:enlightenment/elementary
- ref: e4c97ddffea9c91a291e1a6a7c6ebd1bbf47629a
- unpetrify-ref: baserock/morph
+ ref: c4fbbbf984b7bd1553191c26459bce4589122ad5
+ unpetrify-ref: v1.12.0
build-depends:
- efl
- name: evas_generic_loaders
morph: strata/enlightenment/evas_generic_loaders.morph
repo: upstream:enlightenment/evas_generic_loaders
- ref: ddbdaa35201f4ef64f1a3f3b067a99e84c14565a
- unpetrify-ref: baserock/morph
+ ref: 5d4415ec1e64930452f7d17cbec4c28a0efa8402
+ unpetrify-ref: v1.12.0
build-depends:
- efl
- name: enlightenment
morph: strata/enlightenment/enlightenment.morph
repo: upstream:enlightenment/enlightenment
- ref: 041b8d14a22f9e4c7f34abe8b0f9a3a1f5933146
- unpetrify-ref: baserock/morph
+ ref: 55165e2576823780a1053b03c5230cc8df8957b5
+ unpetrify-ref: v0.19.1
build-depends:
- efl
- elementary
- name: imlib2
morph: strata/enlightenment/imlib2.morph
repo: upstream:enlightenment/imlib2
- ref: 6d02661a4c57771888304960ce62d4fdf587be8f
- unpetrify-ref: baserock/morph
+ ref: f2f20dc5791a175be398a17fcdc4852a79079d47
+ unpetrify-ref: baserock/1.4.6
build-depends:
- efl
- elementary
@@ -50,7 +64,6 @@ chunks:
morph: strata/enlightenment/libast.morph
repo: upstream:enlightenment/libast
ref: 0dbc0a5df55474bf61ca166be40e8de2d9e3a031
- unpetrify-ref: baserock/morph
build-depends:
- efl
- elementary
diff --git a/strata/enlightenment/bullet3.morph b/strata/enlightenment/bullet3.morph
new file mode 100644
index 00000000..74cb097a
--- /dev/null
+++ b/strata/enlightenment/bullet3.morph
@@ -0,0 +1,8 @@
+name: bullet
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment/efl.morph b/strata/enlightenment/efl.morph
index ca1c0b57..b2a013ae 100644
--- a/strata/enlightenment/efl.morph
+++ b/strata/enlightenment/efl.morph
@@ -1,9 +1,8 @@
name: efl
kind: chunk
configure-commands:
-- ./autogen.sh --prefix=/usr --with-tests=none --disable-fribidi --disable-image-loader-gif
- --disable-image-loader-tiff --disable-pulseaudio --disable-gstreamer --disable-audio
- --disable-physics
+- ./autogen.sh --prefix=/usr --with-tests=none --disable-image-loader-gif --enable-systemd
+ --disable-image-loader-tiff
build-commands:
- make VPATH=/usr/lib64
install-commands:
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 0e9d25e6..233bff22 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -22,8 +22,8 @@ chunks:
build-depends: []
- name: libinput
repo: upstream:libinput
- ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d
- unpetrify-ref: 0.5.0
+ ref: 224f1d823b2d44aa5193d5b997d73e4322c50f41
+ unpetrify-ref: 0.6.0
build-depends:
- mtdev
- libevdev
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index 37bff746..e364bab2 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -11,7 +11,7 @@ chunks:
- name: drm
repo: upstream:drm
morph: strata/libdrm-common/drm.morph
- ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
- unpetrify-ref: baserock/jetson/drm
+ ref: 83b2c40922ce451f5844aae0707ae9783a78d74f
+ unpetrify-ref: baserock/drm_2.4.58/jetson
build-depends:
- xorg-lib-libpciaccess
diff --git a/strata/lua.morph b/strata/lua.morph
index 5ac3102b..75ccad86 100644
--- a/strata/lua.morph
+++ b/strata/lua.morph
@@ -10,3 +10,9 @@ chunks:
ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
unpetrify-ref: baserock/5.1-morph
build-depends: []
+- name: luajit2
+ morph: strata/lua/luajit2.morph
+ repo: upstream:luajit2
+ ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d
+ unpetrify-ref: v2.0.3
+ build-depends: []
diff --git a/strata/lua/luajit2.morph b/strata/lua/luajit2.morph
new file mode 100644
index 00000000..72f34f02
--- /dev/null
+++ b/strata/lua/luajit2.morph
@@ -0,0 +1,7 @@
+name: luajit2
+kind: chunk
+build-commands:
+- make PREFIX="$PREFIX"
+install-commands:
+- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
+
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index ae5fe656..50917372 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -11,23 +11,23 @@ chunks:
ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
unpetrify-ref: baserock/morph
build-depends: []
-- name: gstreamer
+- name: gstreamer@0.10
repo: upstream:gstreamer
- ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
+ ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f
unpetrify-ref: baserock/morph/0.10
build-depends:
- orc
-- name: gstreamer-plugins-base
+- name: gstreamer-plugins-base@0.10
repo: upstream:gstreamer-plugins-base
ref: 960c596309dbb983a1d733259adccc45c47006a2
unpetrify-ref: baserock/morph/0.10
build-depends:
- - gstreamer
-- name: gstreamer-plugins-good
+ - gstreamer@0.10
+- name: gstreamer-plugins-good@0.10
repo: upstream:gstreamer-plugins-good
ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3
unpetrify-ref: baserock/morph/0.10
build-depends:
- - gstreamer
- - gstreamer-plugins-base
+ - gstreamer@0.10
+ - gstreamer-plugins-base@0.10
- orc
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph
index f0b3cc2e..0d877a62 100644
--- a/strata/qt5-sdk.morph
+++ b/strata/qt5-sdk.morph
@@ -3,16 +3,11 @@ kind: stratum
description: Qt5 Desktop Environment, IDE and Example Apps
build-depends:
- morph: strata/qt5-tools.morph
+- morph: strata/qt5-tools-qtwebkit.morph
chunks:
- name: qt-creator
morph: strata/qt5-sdk/qt-creator.morph
repo: upstream:qt-creator
- ref: d5a6b10634c1a3271012e9578e016772ef077d59
+ ref: v3.2.1
unpetrify-ref: baserock/morph/2.7
build-depends: []
-- name: snowshoe
- morph: strata/qt5-sdk/snowshoe.morph
- repo: upstream:snowshoe
- ref: 098f931de58072edd5d591cdc4a2ad3c05e83991
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/qt5-sdk/qt-creator.morph b/strata/qt5-sdk/qt-creator.morph
index 76d9f7d7..91fae589 100644
--- a/strata/qt5-sdk/qt-creator.morph
+++ b/strata/qt5-sdk/qt-creator.morph
@@ -6,4 +6,3 @@ build-commands:
- make
install-commands:
- make install INSTALL_ROOT=$DESTDIR
-- ./qhelpgenerator.sh
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
new file mode 100644
index 00000000..6482db62
--- /dev/null
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -0,0 +1,13 @@
+name: qt5-tools-qtmultimedia
+kind: stratum
+description: Qt5 QtMultimedia Development Libraries and Tools
+build-depends:
+- morph: strata/qt5-tools.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
+chunks:
+- name: qtmultimedia
+ morph: strata/qt5-tools/qtmultimedia.morph
+ repo: upstream:qt5/qtmultimedia
+ ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f
+ unpetrify-ref: v5.3.2
+ build-depends: []
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
new file mode 100644
index 00000000..1d746949
--- /dev/null
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -0,0 +1,35 @@
+name: qt5-tools-qtwebkit
+kind: stratum
+description: Qt5 WebKit Development Libraries and Tools
+build-depends:
+- morph: strata/multimedia.morph
+- morph: strata/qt5-tools.morph
+- morph: strata/ruby.morph
+chunks:
+- name: qtwebkit
+ morph: strata/qt5-tools/qtwebkit.morph
+ repo: upstream:qt5/qtwebkit
+ ref: 13f80d34ae84c3231118c8013beee55badab8929
+ unpetrify-ref: v5.3.2
+ build-depends: []
+- name: qtwebkit-examples
+ morph: strata/qt5-tools/qtwebkit-examples.morph
+ repo: upstream:qt5/qtwebkit-examples
+ ref: bce5056b9e16a943357e362455a46685d3f22093
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtwebkit
+- name: qttools
+ morph: strata/qt5-tools/qttools.morph
+ repo: upstream:qt5/qttools
+ ref: 8c79a098b8b7da4832ebca1884ee833a2c2078a7
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtwebkit
+- name: qttranslations
+ morph: strata/qt5-tools/qttranslations.morph
+ repo: upstream:qt5/qttranslations
+ ref: cf4d6f7e73bb410ed0aa3d64dffb2b6b242cdfe0
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qttools
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 1c784bf3..34e57bc4 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -4,7 +4,6 @@ description: Qt5 Development Libraries and Tools
build-depends:
- morph: strata/tools.morph
- morph: strata/x-generic.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
chunks:
- name: icu
morph: strata/qt5-tools/icu.morph
@@ -12,179 +11,129 @@ chunks:
ref: ba023548a3bff7277cbea4acade3042ce9d8949e
unpetrify-ref: baserock/morph
build-depends: []
-- name: ruby-1.8
- morph: strata/qt5-tools/ruby-1.8.morph
- repo: upstream:ruby
- ref: 7a24f1710028d568ad61d0aa49d5178260178d77
- unpetrify-ref: baserock/morph/ruby_1_8_7
- build-depends: []
-- name: ruby-1.9
- morph: strata/qt5-tools/ruby-1.9.morph
- repo: upstream:ruby
- ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
- unpetrify-ref: baserock/morph/ruby_1_9_3
- build-depends:
- - ruby-1.8
- name: qtbase
morph: strata/qt5-tools/qtbase.morph
repo: upstream:qt5/qtbase
- ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
- unpetrify-ref: baserock/morph
+ ref: 05670f586ffe05425b7542a27fcca31bddf231aa
+ unpetrify-ref: v5.3.2
build-depends:
- icu
- name: qtsvg
morph: strata/qt5-tools/qtsvg.morph
repo: upstream:qt5/qtsvg
- ref: 552bf3adcc48c669f9dfbda5818142fb18c9e957
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtjsbackend
- morph: strata/qt5-tools/qtjsbackend.morph
- repo: upstream:qt5/qtjsbackend
- ref: c6978bf56f599a3da8c03b1a7e58102aa84223e7
- unpetrify-ref: baserock/morph
+ ref: 35a2f0880831d38c60d2b4820dac808f48f6f3a8
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtscript
morph: strata/qt5-tools/qtscript.morph
repo: upstream:qt5/qtscript
- ref: d20e99b3bdbcf77b69a92a2ba1b3ca1f1379e7c8
- unpetrify-ref: baserock/morph
+ ref: 71f6dee8791c95fd862ca3651d7f4b7d6b9f440e
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- name: qtdeclarative
morph: strata/qt5-tools/qtdeclarative.morph
repo: upstream:qt5/qtdeclarative
- ref: 774d0310883a9526210c4530bbb9d0af26d88699
- unpetrify-ref: baserock/morph
+ ref: a67aa6abc6a406b00ef58a7e07fd39012bfa3eb1
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- name: qtquick1
morph: strata/qt5-tools/qtquick1.morph
repo: upstream:qt5/qtquick1
- ref: b13755a2411dca01e65bb443a399ed130d5dd738
- unpetrify-ref: baserock/morph
+ ref: 8e7fa2b5aa2e2e4371c4b73926d0e6ad2ebdbd96
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- name: qt3d
morph: strata/qt5-tools/qt3d.morph
repo: upstream:qt5/qt3d
- ref: 805fbf45a54f1b69f4b13f6dc9f962b07c017d3b
+ ref: bdb98baf8253c69949a8c259369203da9ffb269c
unpetrify-ref: baserock/morph
build-depends:
- qtbase
- - qtjsbackend
- qtscript
- qtdeclarative
- name: qtquickcontrols
morph: strata/qt5-tools/qtquickcontrols.morph
repo: upstream:qt5/qtquickcontrols
- ref: acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb
- unpetrify-ref: baserock/morph
+ ref: bc91574cca8b6f24968ab4e1cc11fe1fd10f3061
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtdeclarative
- name: qtsensors
morph: strata/qt5-tools/qtsensors.morph
repo: upstream:qt5/qtsensors
- ref: cd22d77e07af6046be24d0322187a86c9a3c4d1d
- unpetrify-ref: baserock/morph
+ ref: fd3e65ef5ab6eb8e4b5bdad380d1f6862799856c
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtserialport
morph: strata/qt5-tools/qtserialport.morph
repo: upstream:qt5/qtserialport
- ref: b1abca2eee45e7b8ecf71cb5cd1e77a2821fcac2
- unpetrify-ref: baserock/morph
+ ref: 286d64c202f461cb8ff5a4cc4c2320af8195b8f0
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtx11extras
morph: strata/qt5-tools/qtx11extras.morph
repo: upstream:qt5/qtx11extras
- ref: 3b33afd2814c88002e2efc4955e5b1851aff0c58
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qtwebkit
- morph: strata/qt5-tools/qtwebkit.morph
- repo: upstream:qt5/qtwebkit
- ref: 15a558c03ea7a35f97dfc0b16024d026d20920be
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - icu
- - ruby-1.9
- - qtjsbackend
- - qtdeclarative
-- name: qtwebkit-examples
- morph: strata/qt5-tools/qtwebkit-examples.morph
- repo: upstream:qt5/qtwebkit-examples
- ref: fdaa2bb5e47d6ca1d3e8c681f88eae0b9d4ae351
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qtmultimedia
- morph: strata/qt5-tools/qtmultimedia.morph
- repo: upstream:qt5/qtmultimedia
- ref: 8b73d090f87f88ee3ae4efc437ac866d05df76be
- unpetrify-ref: baserock/morph
+ ref: 2d84caf5ef1b5dace0d678df4581db3c955be6ee
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtxmlpatterns
morph: strata/qt5-tools/qtxmlpatterns.morph
repo: upstream:qt5/qtxmlpatterns
- ref: ed713a904ee55f1c345d2d6c35e77892be96977e
- unpetrify-ref: baserock/morph
+ ref: 78c2367e22d87b529610117f5b6abef6934abdcf
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtdoc
morph: strata/qt5-tools/qtdoc.morph
repo: upstream:qt5/qtdoc
- ref: 674abef4f06bdde57a272d69750e2a4ac5027ea9
- unpetrify-ref: baserock/morph
+ ref: 688019893d2cbd9ccdc4d75c550bca4530a46ee4
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- name: qtgraphicaleffects
morph: strata/qt5-tools/qtgraphicaleffects.morph
repo: upstream:qt5/qtgraphicaleffects
- ref: e41d08f95d74d7309fc976cb62141b78239de975
- unpetrify-ref: baserock/morph
+ ref: 82abf6975b6737259ee656564e5ec7f8ad1d0508
+ unpetrify-ref: v5.3.2
build-depends:
- qtbase
- - qtjsbackend
- qtdeclarative
- name: qtimageformats
morph: strata/qt5-tools/qtimageformats.morph
repo: upstream:qt5/qtimageformats
- ref: 3f7f6126d9832e03a4dcaaca5279220f00126e89
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
-- name: qttools
- morph: strata/qt5-tools/qttools.morph
- repo: upstream:qt5/qttools
- ref: 1369d91dd095cd4ea2febe759ef6446e41bd2d80
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qtjsbackend
- - qtdeclarative
- - qtwebkit
-- name: qttranslations
- morph: strata/qt5-tools/qttranslations.morph
- repo: upstream:qt5/qttranslations
- ref: e91af8e6363a4538f08992b6af51d17b91453080
- unpetrify-ref: baserock/morph
- build-depends:
- - qtbase
- - qttools
+ ref: 85e621e3ecf449bb0587bd4da97ca66179b24f31
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtconnectivity
+ morph: strata/qt5-tools/qtconnectivity.morph
+ repo: upstream:qt5/qtconnectivity
+ ref: 8a33a9b43dcc5e7f9a77237a660a3759286e6b86
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtlocation
+ morph: strata/qt5-tools/qtlocation.morph
+ repo: upstream:qt5/qtlocation
+ ref: a36d9e67e3b8168cb4d1eb76eda96ebb8242fd20
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+- name: qtwebsockets
+ morph: strata/qt5-tools/qtwebsockets.morph
+ repo: upstream:qt5/qtwebsockets
+ ref: 00f77bdc5beb62e980216cfee906ab7aa1d1c4f7
+ unpetrify-ref: v5.3.2
+ build-depends:
+ - qtbase
+
diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph
index 1427c4c2..9b2a20c6 100644
--- a/strata/qt5-tools/qtbase.morph
+++ b/strata/qt5-tools/qtbase.morph
@@ -5,6 +5,8 @@ configure-commands:
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
diff --git a/strata/qt5-tools/qtconnectivity.morph b/strata/qt5-tools/qtconnectivity.morph
new file mode 100644
index 00000000..d1123711
--- /dev/null
+++ b/strata/qt5-tools/qtconnectivity.morph
@@ -0,0 +1,10 @@
+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/qtlocation.morph b/strata/qt5-tools/qtlocation.morph
new file mode 100644
index 00000000..14a527ff
--- /dev/null
+++ b/strata/qt5-tools/qtlocation.morph
@@ -0,0 +1,10 @@
+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/qtwebsockets.morph b/strata/qt5-tools/qtwebsockets.morph
new file mode 100644
index 00000000..e1cac87f
--- /dev/null
+++ b/strata/qt5-tools/qtwebsockets.morph
@@ -0,0 +1,10 @@
+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/trove.morph b/strata/trove.morph
index 133e67fd..7eaa204a 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -78,7 +78,7 @@ chunks:
- name: lorry-controller
morph: strata/trove/lorry-controller.morph
repo: baserock:baserock/lorry-controller
- ref: 689174532cc4920d2ef96bcebeb8a1adaf985804
+ ref: 4b1fcab140d940470c342c6857cdc8682406f0b7
unpetrify-ref: master
build-depends: []
- name: lua-scrypt
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 628ff2ad..890489dc 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -5,9 +5,10 @@ build-depends:
- morph: strata/xorg-util-macros-common.morph
chunks:
- name: libxkbcommon
+ morph: strata/wayland-generic/libxkbcommon.morph
repo: upstream:xorg-lib-libxkbcommon
- ref: b721254769212d671a4729f1c88b059979b80efc
- unpetrify-ref: baserock/genivi/baseline
+ ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+ unpetrify-ref: xkbcommon-0.5.0
build-depends: []
- name: wayland
morph: strata/wayland-generic/wayland.morph
diff --git a/strata/wayland-generic/libxkbcommon.morph b/strata/wayland-generic/libxkbcommon.morph
new file mode 100644
index 00000000..04048abb
--- /dev/null
+++ b/strata/wayland-generic/libxkbcommon.morph
@@ -0,0 +1,5 @@
+name: libxkbcommon
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-x11
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
new file mode 100644
index 00000000..1d5b015c
--- /dev/null
+++ b/strata/weston-common.morph
@@ -0,0 +1,21 @@
+name: weston-common
+kind: stratum
+build-depends:
+- morph: strata/graphics-common.morph
+- morph: strata/input-common.morph
+- morph: strata/mesa-common.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: linux-pam
+ repo: upstream:linux-pam
+ ref: b1521c97e73b10469f7b34c0571d51c647eca83c
+ unpetrify-ref: Linux-PAM-1.1.8
+ build-depends: []
+- name: weston
+ morph: strata/weston-common/weston.morph
+ repo: upstream:weston
+ ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f
+ unpetrify-ref: baserock/weston-1.6.0/tegra
+ build-depends:
+ - linux-pam
diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph
new file mode 100644
index 00000000..2efd662e
--- /dev/null
+++ b/strata/weston-common/weston.morph
@@ -0,0 +1,9 @@
+name: weston
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+ ./autogen.sh --prefix="$PREFIX" \
+ --disable-xwayland \
+ --disable-x11-compositor \
+ --enable-demo-clients-install
diff --git a/strata/x-common.morph b/strata/x-common.morph
index f842c7a9..8c0bba1d 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -30,18 +30,18 @@ chunks:
build-depends: []
- name: xorg-proto-fontsproto
repo: upstream:xorg-proto-fontsproto
- ref: 81e4d4ec53f1f3848ff269fe476c3a1d35d93aef
- unpetrify-ref: baserock/morph
+ ref: df8c05f7c0253a36589d96efa52938215eff9d4d
+ unpetrify-ref: fontsproto-2.1.3
build-depends: []
- name: xorg-proto-glproto
repo: upstream:xorg-proto-glproto
- ref: 8e3407e02980d088e20041e79bdcdd3737e7827e
- unpetrify-ref: baserock/morph
+ ref: f84853d97d5749308992412a215fa518b6536eb3
+ unpetrify-ref: glproto-1.4.17
build-depends: []
- name: xorg-proto-inputproto
repo: upstream:xorg-proto-inputproto
- ref: f8428123019e7357891bbfc0aef21dbb4d0db10f
- unpetrify-ref: baserock/morph
+ ref: 343ff0938f592876b9d82c966f166bf45a78c3c8
+ unpetrify-ref: inputproto-2.3.1
build-depends: []
- name: xorg-proto-kbproto
repo: upstream:xorg-proto-kbproto
@@ -90,8 +90,8 @@ chunks:
build-depends: []
- name: xorg-proto-xextproto
repo: upstream:xorg-proto-xextproto
- ref: f27fcc99d1cf935cc289933326f7d3baacd5107a
- unpetrify-ref: baserock/morph
+ ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
+ unpetrify-ref: xextproto-7.3.0
build-depends: []
- name: xorg-proto-xf86bigfontproto
repo: upstream:xorg-proto-xf86bigfontproto
@@ -115,8 +115,8 @@ chunks:
build-depends: []
- name: xorg-proto-x11proto
repo: upstream:xorg-proto-x11proto
- ref: f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580
- unpetrify-ref: baserock/morph
+ ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
+ unpetrify-ref: xproto-7.0.26
build-depends: []
- name: xorg-proto-dri2proto
repo: upstream:xorg-proto-dri2proto
@@ -156,8 +156,8 @@ chunks:
- xorg-lib-libXau
- name: xorg-lib-libxtrans
repo: upstream:xorg-lib-libxtrans
- ref: bd53f4c8543faf910a7a151241ee07661b4d57ad
- unpetrify-ref: baserock/morph
+ ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
+ unpetrify-ref: xtrans-1.3.5
build-depends: []
- name: xorg-lib-libX11
repo: upstream:xorg-lib-libX11
@@ -201,8 +201,8 @@ chunks:
- xorg-proto-x11proto
- name: xorg-lib-libXfixes
repo: upstream:xorg-lib-libXfixes
- ref: 73a0fbb479f5b7806a3dd0741be55c9abda76220
- unpetrify-ref: baserock/morph
+ ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
+ unpetrify-ref: libXfixes-5.0.1
build-depends:
- xorg-lib-libXext
- xorg-proto-fixesproto
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index af42c55e..84f685b0 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -24,8 +24,8 @@ chunks:
- xorg-font-util
- name: xorg-lib-libXfont
repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
+ ref: ad4f4d8a2d0730c0ea3c09210bf921638b4682bc
+ unpetrify-ref: libXfont-1.5.0
build-depends:
- xorg-lib-libfontenc
- name: xorg-lib-libICE
@@ -73,8 +73,8 @@ chunks:
- name: xserver
morph: strata/x-generic/xserver.morph
repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
+ ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
+ unpetrify-ref: xorg-server-1.16.2
build-depends:
- libsha1
- xorg-font-util
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index 473f5d32..f8495057 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -2,4 +2,4 @@ name: xserver
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1
+- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1 --disable-glx
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 6cb9377b..1a78ff4f 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -12,8 +12,8 @@ strata:
morph: strata/foundation.morph
- name: audio-bluetooth
morph: strata/audio-bluetooth.morph
-- name: multimedia-gstreamer-0.10
- morph: strata/multimedia-gstreamer-0.10.morph
+- name: multimedia
+ morph: strata/multimedia.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
- name: tools
@@ -24,6 +24,8 @@ strata:
morph: strata/x-generic.morph
- name: qt5-tools
morph: strata/qt5-tools.morph
+- name: qt5-tools-qtwebkit
+ morph: strata/qt5-tools-qtwebkit.morph
- name: qt5-sdk
morph: strata/qt5-sdk.morph
- name: lua
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..a51bd810
--- /dev/null
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -0,0 +1,40 @@
+name: weston-system-armv7lhf-jetson
+kind: system
+description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+arch: armv7lhf
+strata:
+- name: build-essential
+ morph: strata/build-essential.morph
+- name: core
+ morph: strata/core.morph
+- name: coreutils-common
+ morph: strata/coreutils-common.morph
+- name: foundation
+ morph: strata/foundation.morph
+- name: bsp-jetson
+ morph: strata/bsp-jetson.morph
+- name: connectivity
+ morph: strata/connectivity.morph
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+ morph: strata/libdrm-common.morph
+- name: multimedia
+ morph: strata/multimedia.morph
+- name: wayland-generic
+ morph: strata/wayland-generic.morph
+- name: graphics-common
+ morph: strata/graphics-common.morph
+- name: input-common
+ morph: strata/input-common.morph
+- name: llvm-common
+ morph: strata/llvm-common.morph
+- name: mesa-common
+ morph: strata/mesa-common.morph
+- name: weston-common
+ morph: strata/weston-common.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
new file mode 100644
index 00000000..491a34bc
--- /dev/null
+++ b/systems/weston-system-x86_64-generic.morph
@@ -0,0 +1,40 @@
+name: weston-system-x86_64-generic
+kind: system
+description: A weston system for a 64-bit x86 system.
+arch: x86_64
+strata:
+- name: build-essential
+ morph: strata/build-essential.morph
+- name: core
+ morph: strata/core.morph
+- name: coreutils-common
+ morph: strata/coreutils-common.morph
+- name: foundation
+ morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+ morph: strata/connectivity.morph
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+ morph: strata/libdrm-common.morph
+- name: multimedia
+ morph: strata/multimedia.morph
+- name: wayland-generic
+ morph: strata/wayland-generic.morph
+- name: graphics-common
+ morph: strata/graphics-common.morph
+- name: input-common
+ morph: strata/input-common.morph
+- name: llvm-common
+ morph: strata/llvm-common.morph
+- name: mesa-common
+ morph: strata/mesa-common.morph
+- name: weston-common
+ morph: strata/weston-common.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files