diff options
| -rw-r--r-- | strata/erlang/erlang-sd_notify.morph | 2 | ||||
| -rw-r--r-- | strata/erlang/rebar.morph | 2 | ||||
| -rw-r--r-- | strata/input-common.morph | 4 | ||||
| -rw-r--r-- | strata/morph-utils.morph | 8 | ||||
| -rw-r--r-- | strata/wayland-generic.morph | 4 | ||||
| -rw-r--r-- | strata/weston-common.morph | 4 | ||||
| -rw-r--r-- | strata/x-generic.morph | 22 | ||||
| -rw-r--r-- | systems/weston-system-armv7lhf-jetson.morph | 6 | ||||
| -rw-r--r-- | systems/weston-system-x86_64-generic.morph | 2 |
9 files changed, 45 insertions, 9 deletions
diff --git a/strata/erlang/erlang-sd_notify.morph b/strata/erlang/erlang-sd_notify.morph index 32bf92d2..dd3f66ca 100644 --- a/strata/erlang/erlang-sd_notify.morph +++ b/strata/erlang/erlang-sd_notify.morph @@ -1,4 +1,4 @@ -name: erlang +name: erlang-sd_notify kind: chunk build-commands: - LDFLAGS=-lsystemd REBAR_FLAGS="--verbose 2" make diff --git a/strata/erlang/rebar.morph b/strata/erlang/rebar.morph index 3a6134c0..fa5fd64f 100644 --- a/strata/erlang/rebar.morph +++ b/strata/erlang/rebar.morph @@ -1,4 +1,4 @@ -name: erlang +name: rebar kind: chunk build-commands: - ./bootstrap diff --git a/strata/input-common.morph b/strata/input-common.morph index dad71041..dab05826 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,8 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: fd8a29fb692404ace405631012d0b708362b1fa0 - unpetrify-ref: 0.9.0 + ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 + unpetrify-ref: 0.10.0 build-depends: - mtdev - libevdev diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 6e1ad289..aecf2a1d 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -64,9 +64,14 @@ chunks: ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph build-depends: [] +- name: pylru + repo: upstream:python-packages/pylru + ref: 221dd259f5c34562c835611d1cf62384b9019da4 + unpetrify-ref: master + build-depends: [] - name: morph repo: baserock:baserock/morph - ref: d9ad77ea43f99f3f6d58f66cb1bfe261d966c730 + ref: 74f60a7ed286dd88e24539d46b9a86147a8e78b5 unpetrify-ref: master build-depends: - cliapp @@ -75,3 +80,4 @@ chunks: - pyfilesystem - bottle - flup + - pylru diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 164db34b..58eefbbd 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -13,7 +13,7 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: 52d971c924d0147d6949096c9cf001d75828a054 - unpetrify-ref: 1.6.93 + ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7 + unpetrify-ref: 1.7.0 build-depends: - libxkbcommon diff --git a/strata/weston-common.morph b/strata/weston-common.morph index f79510c8..13106ea5 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -10,6 +10,6 @@ chunks: - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: 06315ce5b9569e02ec4e7d322d933bc247620aff - unpetrify-ref: baserock/weston-1.6.93/tegra + ref: 322383ed469d69401b502618718a97a4e85c97d8 + unpetrify-ref: baserock/weston-1.7.0/tegra build-depends: [] diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 572932b4..644d47c2 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -50,3 +50,25 @@ chunks: unpetrify-ref: baserock/morph build-depends: - xorg-lib-libxkbfile +- name: xcb-util + repo: upstream:xcb-util + ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 + unpetrify-ref: baserock/morph + build-depends: [] +- name: util-wm + repo: upstream:util-wm + ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 + unpetrify-ref: baserock/morph + build-depends: [] +- name: util-keysyms + morph: strata/x-generic/util-keysyms.morph + repo: upstream:util-keysyms + ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab + unpetrify-ref: baserock/morph + build-depends: [] +- name: util-image + repo: upstream:util-image + ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 + unpetrify-ref: baserock/morph + build-depends: + - xcb-util diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index a51bd810..2e139755 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -33,6 +33,12 @@ strata: morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph +- name: tools + morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index b84eaeb5..de099697 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -37,6 +37,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: tools + morph: strata/tools.morph configuration-extensions: - set-hostname - add-config-files |